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

11174 Commits

Author SHA1 Message Date
MEEPofFaith
c193206ccb Modded payload factory sprites (#8595) 
* Search for modded payload factory blocks

* Generate payload mass driver outlines in mods

* Revert weird change

* Revert "Revert weird change"

This reverts commit 0afd64077a.
 2024-07-07 11:42:45 -04:00
MEEPofFaith
4a456645d3 ConsumeItemList (#9947) 
* ConsumeItemList

* Add to ContentParser

* Add efficiency multipliers

* Untested adding to ObjectIntMap and ObjectFloatMap

* Use a single map
 2024-07-07 11:38:21 -04:00
Anuken
0021f98335 Merge branch 'master' into do-you-hear-the-voices-too 2024-07-07 11:31:09 -04:00
TripleToxic
82bcf5966e Sensors, SetProp, and SetRule (#9943) 
* some fun things for world proc only

* fix the format artifact

* SetProp and reformating

* Wildcard imports

* Wildcard imports

* velocity conversion

* compacting description

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

* Update core/src/mindustry/world/blocks/defense/turrets/Turret.java

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-07-07 11:28:19 -04:00
Ilya246
e07a739ae2 randomise same-playercount team assignment (#9985) 2024-07-07 11:27:05 -04:00
Anuken
2b5e3ec4aa Fixed #9974 2024-07-07 11:18:13 -04:00
Mythril382
36f07c2590 im not even sure if this is reliable 2024-07-06 12:17:22 +08:00
Mythril382
51dc58379b Merge branch 'master' into do-you-hear-the-voices-too 2024-07-06 12:12:51 +08:00
Anuken
04ec2c0603 Added toggle for always playing music 2024-07-05 21:42:23 -04:00
Anuken
caf0ab581d Item deposit cooldown rule (default: 0.5 sec) 2024-06-30 10:28:01 -04:00
Anuken
400db1b1e8 In-game rule edit dialog 2024-06-24 14:11:56 -04:00
Anuken
2a95b0f8d2 Nova tree build speed nerfs 2024-06-22 16:19:38 -04:00
Anuken
2357e8768b Boost unit rebuild/assist commands 2024-06-22 16:19:38 -04:00
Anuken
87584ebd0b Minor power graph optimization 2024-06-20 17:41:36 -04:00
Anuken
b5e8a2a865 Merge remote-tracking branch 'origin/master' 2024-06-20 17:07:02 -04:00
Anuken
efa5f8a2b5 Fixed #9973 2024-06-20 17:06:55 -04:00
Mythril382
94ebec4b6d should 2024-06-21 01:50:48 +08:00
Elixias
0019b78f71 Custom shield colouring (#9647) 
Five extra minutes I had the luxury of spending fixing Git because it exploded again

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-06-20 11:27:22 -04:00
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
Mythril382
07d20a8da5 refactor 1 2024-06-17 02:21:55 +08:00
Mythril382
f4882d6615 Merge branch 'master' into do-you-hear-the-voices-too 2024-06-17 02:06:46 +08: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
0397d3bf89 Merge branch 'master' into do-you-hear-the-voices-too 2024-06-03 02:15:36 +08: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
Mythril382
41e2183793 Merge branch 'master' into do-you-hear-the-voices-too 2024-05-28 00:40:31 +08:00
Mythril382
0067af0e2c changes 2024-05-28 00:31:00 +08:00