Commit Graph

889 Commits

Author SHA1 Message Date
Anuken
aa81805f19 Merge pull request #3103 from MEEPofFaith/patch-1
[Modding] Custom Base Support
2020-11-02 17:53:14 -05:00
Anuken
e853ed6419 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/mindustry/logic/LCanvas.java
2020-11-02 16:47:33 -05:00
Anuken
8f53d44278 Various fixes 2020-11-02 16:46:11 -05:00
DeltaNedas
fc94d68e10 remove redundant stack trace 2020-11-01 23:16:41 +00:00
DeltaNedas
47844e0204 properly log logic build errors 2020-11-01 23:01:18 +00:00
Anuken
187cb79265 Fixed #3222 / Fixed #3218 / Fixed #3228 / Fixed #3217 2020-11-01 09:28:03 -05:00
Anuken
54ba4b31a1 Fixed casing eject effects 2020-10-31 20:19:24 -04:00
Anuken
95c444a004 Merge remote-tracking branch 'origin/master' 2020-10-31 16:11:54 -04:00
Anuken
b1b03a7503 Extra legacy block substitution / iOS fixes 2020-10-31 16:11:51 -04:00
summetdev
e6f60505e6 Add group to UnitBlock 2020-10-31 23:03:25 +03:00
summetdev
afe3b0d111 Group for unit factory 2020-10-31 22:30:37 +03:00
Anuken
9af8b64046 #3191 2020-10-31 12:03:35 -04:00
Anuken
42b8ece85a Fixed #3200 / Fixed #3196 / Fixed #3198 2020-10-31 09:01:06 -04:00
Anuken
76ff55d7f1 Campaign tweaks 2020-10-30 11:50:38 -04:00
Anuken
c8e5994b2f Merge pull request #3174 from genNAowl/alternate-recalculation
Change "Alternate" calculation in Turret.java
2020-10-30 09:30:59 -04:00
Anuken
73035b9211 Merge branch 'master' into formatting 2020-10-30 09:26:51 -04:00
Anuken
513ccfe581 Merge remote-tracking branch 'origin/master' 2020-10-30 09:24:09 -04:00
Anuken
782307374f Fixed #3189 / Fixed #3187 2020-10-30 09:24:05 -04:00
Sunny Kim
ecaa0a4eaa Some liquid turrets are not caring enough 2020-10-30 16:44:54 +09:00
Sunny Kim
f2b5553f54 bug squish 2020-10-29 19:04:38 +09:00
Leonwang4234
19bc6f6e48 Update Turret.java 2020-10-28 20:09:45 -07:00
summetdev
a7d1f98f7e PayloadConveyor with transportation group 2020-10-28 13:50:32 +03:00
summetdev
2918a0ea86 Newlines 2020-10-27 22:08:53 +03:00
summetdev
9a7e0fb45e Removed spaces in brackets 2020-10-27 21:54:48 +03:00
Anuken
024f64678c Merge remote-tracking branch 'origin/master' 2020-10-27 14:29:19 -04:00
Anuken
a31e182905 Fixed nodes not connecting to batteries when placed 2020-10-27 14:29:15 -04:00
summetdev
a4f54a890a Add spaces to operations 2020-10-27 21:13:36 +03:00
summetdev
76124c1b19 Show controlled units on processor hover 2020-10-27 20:30:41 +03:00
Anuken
73ca6eeb74 Fixed #3136 2020-10-26 13:38:27 -04:00
Anuken
8770bb2422 Fixed #3133 (probably) / Logic icon draw command 2020-10-26 13:31:32 -04:00
Anuken
0b7c8bdcd8 Merge pull request #3129 from DeltaNedas/patch-12
minor serverside optimisation in roomba
2020-10-26 11:19:22 -04:00
DeltaNedas
1e12faaf65 h
h is for headless, which i am
2020-10-26 13:37:53 +00:00
DeltaNedas
6c7428a1fb minor serverside optimisation 2020-10-26 13:32:50 +00:00
Leonwang4234
2a8a00afab source/void replacement 2020-10-25 17:28:11 -07:00
Anuken
59b5d809db Balance 2020-10-25 15:55:23 -04:00
Anuken
81dae580a4 Bugfixes / Removed tile unit multi-mining 2020-10-25 11:22:10 -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
MEEP of Faith
2ec3eee138 Custom Base Support 2020-10-24 15:02:36 -07: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
819686e812 Unit factory production list 2020-10-24 15:11:27 -04:00
Anuken
646b022d38 Bugfixes 2020-10-24 10:21:57 -04:00
Leonwang4234
cc024a0bac remove timePeriod in LiquidBaseValue 2020-10-23 13:34:07 -07:00
Anuken
a2e75df096 Map editor tweaks & fixes / New map 2020-10-22 15:27:30 -04:00
Anuken
a732237005 Allowed enemy spawns on water 2020-10-22 09:43:21 -04:00
Anuken
f2dd5ba113 Fixed #3062 / Fixed #3064 2020-10-22 09:11:48 -04:00
Anuken
ee8f18796e Merge remote-tracking branch 'origin/master' 2020-10-21 10:37:07 -04:00
Anuken
3517da8214 Fixed #3049 2020-10-21 10:37:03 -04:00
Leonwang4234
54fd2e03b4 resolve conflicts 2020-10-20 15:57:48 -07:00