mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-09 20:29:06 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,497 Commits 4 Branches 160 Tags 2.3 GiB
006e27b61f
Commit Graph

9497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Prosta4okua
ab947c4fe7
Update bundle_uk_UA.properties 2020-10-31 02:25:38 +02:00
Anuken
4ec8e24bd8 Cleanup of merged PR 2020-10-30 19:03:05 -04:00
Anuken
e02458122b
Merge pull request #2970 from genNAowl/ground-support-heal 
Allow Ground Support Units to Heal Blocks
 2020-10-30 18:52:04 -04:00
Anuken
181ad1016c Reduced tech costs / Added missing blocks to fungal pass 2020-10-30 16:05:40 -04:00
Anuken
466183ffd0 Possibly more accurate wave linear regressions 2020-10-30 15:39:49 -04:00
genNAowl
60f2c67bde
Merge branch 'master' into ground-support-heal 2020-10-30 12:37:33 -07:00
Anuken
28240f730f Don't show guardian warning when above win wave 2020-10-30 14:57:34 -04:00
Anuken
ed93fa45d3 Preset tweaks 2020-10-30 13:16:59 -04:00
Anuken
a12583eb4d Campaign survival wave display tweaks 2020-10-30 12:54:24 -04:00
Leonwang4234
de483990ef formatting 
Why do I always make these mistakes?

And I saw that I did the same thing in my incendiary-fire PR too...
 2020-10-30 09:04:44 -07:00
Anuken
76ff55d7f1 Campaign tweaks 2020-10-30 11:50:38 -04:00
Anuken
784a280bef Merge remote-tracking branch 'origin/master' 2020-10-30 10:36:11 -04:00
Anuken
14869041b8 Cleanup 2020-10-30 10:36:07 -04:00
Anuken
17fd3d0bc1
Merge pull request #3099 from skykatik/patch-2 
Removing spaces at start and end of a message (trim)
 2020-10-30 10:29:42 -04:00
Anuken
968d94904a
Merge pull request #3058 from MEEPofFaith/speed-lightning 
v5 Javelin Movement Lightning Ability
 2020-10-30 09:40:21 -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
d48f02ff4a
Merge pull request #3156 from summetdev/formatting 
Lots Of Cleanup
 2020-10-30 09:26:56 -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
Anuken
c0d1ff0f08
Merge pull request #3192 from Voz-Duh/full-unit-in-menu 
Full Unit In Menu
 2020-10-30 09:21:58 -04:00
Anuken
7cac70010e
Merge pull request #3188 from sk7725/patch-26 
Field for LiquidTurrets that do not care about the fires around it
 2020-10-30 09:17:40 -04:00
Voz-Duh
36fdf4afbc Full Unit In Menu 2020-10-30 14:21:13 +03:00
Sunny Kim
ecaa0a4eaa
Some liquid turrets are not caring enough 2020-10-30 16:44:54 +09:00
Anuken
a9f5aa9220 suffering 2020-10-29 19:58:10 -04:00
Anuken
150343b5f9 suffering 2020-10-29 19:33:07 -04:00
Anuken
ae35b2ff7e arc 2020-10-29 19:04:37 -04:00
Anuken
1663497e6c Better save validation 2020-10-29 19:03:58 -04:00
Anuken
cd6516786b suffering 2020-10-29 16:07:01 -04:00
Anuken
c899cb6a93 suffering 2020-10-29 15:44:06 -04:00
Anuken
acc9a5aa9e Merge remote-tracking branch 'origin/master' 2020-10-29 15:10:17 -04:00
Anuken
d7cdfbb02d suffering 2020-10-29 15:10:09 -04:00
Anuken
afed4c4239
Merge pull request #3184 from MEEPofFaith/any-layer-effects 
Any Layer Effects
 2020-10-29 13:58:55 -04:00
Anuken
3eb655402f
Merge pull request #2978 from Volas171/patch-1 
Update bundle_es.properties
 2020-10-29 13:39:11 -04:00
Anuken
fc7887399f suffering 2020-10-29 13:29:54 -04:00
Anuken
0c1c41efc0 Libs 2020-10-29 13:03:48 -04:00
Anuken
43937037db Libs 2020-10-29 12:30:39 -04:00
Anuken
0c418d1a09 Libs 2020-10-29 11:51:17 -04:00
Anuken
2ad14cc884 Merge remote-tracking branch 'origin/master' 2020-10-29 10:26:35 -04:00
Anuken
77e6030c59 Fixed #3173 2020-10-29 10:26:32 -04:00
Anuken
79624ff7cd
Merge pull request #3181 from sk7725/patch-23 
Make LiquidTurret not need to have water as an ammo(bugfix)
 2020-10-29 10:22:26 -04:00
Sunny Kim
f2b5553f54
bug squish 2020-10-29 19:04:38 +09:00
MEEP of Faith
a14ae1bdf8
Lightning chance fix. 2020-10-28 21:00:24 -07:00
MEEP of Faith
1e3b498671 Any Layer Effects 2020-10-28 20:46:50 -07:00
Leonwang4234
19bc6f6e48 Update Turret.java 2020-10-28 20:09:45 -07:00
Anuken
3dae157a5e Extra validation 2020-10-28 19:35:15 -04:00
Anuken
55a7089a3d Merge remote-tracking branch 'origin/master' 2020-10-28 18:51:49 -04:00
Anuken
44286cee59 Wave versions 2020-10-28 18:51:42 -04:00
Anuken
89c35db811
Merge pull request #3168 from Yakuzet/patch-3 
Update bundle_tr.properties
 2020-10-28 16:40:10 -04:00
Anuken
68ab48a1d3 Fixed #3170 2020-10-28 14:05:09 -04:00