Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,747 Commits 4 Branches 180 Tags
77044db39f4b5c80ffc020c783c1fe660bc92caf
Commit Graph

4169 Commits

Author SHA1 Message Date
Anuken
b418afed63 Added WorldLabel entity for better server-side labels 2021-11-02 10:03:44 -04:00
Anuken
99d30b6351 Fixed #6287 2021-11-02 09:04:37 -04:00
Anuken
c4dc7e91f3 Merge remote-tracking branch 'origin/master' 2021-11-02 00:24:33 -04:00
Anuken
48b9bbc317 Less thruster rotation 2021-11-02 00:24:28 -04:00
hortiSquash
134ef9e00e hortiloaders hotfix randomness (#6283) 
* hortiloaders hotfix randomness

Improved the unloaders' balance with multiple blocks having the same load

* deterministic lets go

Co-Authored-By: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>

* update contributors

forgot to add them since they helped a lot for the previous commits/PRs

Co-authored-by: citrusMarmelade <20476281+citrusMarmelade@users.noreply.github.com>
 2021-11-01 17:34:40 -04:00
Anuken
f5c09845ae Fixed #6282 2021-11-01 15:29:07 -04:00
Anuken
72e3461745 indent 2021-11-01 15:15:13 -04:00
Anuken
8cabae1d46 Display infinity symbol for "unlimited" unit cap 2021-11-01 12:27:00 -04:00
Anuken
779bab0344 Merge remote-tracking branch 'origin/master' 2021-11-01 09:41:39 -04:00
Anuken
0639e3eedb Power pickup bugfixes 2021-11-01 09:41:33 -04:00
Darkness#3729
13d16f1883 InvalidCommandHandler (#6247) 
* InvalidCommandHandler

* Update NetClient.java

* Add player

* And here

* :thonk:

* And this

* Update NetClient.java
 2021-11-01 09:32:22 -04:00
Matthew Peng
223fb8d6f5 Basic unitsorts for hjson (#6280) 
* Create some basic unitSorts

* Set as defaults

* add to ContentParser
 2021-10-31 21:30:35 -04:00
Anuken
e1bf1a1b92 Merge remote-tracking branch 'origin/master' 2021-10-31 13:28:05 -04:00
Anuken
5d93362741 Added support for env flags as arrays of json strings 2021-10-31 13:27:59 -04:00
Matthew Peng
4999c25723 Homing on healing bullets does not take collided into account (#6276) 2021-10-31 13:03:19 -04:00
Zelaux
24810ddbf5 Block classes are now responsible for flipping of blocks in schematics. (#6254) 2021-10-31 09:35:16 -04:00
Leonid Skorospelov
d16739f86a Add event PlayerConnectionConfirmed (#6274) 2021-10-31 09:31:53 -04:00
TranquillyUnpleasant
1a6d2e9dd6 fix ai (#6273) 2021-10-31 09:30:33 -04:00
Anuken
1a0bcfc745 Added unit build requirements to stats 2021-10-30 22:49:53 -04:00
Anuken
4a94d9f2b3 Remove mod count from crash 2021-10-30 22:30:00 -04:00
Anuken
312f4d8462 Only log enabled mods in crash 2021-10-30 22:24:48 -04:00
Anuken
859c2987f0 Merge remote-tracking branch 'origin/master' 2021-10-30 21:02:54 -04:00
Anuken
a3f4dc7d1d Fixed #6272 2021-10-30 21:02:45 -04:00
Leonid Skorospelov
2e036c6efe Fix MenuOptionChooseEvent not being fired from client (#6265) 2021-10-30 09:23:30 -04:00
Anuken
c0d8ce2803 Fixed #6268 2021-10-30 09:18:06 -04:00
Anuken
f1d1f935fb Fixed #6264 2021-10-29 22:36:24 -04:00
Anuken
828464a449 Why was this false 2021-10-29 20:16:37 -04:00
Anuken
26045904f4 Fixed #6259 2021-10-29 11:29:38 -04:00
Anuken
fc900bec58 Merge remote-tracking branch 'origin/master' 2021-10-28 22:27:26 -04:00
Anuken
850a3cfb4e Fixed #6256 2021-10-28 22:27:22 -04:00
Zelaux
95b6ac36fc Fixed wrong weapon outline height and code duplication (#6250) 
* Fixed wrong weapon outline height and code duplication

* Correct formatting
 2021-10-28 17:19:00 -04:00
hortiSquash
10f2a7b59c hortiloader hotfix (#6248) 
Added an offset so they cycle through all buildings having the same load
 2021-10-28 10:01:05 -04:00
TranquillyUnpleasant
09f718ba3d fix rare crash when someone spawns a lot of units (#6243) 2021-10-27 21:38:32 -04:00
Anuken
be5c46beb8 Weapon layerOffset 2021-10-27 15:51:46 -04:00
Anuken
a441c0bdcb Added deprecated chat method for mod compat 2021-10-27 12:17:24 -04:00
Anuken
a4339b8b2b I should really rebind my aseprite zoom hotkeys 2021-10-27 10:24:13 -04:00
Anuken
4f957017ab Offset ping order 2021-10-27 10:13:49 -04:00
Anuken
898bddee7c Merge remote-tracking branch 'origin/master' 2021-10-26 09:52:07 -04:00
Anuken
860e4a2999 Clamp pixelator FBO size 2021-10-26 09:52:02 -04:00
hortiSquash
59a480cb30 hortiloaders 1.0.3.0 bug fix (#6233) 
* hortiloaders 1.0.3.0 bug fix

it didnt unload from StackConveyors/Storage when they had the same loadfactor as the factory

* unloader fix, using fields
 2021-10-25 18:22:56 -04:00
Zelaux
46c6a6f6f7 Fixed using wrong weapon outline height (#6228) 2021-10-24 20:56:15 -04:00
Anuken
b6acf1af0a Comparator cleanup 2021-10-24 15:18:21 -04:00
hortiSquash
16f4e300a8 fixed the full factory priority bug (#6211) 2021-10-24 15:14:36 -04:00
Anuken
b18b4cdc90 Fixed #6222 2021-10-23 19:59:20 -04:00
Anuken
00e1d69348 Merge remote-tracking branch 'origin/master' 2021-10-23 09:26:35 -04:00
Anuken
88d1165909 Fixed #6220 / Fixed #6217 2021-10-23 09:26:30 -04:00
TranquillyUnpleasant
b22efb8c83 fix block picker working while logic dialog is open (#6215) 2021-10-22 18:52:08 -04:00
TranquillyUnpleasant
5c5acb2d48 Saved games search & Mapsearch filter improvements (#6194) 
* better filter menu

* remove unused bundle property

* indent

* Add text instead of using labels

* Saved game search

* Save not map

* auto cursor to search bar

* change icon to terrain
 2021-10-22 18:14:33 -04:00
Anuken
414f27a3b6 Merge remote-tracking branch 'origin/master' 2021-10-22 17:47:22 -04:00
Anuken
009eea1988 Cloud rendering overlap fix 2021-10-22 17:47:17 -04:00