mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 23:28:52 +07:00
Code Issues Packages Projects Releases Wiki Activity
8,757 Commits 4 Branches 160 Tags 2.1 GiB
68c41774e4
Commit Graph

8757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
68c41774e4 More contrast for specific colors 2020-10-01 14:22:48 -04:00
Anuken
4074a241d2 Cleanup 2020-10-01 14:07:33 -04:00
Anuken
c1970b4da5 Merge branch 'campaign' 
# Conflicts:
#	core/src/mindustry/world/consumers/ConsumeItemFilter.java
 2020-10-01 13:37:25 -04:00
Anuken
1170880127 Merge remote-tracking branch 'origin/master' 2020-10-01 13:33:55 -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
2604a2d649
Merge pull request #2783 from Quezler/patch-45 
Move cryofluid mixer emoji back to the old number
 2020-10-01 08:56:28 -04:00
Anuken
6f4f0eef57
Merge pull request #2786 from Quezler/patch-46 
Clarify stack conveyor recharge property
 2020-10-01 08:42:11 -04:00
Patrick 'Quezler' Mounier
ce463d225f
Clarify stack conveyor recharge property 
(also, should be minimum & multiple of 1)
 2020-10-01 11:54:58 +02:00
Patrick 'Quezler' Mounier
8e4d00d594
Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Anuken
4264b960cd Merge branch 'master' of https://github.com/Anuken/Mindustry into campaign 2020-09-30 22:46:33 -04:00
Anuken
b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
Anuken
d3441f4ac9
Merge pull request #2781 from genNAowl/cryofluidmixer-cryofluid-mixer 
change "cryofluidmixer" to "cryofluid-mixer"
 2020-09-30 22:35:10 -04:00
Anuken
54c991e611 Removed outOfTime pause 2020-09-30 22:25:28 -04:00
Leonwang4234
87b21c052f Update SaveFileReader.java 
fix
 2020-09-30 18:29:58 -07:00
Leonwang4234
9601c81045 change sprite name 2020-09-30 18:05:43 -07:00
Leonwang4234
14156c1ce7 "cryofluidmixer" to "cryofluid-mixer"fl 2020-09-30 17:54:50 -07:00
Anuken
f3c642d0d7 Fixed #2779 2020-09-30 19:55:22 -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
781d9b3c38 Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-30 16:42:10 -04:00
Anuken
1697fec311 Tsunami balancing 2020-09-30 16:40:45 -04:00
Anuken
0b2c2c49b0
Anuken/Mindustry-Suggestions/issues/653 2020-09-30 15:12:38 -04:00
Anuken
27089f1057 Merge remote-tracking branch 'origin/master' 2020-09-30 15:01:50 -04:00
Anuken
d07c74b60f Re-added tap event for servers 2020-09-30 15:01:46 -04:00
Anuken
8dc610a091
Update CONTRIBUTING.md 2020-09-30 14:53:56 -04:00
Anuken
059c729a2c Merge branch 'master' of https://github.com/Anuken/Mindustry 2020-09-30 14:50:09 -04:00
Anuken
03d676403f Cleanup 2020-09-30 14:50:05 -04:00
slava0135
feb8202b73 better stats... 2020-09-30 21:17:44 +03:00
slava0135
65607ba6bf better stats 2020-09-30 21:13:14 +03:00
slava0135
a806d7c019 Fun fact: 1.0 is smaller than 10 2020-09-30 20:41:56 +03:00
slava0135
aa5b3aa756 balancing 2020-09-30 20:30:04 +03:00
Anuken
6645e3a473
Merge pull request #2772 from LeoDog896/pathfinder 
Remove nearGround in favor of !nearLiquid
 2020-09-30 12:59:55 -04:00
LeoDog896
f2fd23dced can be nearGround AND nearLiquid 2020-09-30 12:56:59 -04:00
LeoDog896
49db761730 Revert "remove nearGround in favor of !nearLiquid" 
This reverts commit 8751e77876.
 2020-09-30 12:56:43 -04:00
Anuken
d2728c2bf0 Fixed #2774 2020-09-30 12:45:01 -04:00
slava0135
48da4933fc comma 2020-09-30 18:52:59 +03:00
slava0135
07cdbfa423 New turret sprite by EyeOfDarkness 2020-09-30 18:47:56 +03:00
Anuken
f5e5f82d47 Merge remote-tracking branch 'origin/master' 2020-09-30 11:19:46 -04:00
Anuken
0963de4022 Cleanup 2020-09-30 11:19:38 -04:00
LeoDog896
8751e77876 remove nearGround in favor of !nearLiquid 2020-09-30 11:15:11 -04:00
Anuken
b35fa21c79
Update gradle.yml 2020-09-30 11:13:17 -04:00
Anuken
b38e7f66ad
Merge pull request #2770 from LeoDog896/autotiler 
Autotiler docs and cleanup
 2020-09-30 10:49:42 -04:00
Anuken
ba53d76d8d
Merge pull request #2769 from Voz-Duh/packed-liquid-drawer 
Packed Liquid Drawer
 2020-09-30 10:46:45 -04:00
slava0135
58ff3f2ef7 Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 2020-09-30 17:18:20 +03:00
LeoDog896
6db2376835 Revert to if-statement 2020-09-30 09:47:03 -04:00
LeoDog896
2b04ebb14d Enum follows camelCase rules 2020-09-30 09:46:33 -04:00
Anuken
957e06470d
Merge pull request #2768 from LeoDog896/master 
Remove unused package
 2020-09-30 09:43:12 -04:00
LeoDog896
fbb317aa11 Update contributors 2020-09-30 09:30:12 -04:00