Commit Graph

66 Commits

Author SHA1 Message Date
Anuken
4ec8e24bd8 Cleanup of merged PR 2020-10-30 19:03:05 -04:00
Anuken
181ad1016c Reduced tech costs / Added missing blocks to fungal pass 2020-10-30 16:05:40 -04:00
Anuken
76ff55d7f1 Campaign tweaks 2020-10-30 11:50:38 -04:00
Anuken
d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
Wiki Updater
4d575364f4 change surgeAlloy and phaseFabric 2020-10-21 20:04:41 +02:00
Anuken
7da400608c Bugfixes 2020-10-09 15:18:13 -04:00
Anuken
be66a15287 Extra mod field parsing (untested) 2020-10-07 11:00:02 -04:00
Anuken
35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
slava0135
d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
2020-09-30 09:48:18 +03:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
Anuken
c3274622b2 Fixed #2763 2020-09-29 11:53:45 -04:00
slava0135
9050cac19c added to tech tree 2020-09-25 14:21:52 +03:00
Anuken
0a07458186 Power-based ammo / Refactoring / IP kicks / Fixes 2020-09-24 13:05:39 -04:00
Anuken
ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken
8ed83964a2 Bugfixes 2020-09-23 09:33:56 -04:00
Anuken
ba6ab8483e Various tweaks 2020-09-22 20:42:36 -04:00
Anuken
45e77fe3b4 Balance 2020-09-21 12:05:24 -04:00
Anuken
0bcb48ca31 Costs for unit research 2020-09-19 14:11:48 -04:00
DeltaNedas
cdc1337fcb make techtree funcs public 2020-09-19 10:00:33 +01:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken
1c6fed8df8 Many things that won't fit in a commit message 2020-09-11 23:04:19 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken
44b0ef408f testing BE builds 2020-08-27 20:21:20 -04:00
Anuken
a575ad2d99 Cleanup 2020-08-27 20:09:40 -04:00
Anuken
92aba83450 Cleanup 2020-08-27 13:45:07 -04:00
Anuken
7b2b9b3988 Fixed #2416 / Fixed #2417 2020-08-25 09:24:49 -04:00
Anuken
b207d05d4b Re-added command center 2020-08-24 19:49:49 -04:00
Anuken
6b7debbba7 Added logic to tech tree 2020-08-24 17:35:52 -04:00
Anuken
bbe6c5017a Removed synthetic accessors / Sector sanity tests 2020-08-19 15:13:29 -04:00
Anuken
2510b09201 Bugfixes / Default capture waves 2020-07-31 10:40:27 -04:00
Anuken
a4ddf90ef5 Added sectors to tech tree / Bugfixes 2020-07-30 23:13:06 -04:00
Anuken
f840b007ed Costs for item/liquid research (very much WIP) 2020-07-29 13:52:30 -04:00
Anuken
8360d60ee8 Fractional research 2020-07-27 14:04:03 -04:00
Anuken
95f7fc1b3b Rounding of research amounts 2020-07-26 10:35:47 -04:00
Anuken
42d7eb4e05 Bugfixes 2020-07-25 19:08:25 -04:00
Anuken
c3881b57de More research tweaks / Balancing 2020-07-25 13:29:50 -04:00
Anuken
b180462c45 Better tree layout 2020-07-25 10:25:48 -04:00
Anuken
20077738d2 Research fixes 2020-07-24 23:56:14 -04:00
Anuken
38e55ab541 Added most things to tech tree 2020-07-24 23:38:33 -04:00
Anuken
17f86c5f77 Added missing tech tree blocks 2020-07-24 19:15:09 -04:00
Anuken
9c69e3a1a0 Bugfixes / Sector preset cleanup 2020-06-21 16:00:26 -04:00
Anuken
6517eaf62f Implemented #2177 2020-06-21 10:33:08 -04:00
Anuken
a0f0640729 Testing liquids/items in tech tree 2020-06-20 22:21:43 -04:00
Anuken
ec4a5880b7 Fixed #2178 2020-06-20 09:07:35 -04:00
Anuken
f419de0fad Fixed some tech tree layout issues 2020-06-19 23:36:21 -04:00
Anuken
6bcc103cf7 Research system progress 2020-06-19 19:31:14 -04:00
Anuken
8ea28e1ced Seq. 2020-06-08 17:19:47 -04:00
Anuken
a7f86b2ba6 Cleanup 2020-05-28 21:13:25 -04:00
Anuken
a375dd3fc2 Cleanup 2020-05-26 19:39:50 -04:00
Anuken
77c0163a79 Re-implemented some units / Bugfixes 2020-05-19 14:58:04 -04:00