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,480 Commits 4 Branches 160 Tags 2.3 GiB
304f5b62b3
Commit Graph

8088 Commits

Author SHA1 Message Date
Anuken
304f5b62b3 Sprites repacked 2020-11-02 16:49:24 -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
Anuken
075b7d7dc6
Merge pull request #3225 from Voz-Duh/new-texture-for-blast-mixer 
New Texture For Blast Mixer
 2020-11-02 15:31:43 -05:00
Voz-Duh
cda8a9b3e9 Texture Fix 2020-11-02 23:02:56 +03:00
Voz-Duh
6e2f097803 Texture Fix 2020-11-02 22:16:46 +03:00
Anuken
f44cad4c08
Merge pull request #3230 from Quentinchampenois/translation/fr_keys 
Translates few keys in french
 2020-11-01 20:11:41 -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
DeltaNedas
1f9ed90cc0 remove unused DataType.java 2020-11-01 19:35:46 +00:00
DeltaNedas
cda6a6973d make logic stuff public, cleanup 2020-11-01 19:35:22 +00:00
Anuken
a13f7f633e Fixed serverside error 2020-11-01 10:42:16 -05:00
Anuken
d786c8668e Fixed logic config() called in clients / JSON-compatible effects 2020-11-01 10:30:30 -05:00
Anuken
187cb79265 Fixed #3222 / Fixed #3218 / Fixed #3228 / Fixed #3217 2020-11-01 09:28:03 -05:00
quentinchampenois
692c4733e8
light translations from english to french keys 2020-11-01 14:11:09 +01:00
Voz-Duh
e8cfd63bc4 Texture Fix 2020-11-01 14:12:52 +03:00
Voz-Duh
3e03c3e49b New Texture For Blast Mixer 2020-11-01 13:27:09 +03:00
Anuken
54ba4b31a1 Fixed casing eject effects 2020-10-31 20:19:24 -04:00
Anuken
b5e2812d0b Bugfixes 2020-10-31 16:25:50 -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
05dcd7622b Campaign tweaks 2020-10-31 14:52:03 -04:00
Anuken
9c54fcee2e Sector damage calculation fix 2020-10-31 13:42:43 -04:00
Anuken
4d34f16fcd Merge remote-tracking branch 'origin/master' 2020-10-31 13:03:22 -04:00
Anuken
2079cfaece Fixed #3208 2020-10-31 13:03:19 -04:00
Anuken
df54fb0534
Merge pull request #3209 from summetdev/database-button 
Show Core Database Button in Custom Game.
 2020-10-31 12:57:45 -04:00
summetdev
51e490e667 Core database button 2020-10-31 19:26:50 +03:00
Anuken
04fcf06ad5 Merge remote-tracking branch 'origin/master' 2020-10-31 12:03:38 -04:00
Anuken
9af8b64046 #3191 2020-10-31 12:03:35 -04:00
DeltaNedas
865beac7fb fix modded bullets 2020-10-31 15:35:45 +00:00
Anuken
d68ef73407 Fixed bloom resizing improperly 2020-10-31 11:01:39 -04:00
Anuken
8d6ea6b197 Correct team display on maps 2020-10-31 10:35:21 -04:00
Anuken
2c29a06eb5 Fixed #3206 2020-10-31 10:07:01 -04:00
Anuken
b75a03aed8 Fixed #3204 2020-10-31 09:56:35 -04:00
Anuken
42b8ece85a Fixed #3200 / Fixed #3196 / Fixed #3198 2020-10-31 09:01:06 -04: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