Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,229 Commits 4 Branches 180 Tags
5e6d59912072e0b0aa0b835c85768863529b79a3
Commit Graph
8118 Commits
Author SHA1 Message Date
Anuken 97f72b8c6b Merge remote-tracking branch 'origin/master' 2024-03-15 14:14:59 -04:00
Anuken 5365014d4f Sector preset init fix 2024-03-15 14:14:53 -04:00
MEEPofFaith 24b845e8b1 Notice of explosiveness 
I feel like my changes are getting a *bit* intrusive.
 2024-03-15 09:25:10 -07:00
MEEPofFaith e96e312693 Merge branch 'master' into power-gen-stats 2024-03-15 08:36:13 -07:00
ElixiasandGitHub 0311cfd275 Full icon overrides (#9642) 
* Something to help with atlas consumption

* nightmares
 2024-03-15 11:08:23 -04:00
Anuken 7be19b3baa Merge remote-tracking branch 'origin/master' 2024-03-14 18:53:35 -04:00
Anuken 40d06c87d1 Mark disabled dependencies #9641 2024-03-14 18:53:28 -04:00
MEEPofFaithandGitHub 60c6e03d32 Weather with World Logic (#9621) 
* Weather sense

Honestly, doesn't seem game changing enough to warrant privileged restriction.

* Weather set

* Rename "snow" to "snowing"

Fix conflict with the snow floor block, though I don't know if this'll have negative repercussions on saves.

* Don't last forever

* Cleanup and bundle

* add space
 2024-03-14 14:25:03 -04:00
GlFolkerandGitHub 3f46080f42 Allow categorized sprite names to not be prefixed. (#9616) 
* Delegate more methods into Planet

* Allow categorized sprite prefixes
 2024-03-14 12:12:28 -04:00
Mythril382andGitHub 11f9052715 Merge branch 'Anuken:master' into do-you-hear-the-voices-too 2024-03-11 17:25:34 +08:00
MEEPofFaith afddb274f6 Don't display locked or hidden items 2024-03-10 13:06:56 -07:00
MEEPofFaith 8e0d3fee67 Allow for simultaneously having both item and liquid efficiency multipliers 2024-03-10 13:01:52 -07:00
MEEPofFaith 3e68285940 Better display for efficiency multiplier consumes 2024-03-10 12:59:00 -07:00
Anuken d7dc180a3f Fixed #9628 2024-03-08 21:04:35 -05:00
Shade 65156e4409 Cyano Boost Requirement Nerfed 
1.5 -> 3 cyano/s
I knew it felt too high, this should be better by a long shot
 2024-03-04 22:39:08 +08:00
Anuken 9e503efd2f Fixed sync issues with large objective trees 2024-03-03 17:09:23 -05:00
Anuken ed26bf18a7 Merge remote-tracking branch 'origin/master' 2024-03-03 14:19:34 -05:00
Anuken ac15b94978 Significant sprite packing memory leak fixes 
additional thanks to GlFolker for reporting issues with undisposed content icon pixmaps
 2024-03-03 14:19:27 -05:00
Cubical boxandGitHub f18a61d579 add shield to settable list (#9612) 2024-03-03 00:29:03 -05:00
Anuken 9bedc0bcd4 Added world switch to bundle 2024-03-02 22:49:54 -05:00
buthed010203andGitHub 277291ce09 Cleanup GameState (#9610) 
* Cleanup GameState

* Braint
 2024-03-02 10:49:11 -05:00
Shade edd235774c Nerfed Eruption Drill Speed 
(5.5 i/s -> 5.33 i/s)
 2024-03-02 23:47:00 +08:00
MEEPofFaithandGitHub aa896362dc Shader getShaderFi check for mod files (#9599) 
* Shader getShaderFi check for mod files

* Just use tree.get()

It defaults to files.internal() if nothing is found. Actually, I think this also has the added benefit of allowing mods to override vanilla shaders by having a frag with an identical name.
 2024-03-01 12:50:28 -05:00
GlFolkerandGitHub 0d795d59c8 Per-tile edge regions (#9601) 
* Delegate more methods into Planet

* Per-tile edges

* You win, IntelliJ
 2024-03-01 09:42:05 -05:00
Shade 69c3e368c3 Final Stats for Attempt#2 
nitro -> ozone
and base eruption buff
(which causes knock on effects as shown)
 2024-02-27 22:51:40 +08:00
Anuken e3b24ac980 WIP logic display transform matrix support 2024-02-26 10:29:14 -05:00
Anuken 755c369496 Merge remote-tracking branch 'origin/master' 2024-02-24 12:31:16 -05:00
Anuken d8a66b7b25 Bundle change for #9591 2024-02-24 12:31:06 -05:00
MEEPofFaithandGitHub 037f752b73 Improve ArmorPlateAbility draw (#9581) 
* Improve ArmorPlateAbility draw

* Revert to tinting

Just make a white shine sprite. Or none-white if you want some interesting visuals with the colors.

* Fix not applying z when drawShine = false
 2024-02-23 17:11:00 -05:00
WayZerandGitHub 192b24f412 Merge branch 'master' into pr-readwrite 2024-02-21 15:39:33 +08:00
Anuken eb42d91c5d Fixed #9573 2024-02-19 10:20:26 -05:00
Anuken 45b4499fbf Merge remote-tracking branch 'origin/master' 2024-02-19 10:06:04 -05:00
Anuken ac4d57013d Fixed #9572 2024-02-19 10:05:58 -05:00
way-zer 08ad8ad7de limit write with @writable 2024-02-18 17:45:18 +08:00
GlFolkerandGitHub 2c3167e668 Delegate more methods into Planet (#9568) 2024-02-17 15:48:33 -05:00
MEEPofFaithandGitHub 4e24b31c0d Allow gasses to be coolants (#9545) 2024-02-17 11:23:25 -05:00
Anuken d2c914f495 Merge remote-tracking branch 'origin/master' 2024-02-17 09:03:14 -05:00
Anuken 54967429fe Fixed #9566 2024-02-17 09:03:09 -05:00
SITUVNgcdandGitHub e6dd6cb44d Make privileged SwitchBlock(World Switch) can't pickup (#9557) 2024-02-16 09:52:31 -05:00
Anuken b27ed03842 Fixed #9561 2024-02-16 09:52:14 -05:00
Anuken 56d0b87443 Fixed #9562 2024-02-16 09:50:18 -05:00
Anuken af13ff9ee0 Merge remote-tracking branch 'origin/master' 2024-02-14 10:37:54 -05:00
Anuken c8d7733826 Fixed #9552 2024-02-14 10:37:48 -05:00
GlFolkerandGitHub d0845b481c Update Sector.java (#9553) 2024-02-14 10:04:55 -05:00
way-zer 33faade426 typo 2024-02-14 16:57:17 +08:00
way-zer 95817a955c amend 2024-02-14 15:50:17 +08:00
WayZerandGitHub 5e5cbda3be Merge branch 'master' into pr-readwrite 2024-02-14 15:13:31 +08:00
way-zer 4cdd0b9646 Extend logic read and write,support targeting LogicBuild 2024-02-14 14:54:19 +08:00
SITUVNgcdandGitHub 7339443604 Fix TextInput::message on mobile (#9549) 
This issue from https://github.com/Anuken/Arc/commit/70f345cc75f541de8f592d3167245691cc9a765b
 2024-02-13 23:17:41 -05:00
Anuken 0d273503be Merge remote-tracking branch 'origin/master' 2024-02-13 21:22:14 -05:00