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

11111 Commits

Author SHA1 Message Date
Anuken
6e5b1e81ae Crash fix 2024-07-23 07:21:05 -04:00
Anuken
0a224c52b4 Fixed #10042 2024-07-21 07:53:34 -04:00
Anuken
10e1680d3b Fixed #10039 2024-07-19 19:07:10 -04:00
Anuken
394ed99616 More item request validation 2024-07-18 10:04:36 -04:00
Anuken
f6c240262d Fixed incorrect RailBullet length with pierceCap 2024-07-16 17:53:27 -04:00
Anuken
2f1f334d65 Turret ammo sync 2024-07-16 14:17:10 -04:00
Anuken
afc8d5e396 Possible stack conveyor freeze fix (3) 2024-07-15 10:45:32 -04:00
Anuken
dac74f3022 Possible stack conveyor freeze fix (2) 2024-07-15 10:25:47 -04:00
Anuken
13a4179893 Merge remote-tracking branch 'origin/master' 2024-07-15 10:24:36 -04:00
Anuken
2a95f1fe16 Possible stack conveyor freeze fix 2024-07-15 10:24:30 -04:00
Sh1p*nfire
5a493c0338 Update CoreBlock.java (#10025) 
Allows destroyBullet to work on coreBlock.
 2024-07-13 10:30:36 -04:00
Anuken
2075e22ef1 Fixed #10020 2024-07-12 13:15:12 -04:00
Anuken
295573142f Removing Nulls.unit 2024-07-10 16:40:32 -04:00
Anuken
e3ba8b714b Crash fix 2024-07-10 15:28:43 -04:00
Anuken
92e121c05c Fixed unit part progress with multiple weapons 2024-07-10 13:24:03 -04:00
Anuken
07738cbac6 Fixed #10010 2024-07-07 20:17:14 -04:00
Anuken
d8dc9c7c98 Merge remote-tracking branch 'origin/master' 2024-07-07 20:14:16 -04:00
Anuken
cd298edfe7 Unused variable removed 2024-07-07 12:22:12 -04:00
SomeonesShade
a184abb117 Flux Power and Heat Capacity Increase (#9500) 2024-07-07 11:52:58 -04:00
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
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
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
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
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