Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,959 Commits 4 Branches 180 Tags
fbdfef625a935b15d55637ae0461c9794b68ef89
Commit Graph
14272 Commits
Author SHA1 Message Date
Anuken 24ca434bae Take into account string length in client snapshots 2021-11-05 08:51:59 -04:00
Anuken 57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken 189604474c These things exist now 2021-11-04 22:34:42 -04:00
Anuken 5fe8ed88a6 Fixed #6305 2021-11-04 22:30:19 -04:00
Anuken b553f5afc2 Merge remote-tracking branch 'origin/master' 2021-11-04 22:23:36 -04:00
Anuken 5e534822b8 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/UnitType.java
	gradle.properties
 2021-11-04 19:39:16 -04:00
Anuken 9e68b0a72b Fixed #6304 2021-11-04 19:34:28 -04:00
Anuken c43ca32b7d cleanup 2021-11-04 19:33:38 -04:00
Anuken 3a70a26b93 Fixed 'spark' name conflict 2021-11-04 16:20:39 -04:00
Anuken 0effae1cd7 sprites 2021-11-04 15:42:25 -04:00
Anuken 240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken 1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Matthew PengandGitHub 7884bbd299 stack conveyor looks weird on payload conveyors (#6295) 2021-11-03 13:37:02 -04:00
Matthew PengandGitHub 996193ea69 payloadRotation field (#6294) 2021-11-03 13:34:42 -04:00
Matthew PengandGitHub 3574b982ab misspelling (#6291) 2021-11-02 22:03:47 -04:00
Matthew PengandGitHub a438be7fcd when and why was this hardcoded (#6289) 2021-11-02 20:22:07 -04:00
Anuken 38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken 00f03d793f Bugfixes 2021-11-02 12:52:59 -04:00
Anuken 18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Anuken bd30fee404 I guess people need to be yelled at for bad schematics 2021-11-02 10:39:22 -04:00
Anuken 00293d022c progress 2021-11-02 10:39:05 -04:00
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 cffd355045 BuildTurret save queue 2021-11-02 00:37:14 -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
Anuken f108791379 BuildTurret AI, efficiency 2021-11-02 00:23:32 -04:00
Anuken 6fb2b3e920 WIP build tower 2021-11-02 00:13:25 -04:00
Anuken 00bea730e0 Cleanup 2021-11-01 21:18:00 -04:00
hortiSquashGitHubcitrusMarmelade
 		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 a2d7f21518 block visibility tweaks 2021-11-01 15:26:30 -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 fbc140e99d sprites 2021-11-01 12:23:44 -04:00
Anuken 5e249e50dd Beam tower 2021-11-01 11:46:32 -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
Yuri PolyakovandGitHub 450f651c8f Update bundle_ru.properties (#6267) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2021-11-01 09:32:57 -04:00
Darkness#3729andGitHub 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
NgLam is SIMPandGitHub 4cbc4a0bca Update Vietnamese translation for V7 (#6246) 2021-11-01 09:31:34 -04:00
VizardAlphaandGitHub 99e7fcd2d2 Update bundle_fr.properties (#6241) 
* Update bundle_fr.properties

After checking, there was some text missing to be translated.

* Minor modification
 2021-11-01 09:31:25 -04:00
Matthew PengandGitHub 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 ebf3e0fbd1 Cloud fix 2021-10-31 15:05:03 -04:00
Anuken 9c62d49eb4 Clear team blocks on derelict 2021-10-31 14:10:18 -04:00
Anuken a511e50a7b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-31 13:33:46 -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 PengandGitHub 4999c25723 Homing on healing bullets does not take collided into account (#6276) 2021-10-31 13:03:19 -04:00
Anuken e36c66c87b Duct router/sorter combo 2021-10-31 10:58:14 -04:00