Commit Graph

6681 Commits

Author SHA1 Message Date
Anuken
6c3372e71c Slightly more reasonable waves 2020-10-25 15:07:51 -04:00
Anuken
1cdea49383 Merge remote-tracking branch 'origin/master' 2020-10-25 12:35:52 -04:00
Anuken
a6307039b0 Fixed some nullability issues 2020-10-25 12:35:48 -04:00
Anuken
aaacf244d2 Merge pull request #3096 from azureblue/placement-direction
make ending direction follow the path
2020-10-25 12:28:41 -04:00
Anuken
2a0af620be Sector land announcement 2020-10-25 12:00:57 -04:00
Anuken
b801093597 Merge remote-tracking branch 'origin/master' 2020-10-25 11:22:19 -04:00
Anuken
81dae580a4 Bugfixes / Removed tile unit multi-mining 2020-10-25 11:22:10 -04:00
Anuken
03f58a1b02 Merge pull request #2972 from sk7725/patch-20
Add colors to StatusEffects
2020-10-25 10:35:42 -04:00
Anuken
b2b0082c7d Fixed #3108 / Fixed #3112 2020-10-25 09:23:13 -04:00
MEEP of Faith
2c03516998 I thought this failed. I guess not.. 2020-10-24 17:27:01 -07:00
MEEP of Faith
062b319ab3 ok, then try this? 2020-10-24 17:16:56 -07:00
MEEP of Faith
8ad4349d18 test this 2020-10-24 17:12:44 -07:00
Anuken
1d85495f7a Merge remote-tracking branch 'origin/master' 2020-10-24 19:06:09 -04:00
Anuken
41d388aa7f Item sprite cleanup 2020-10-24 19:06:05 -04:00
MEEP of Faith
2ec3eee138 Custom Base Support 2020-10-24 15:02:36 -07:00
MEEP of Faith
705728f16a "diable"
oh no
2020-10-24 13:49:30 -07:00
Skat
6b94cbd089 Oh 2020-10-24 23:44:16 +03:00
Skat
7b8a9ff15e Update ChatFragment.java
This will avoid exceeding the message length limit if player send a message with spaces in end/start message
2020-10-24 23:34:18 +03:00
azureblue
a7c24d4bfd fixing formatting 2020-10-24 22:10:02 +02:00
Anuken
79ace277ed Merge remote-tracking branch 'origin/master' 2020-10-24 15:55:25 -04:00
Anuken
bc035f9490 Fixed #3095 2020-10-24 15:55:20 -04:00
azureblue
73a5af2e5e make ending direction follow the path 2020-10-24 21:34:47 +02:00
Anuken
ee7bdbf44e Merge pull request #3081 from genNAowl/standardize-liquid-stats
Remove timePeriod in LiquidBaseValue
2020-10-24 15:18:47 -04:00
Anuken
b611726c3e Merge remote-tracking branch 'origin/master' 2020-10-24 15:11:31 -04:00
Anuken
819686e812 Unit factory production list 2020-10-24 15:11:27 -04:00
DeltaNedas
3b2669fa21 pattern variables? 2020-10-24 17:23:54 +00:00
DeltaNedas
801ff1701e silly 2020-10-24 17:19:50 +00:00
DeltaNedas
364a2b43c2 add Content fallback 2020-10-24 17:04:58 +00:00
DeltaNedas
279d898d68 add more info to print object 2020-10-24 16:37:55 +00:00
Anuken
ddbca62f92 Merge remote-tracking branch 'origin/master' 2020-10-24 10:22:04 -04:00
Anuken
646b022d38 Bugfixes 2020-10-24 10:21:57 -04:00
Leonwang4234
f2a984f3e7 Lets hope this compiles because I don't have time to test it 2020-10-23 19:53:21 -07:00
Anuken
1ffa3f21f0 (2) 2020-10-23 20:41:32 -04:00
Anuken
7e323f1ebf Logic locate fix 2020-10-23 20:38:33 -04:00
Anuken
117f002545 Fixed #3082 2020-10-23 18:24:18 -04:00
Anuken
953c1889b5 Fixed #3080 2020-10-23 17:18:49 -04:00
Leonwang4234
cc024a0bac remove timePeriod in LiquidBaseValue 2020-10-23 13:34:07 -07:00
Anuken
42bfab6e40 Fixed #3079 2020-10-23 16:12:36 -04:00
Anuken
c8ef7ebafb Fixed #3078 + action listeners for player control events 2020-10-23 15:59:52 -04:00
Anuken
f5888a7c56 Android crash fixes 2020-10-23 13:42:28 -04:00
Anuken
cf3f540df4 New map 2020-10-23 13:31:55 -04:00
Anuken
84171a8619 Slightly better terrain filter 2020-10-23 12:00:06 -04:00
Anuken
2b5ee5c463 Merge remote-tracking branch 'origin/master' 2020-10-23 10:39:05 -04:00
Anuken
bf1268bb6e Shooting -> Function category / Dialog cleanup 2020-10-23 10:39:01 -04:00
Anuken
a0f55861fe Merge pull request #3028 from GlennFolker/master
allow mods to easily load icon region
2020-10-23 09:21:43 -04:00
Anuken
d66cf13ac6 Added buttons to clear campaign saves & research 2020-10-23 09:08:17 -04:00
Anuken
436a020c3e Fixed attack mode gamover check 2020-10-22 20:44:18 -04:00
Anuken
23673f0b11 typo 2020-10-22 20:34:02 -04:00
Anuken
bd659d2c97 Don't clear legacy unlocks after read 2020-10-22 20:33:26 -04:00
Anuken
514e2503fa Editor generation cleanup 2020-10-22 19:26:55 -04:00