Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,745 Commits 4 Branches 180 Tags
cb225ba8f61ed412cff2443e6dd7aca665b2b6b8
Commit Graph

11078 Commits

Author SHA1 Message Date
Cubical box
93d2f60b56 Boss music for non-wave guardians (#9964) 
* why do I hear guardian music

* Update contributors

* format

* switch up

* switch up

* why

* no traces left behind
 2024-06-20 10:50:01 -04:00
Anuken
5376ea1f17 Merge remote-tracking branch 'origin/master' 2024-06-20 10:49:23 -04:00
Anuken
3e3a24794c Fixed #9957 2024-06-20 10:49:14 -04:00
Anuken
7a42cffa6d Update LStatements.java 2024-06-17 07:40:30 -04:00
Redstonneur1256
58dbc5104f Logic data instruction (#9935) 
* Logic `data` instruction

* Rename to `clientdata` & reliable option

* frog

Co-authored-by: Anuken <arnukren@gmail.com>

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-16 09:29:35 -04:00
Anuken
56b0deb910 Removed @solid variable 2024-06-16 01:35:48 -04:00
Anuken
5c9e9e3ff4 Block solid sensor 2024-06-16 01:24:52 -04:00
Anuken
7f9eb87313 Logic icon support for all blocks 2024-06-16 01:11:54 -04:00
MEEPofFaith
5c23abf2d8 Add destination tile to block rotatedOutput (#9949) 
* Add destination to rotatedOutput

* Apply to GenericCrafter for output directions.

* Forgot to remove some logs
 2024-06-16 00:42:40 -04:00
Redstonneur1256
9f92a5ac06 Logic Refactor (#9940) 
* Replace logic variable indexes

* Fix `draw print`'s align

* Update core/src/mindustry/logic/LExecutor.java

Co-authored-by: Anuken <arnukren@gmail.com>

* Remove duplicated variables

* Update core/src/mindustry/world/blocks/logic/LogicBlock.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-16 00:37:04 -04:00
Jason
f26b03dc6c Map rule for air spawns (#9922) 
* air use spawns

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add the rule

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* add rule in ui

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* bundle

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* tie it to rules.waves

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* :)

Contributing.md says yes

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

* indent

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>

---------

Signed-off-by: Jason <131086642+JasonP01@users.noreply.github.com>
 2024-06-16 00:34:47 -04:00
Anuken
2d4d38990d Merge remote-tracking branch 'origin/master' 2024-06-13 21:59:35 -04:00
Anuken
a39b05ffc2 Scanner -> BufferedReader 2024-06-13 21:59:28 -04:00
Mythril382
b1e683a963 JSON Stuff (#9933) 
* why is everything-

* don't shrink

* they're different????????

* varabel

* i cannot ignore it

* check

* a

* missing ops
 2024-06-12 17:32:53 -04:00
Anuken
d8e5818a45 Merge remote-tracking branch 'origin/master' 2024-06-08 12:55:11 -04:00
Anuken
f0bee7f19f Pathfinder bugfixes 2024-06-08 12:55:04 -04:00
Anuken
197fbbf46e multi-chooser fix 2024-06-02 16:26:36 -04:00
Anuken
1fc83e6b0f Merge branch 'master' of https://github.com/Anuken/Mindustry 2024-06-02 16:11:33 -04:00
Anuken
a7aa600ed6 Native multi file chooser 2024-06-02 16:11:29 -04:00
Mythril382
84774a0a80 driving in masses (#9915) 2024-06-02 13:20:17 -04:00
Anuken
8944b08fbf Fixed map load dialog 2024-05-27 21:45:23 -04:00
Anuken
05c2d47d51 Invert 2024-05-27 18:25:39 -04:00
Anuken
4d2163d248 Less frequent Erekir turret retargeting when valid target is present 2024-05-27 18:12:21 -04:00
Anuken
a260710ee6 MacOS file chooser fix 2024-05-27 17:57:34 -04:00
Anuken
6e7613dee3 Fixes 2024-05-27 17:34:34 -04:00
Anuken
9ac8d9a821 Fixes 2024-05-27 17:29:04 -04:00
Anuken
e7d7890891 Fixes 2024-05-27 17:27:40 -04:00
Anuken
f51c6e458d Fixed unit shields breaking on spawn 2024-05-27 11:25:34 -04:00
Anuken
6243ef6d4a Fixed #9892 2024-05-27 09:40:52 -04:00
Anuken
f1f17965bc Fixed #9888 2024-05-26 09:31:40 -04:00
Anuken
f30b24f4ac Closes Anuken/Mindustry-Suggestions/issues/5012 2024-05-25 22:40:37 -04:00
Anuken
a0569a63bc Possible entity collision variable overwrite fix 2024-05-25 21:50:12 -04:00
Anuken
37dc449471 Processor list bugfixes 2024-05-24 22:02:37 -04:00
Anuken
b4b6b9fa44 World processor list in editor 2024-05-24 21:46:15 -04:00
Anuken
19b6b60ac5 Merge remote-tracking branch 'origin/master' 2024-05-23 11:54:33 -04:00
Anuken
779a8f75bc Fixed #9876 2024-05-23 11:54:26 -04:00
WayZer
a14daab7e9 Update BeamDrill.java (#9857) 2024-05-18 14:25:41 -04:00
Anuken
515431de02 Fixed #9847 2024-05-13 10:24:26 -04:00
Anuken
328ba21ceb Fixed trail not shortening 2024-05-11 13:35:26 -04:00
Anuken
6cf371b949 Unloader optimizations from buthed 2024-05-08 10:24:38 -04:00
Anuken
db314c1134 Possible pathfinder error fix 2024-05-07 16:33:08 -04:00
Anuken
a8b08dadea Pathfinder crash "fix" 2024-05-07 15:26:32 -04:00
Anuken
251e5cc3e7 Pathfinder error fix 2024-05-07 13:31:39 -04:00
Anuken
abf3111bdc Fixed #9821 2024-05-07 11:39:11 -04:00
Anuken
6d90202949 Merge remote-tracking branch 'origin/master' 2024-05-06 17:11:07 -04:00
Anuken
fd81bf13dd Closes Anuken/Mindustry-Suggestions/issues/4993 2024-05-06 17:11:00 -04:00
Elixias
b12fac3aef i fix bug heheheheheheheeeeh (#9808) 2024-05-04 09:18:59 -04:00
Anuken
d934fff02e Merge remote-tracking branch 'origin/master' 2024-05-03 15:57:32 -04:00
Anuken
179adabd56 Fixed #9804 2024-05-03 15:57:22 -04:00
Andrey Andreyevich Bienkowski
08429b5492 Add turret ammo capacity to the in-game help (#9777) 
* Add turret ammo capacity to the in-game help

* Rename max shots to ammo capacity

* Rename ammo multipier to ammo per item
 2024-05-03 14:11:23 -04:00