Commit Graph

1099 Commits

Author SHA1 Message Date
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
ee50995dde Removed "sector attacked" message 2020-10-11 14:54:05 -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
Anuken
cc051dd787 Merge pull request #2905 from DeltaNedas/uinames
add names to lots of ui elements
2020-10-11 10:36:18 -04:00
DeltaNedas
0f2c38b0c0 oh no 2020-10-11 15:28:50 +01:00
Anuken
65d9978fa1 Fixed #2901 / Fixed #2903 2020-10-11 09:02:20 -04:00
DeltaNedas
5eb8a87528 h 2020-10-11 12:59:00 +01:00
DeltaNedas
1539d86846 add names to some major dialog elements 2020-10-11 12:57:18 +01:00
DeltaNedas
a60ae3a060 add names to major fragment elements 2020-10-11 12:56:55 +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
0a0af9c291 Random derelicts in sectors 2020-10-08 19:11:20 -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
Anuken
be66a15287 Extra mod field parsing (untested) 2020-10-07 11:00:02 -04:00
Anuken
7088ae89b3 Logic unit control 2020-10-05 15:42:37 -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
43936b536e Cleanup 2020-10-02 20:23:37 -04:00
Anuken
5861fe61b2 Cleanup 2020-10-02 19:51:30 -04:00
Anuken
215cfaa42f Fixed #2793 2020-10-01 16:03:13 -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
54c991e611 Removed outOfTime pause 2020-09-30 22:25:28 -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
Anuken
326640d32a Cleanup 2020-09-30 17:21:05 -04:00
Anuken
3c3c15dcf4 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-29 23:55:59 -04:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -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
2141e2ebab Cleaned up extra accessor method 2020-09-24 18:32:18 -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
8d8cedaa44 Removed launch mechanic remnants 2020-09-24 16:44:11 -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
ec11e60c7c Fixed #2679 2020-09-23 09:32:27 -04:00