Petr Gašparík
|
81e4fb3759
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into v106-alpha
|
2020-10-05 11:56:55 +02:00 |
|
Anuken
|
8e49d73765
|
Nullable region arrays
|
2020-10-04 15:22:41 -04:00 |
|
Anuken
|
d0d0f5a26f
|
Fixed #2834
|
2020-10-04 15:06:13 -04:00 |
|
Anuken
|
702ba0ae84
|
Bugfixes
|
2020-10-04 12:48:33 -04:00 |
|
Anuken
|
605a370679
|
Fixed turrets firing without power as players
|
2020-10-04 09:58:53 -04:00 |
|
Anuken
|
c4fb84c359
|
Weapon charge sound
|
2020-10-04 09:42:49 -04:00 |
|
Anuken
|
55feb38cb7
|
Merge remote-tracking branch 'origin/master'
|
2020-10-04 09:11:42 -04:00 |
|
Anuken
|
3ad5167dc9
|
Fixed #2827
|
2020-10-04 09:11:38 -04:00 |
|
Gdeft
|
08dfded0c2
|
Fix spelling
|
2020-10-04 07:15:27 +07:00 |
|
Anuken
|
b561b38b56
|
Fixed #2824
|
2020-10-03 19:07:16 -04:00 |
|
Anuken
|
187c98b830
|
Merge remote-tracking branch 'origin/master'
|
2020-10-03 15:35:29 -04:00 |
|
Anuken
|
06f9aa5f84
|
things
|
2020-10-03 15:35:26 -04:00 |
|
Anuken
|
9a92e0246e
|
Merge pull request #2807 from MEEPofFaith/patch-1
Define payload capacity of payload conveyors on the conveyor itself.
|
2020-10-03 10:37:41 -04:00 |
|
Anuken
|
58a62ad19c
|
implicit nullable types
|
2020-10-03 10:19:00 -04:00 |
|
MEEP of Faith
|
8d4dff2481
|
Change the comment.
|
2020-10-02 21:22:11 -07:00 |
|
MEEP of Faith
|
f6d805638c
|
Then apply flexibility to the Payload Conveyor
Modding :D
|
2020-10-02 21:19:53 -07:00 |
|
MEEP of Faith
|
8f1869672d
|
Variable fits limit.
|
2020-10-02 21:16:45 -07:00 |
|
Anuken
|
7a307bbe9c
|
cleanup
|
2020-10-02 23:15:52 -04:00 |
|
Anuken
|
35af71c613
|
Moved Nullable to utils package
|
2020-10-02 23:11:26 -04:00 |
|
Anuken
|
43936b536e
|
Cleanup
|
2020-10-02 20:23:37 -04:00 |
|
Anuken
|
5861fe61b2
|
Cleanup
|
2020-10-02 19:51:30 -04:00 |
|
Anuken
|
a3224b7082
|
Improved replacement system
|
2020-10-02 11:14:18 -04:00 |
|
Anuken
|
138434d029
|
Fixed #2799 / Fixed #2797
|
2020-10-02 09:54:08 -04:00 |
|
Anuken
|
215cfaa42f
|
Fixed #2793
|
2020-10-01 16:03:13 -04:00 |
|
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 |
|
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
|
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
|
1697fec311
|
Tsunami balancing
|
2020-09-30 16:40:45 -04:00 |
|
Anuken
|
d07c74b60f
|
Re-added tap event for servers
|
2020-09-30 15:01:46 -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 |
|