Commit Graph

341 Commits

Author SHA1 Message Date
Anuken
2ff749bd17 Unified stat system 2020-10-19 11:34:52 -04:00
Anuken
80f801db36 Fixed #3023 / Fixed #3020 2020-10-19 10:04:10 -04:00
Anuken
c7622198fd Cleanup 2020-10-18 19:21:59 -04:00
Anuken
dac236b0e9 Better launch selection 2020-10-18 18:34:19 -04:00
Anuken
00d6997b5a Hex/bin logic number support 2020-10-18 15:46:20 -04:00
Anuken
e00daffe6d Bugfixes 2020-10-16 15:27:30 -04:00
Anuken
f391e7a5ac Sector production bugfixes 2020-10-16 12:16:00 -04:00
Anuken
2f54edf34f Sector refactoring, invasions and cleanup 2020-10-16 11:02:24 -04:00
Anuken
45b87ec615 fixed some sector things, broke more things 2020-10-15 15:41:09 -04:00
Anuken
86c2fe8805 too many things to list 2020-10-15 13:44:20 -04:00
Anuken
1554fd0394 Planet selection for mods 2020-10-13 18:50:18 -04:00
Anuken
06877b457e Rule selection fixes 2020-10-12 15:59:22 -04:00
Anuken
378e81cd90 Fixed #2917 2020-10-12 10:06:34 -04:00
Anuken
e11a8565d0 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/mindustry/ui/dialogs/PausedDialog.java
2020-10-11 10:51:46 -04:00
Anuken
3d99e38f10 Sector simplification 2020-10-11 10:51:33 -04:00
DeltaNedas
1539d86846 add names to some major dialog elements 2020-10-11 12:57:18 +01:00
Anuken
a3e42b28bd Merge pull request #2821 from summetdev/schems-description
Descriptions for schematics.
2020-10-10 16:22:00 -04:00
Anuken
d61ad8d2ef Fixed #2895 2020-10-10 13:15:59 -04:00
Anuken
c7f1204119 space 2020-10-08 15:14:28 -04:00
Anuken
6aa1144429 Hot rock + basalt generation for sectors 2020-10-08 14:37:51 -04:00
summetdev
bdc69249bb fix newline 2020-10-04 16:03:48 +03:00
summetdev
eedb90ed16 bigger description area 2020-10-04 15:27:05 +03:00
summetdev
5ffff9c151 description for schematics 2020-10-03 22:43:52 +03:00
Anuken
35af71c613 Moved Nullable to utils package 2020-10-02 23:11:26 -04:00
Anuken
5861fe61b2 Cleanup 2020-10-02 19:51:30 -04:00
Anuken
c1970b4da5 Merge branch 'campaign'
# Conflicts:
#	core/src/mindustry/world/consumers/ConsumeItemFilter.java
2020-10-01 13:37:25 -04:00
Anuken
199be4d13d Implicit non-nullability for fields 2020-10-01 13:33:43 -04:00
Anuken
085bc2ee9c campaign progress 2020-10-01 11:19:42 -04:00
Anuken
a0394e4382 Balance 2020-09-30 18:56:37 -04:00
Anuken
7eb0da82de Added enemy lights setting 2020-09-30 17:44:13 -04:00
summetdev
111e50c3c6 Safe last fileChooser's directory to settings 2020-09-29 22:04:27 +03:00
Anuken
3a06cacf1d Minor fixes 2020-09-24 22:41:13 -04:00
Anuken
9e0b29b3dd Cleanup 2020-09-24 18:11:10 -04:00
Anuken
504334999d Campaign multiplayer note 2020-09-24 16:49:04 -04:00
Anuken
0a07458186 Power-based ammo / Refactoring / IP kicks / Fixes 2020-09-24 13:05:39 -04:00
Anuken
0288cb34fb Cleanup 2020-09-23 22:15:14 -04:00
Anuken
75ebaab3a3 Merge pull request #2660 from J-VdS/schematic
Server disable schematic option (fix #2382)
2020-09-23 22:01:06 -04:00
Anuken
3db2ffb843 Launch pad destination selection 2020-09-23 18:00:24 -04:00
J-VdS
d0c6f3274b Merge branch 'master' into schematic 2020-09-23 16:29:41 +02:00
Anuken
ba6ab8483e Various tweaks 2020-09-22 20:42:36 -04:00
J-VdS
428c396968 Update SchematicsDialog.java 2020-09-22 19:04:05 +02:00
J-VdS
f4003fd463 merge 2020-09-22 18:41:24 +02:00
J-VdS
51065b57c4 info popup 2020-09-22 18:40:04 +02:00
Anuken
08ff36c43e Bugfixes 2020-09-22 12:16:17 -04:00
Anuken
87032c82b1 T4/5 support mechs 2020-09-21 23:32:30 -04:00
Anuken
1d8f837fb1 Fixed #2646 2020-09-21 14:35:39 -04:00
Anuken
0a314e142e Fixed #2632 (among other things) 2020-09-20 15:23:34 -04:00
Anuken
e19e74cdc5 Bugfixes 2020-09-19 11:40:11 -04:00
Anuken
6b6783f201 Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587 2020-09-18 11:21:50 -04:00
Anuken
f242a2b2cd Fixed #2585 2020-09-17 22:25:56 -04:00