Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,390 Commits 4 Branches 180 Tags
336eafdb6aa948f91af0e107fe6ca497764806e5
Commit Graph
482 Commits
Author SHA1 Message Date
Mythril382andGitHub 580d35cf1e the arc pr 2024-05-27 12:54:27 +08:00
Mythril382andGitHub d24f031cb4 it's 4:14, i should sleep 
anuke was right, this is a mess
 2024-05-27 04:13:35 +08:00
Mythril382andGitHub 7f80a1879e sound id 2024-05-27 03:35:37 +08:00
Mythril382andGitHub bc2be5de25 Delete core/src/mindustry/logic/LogicSound.java 2024-05-27 02:10:12 +08: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 be64defc37 Logic filter cleanup 2024-04-25 10:34:44 -04:00
BlackDeluxeCatGitHubAnuken
 		bac6f7cfa9 Add logic filter (#7251) 
* logic filter

* bundles

* available in map editor

* @this = null

* generating only

* ensure not using net

---------

Co-authored-by: Anuken <arnukren@gmail.com>
 2024-04-25 10:23:13 -04:00
Mythril382andGitHub 753e992d6e slight desktop issue 2024-04-12 21:48:49 +08:00
Mythril382andGitHub 74cf56d43c h 2024-04-12 14:03:32 +08:00
Mythril382andGitHub c77b866e56 much error 2024-04-12 13:58:54 +08:00
Mythril382andGitHub 67fc5ba15b h 2024-04-12 13:47:58 +08:00
Mythril382andGitHub 780f13be57 el ui 2024-04-12 13:02:25 +08:00
Mythril382andGitHub e9a4699c8b the ctrl+c ctrl+v is real 2024-04-12 12:36:02 +08:00
Mythril382andGitHub 75106282c3 forgor 2024-04-12 12:35:32 +08:00
Mythril382andGitHub 38b5ce0853 i have no idea how to do this automatically 2024-04-12 12:22:05 +08:00
Mythril382andGitHub 63783a1795 why don't you do this by default 2024-04-12 12:15:32 +08:00
Mythril382andGitHub 05d499fb18 bingor 2024-04-12 12:09:52 +08:00
Mythril382andGitHub 03e9c861e3 Merge branch 'Anuken:master' into do-you-hear-the-voices-too 2024-04-12 11:55:10 +08:00
Redstonneur1256andGitHub e8e8189a92 Add ShapeMarker starting and ending angles (#9729) 2024-04-08 19:51:50 -04:00
Cubical boxandGitHub d3a78a9d42 Fetching unit by type, build without type, and fixing a nullpointer crash (#9703) 
* Pluh

* Pluh

* Update LExecutor.java

* fixed the null

* Update LExecutor.java

* I will point your null exception

* is it null or nah

* it is nah

* Update LExecutor.java

* Update LExecutor.java

* null zero
 2024-04-02 10:03:14 -04:00
Anuken a8588c38b4 Fixed #9687 2024-03-30 14:22:22 -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
Mythril382andGitHub 11f9052715 Merge branch 'Anuken:master' into do-you-hear-the-voices-too 2024-03-11 17:25:34 +08:00
Cubical boxandGitHub f18a61d579 add shield to settable list (#9612) 2024-03-03 00:29:03 -05:00
Anuken e3b24ac980 WIP logic display transform matrix support 2024-02-26 10:29:14 -05:00
Anuken 54967429fe Fixed #9566 2024-02-17 09:03:09 -05:00
Anuken 1542f7c28e UI#loadColors moved earlier in init 2024-02-10 17:20:35 -05:00
Anuken 2fd92b8c80 Processor global variable dialog 2024-02-09 18:09:41 -05:00
MEEPofFaithandGitHub e1a5484074 Allow mods to add to logic effect map (#9507) 
* Allow mods to add to logic effect map

* Switch to being only a single add.
 2024-02-01 19:04:51 -05:00
Redstonneur1256andGitHub 6a429184aa update markers (#9506) 
* update markers

* update markers & minimap rendering
 2024-01-30 19:35:39 -05:00
Redstonneur1256andGitHub b9bf4ee794 Allow markers to be deleted (#9485) 2024-01-23 22:05:14 -05:00
Mythril382andGitHub 57e317fa3f foror 2024-01-20 23:00:15 +08:00
Mythril382andGitHub 2b0653bda2 aaaa 2024-01-20 22:59:45 +08:00
Mythril382andGitHub 1edfd9b0e1 issue 2024-01-20 22:55:32 +08:00
Mythril382andGitHub eed30eb2e7 hell 2024-01-20 22:53:14 +08:00
Mythril382andGitHub 2387963936 hell 2024-01-20 22:50:22 +08:00
Redstonneur1256andGitHub 9d4f5ff87c Fix wait instruction inconsistency (#9479) 2024-01-20 09:37:18 -05:00
Anuken 944797f8e1 Cleared unit timeouts on reset 2024-01-15 12:59:21 -05:00
BlackDeluxeCatandGitHub 931c03945d Further Fixed #7310 (#9456) 2024-01-15 12:58:36 -05:00
Anuken 1d894bdacd Objective marker cleanup & optimization 2024-01-14 12:41:20 -05:00
ApsZoldat 8ab37c5ce4 Merge branch 'master' of https://github.com/Anuken/Mindustry into markers-update 2023-12-15 19:39:30 +03:00
ApsZoldat 317a533b5c millimicronanopico setmarker texture fix (object print consistency) 2023-12-13 18:24:08 +03:00
ApsZoldat 5830259e41 Markers draw code refactor, minor text marker control changes 2023-12-12 22:40:33 +03:00
BalaM314andGitHub 68b06fdea6 Allow fetching unitCount by type, and buildCount without type (#9374) 
* Allow fetching unitCount by type, and buildCount without type

* show in processor ui
 2023-12-12 08:47:40 -05:00
ApsZoldat 4802076bf8 WIP marker changes, fix server name not appearing for saved hosts in join dialog 2023-12-10 22:44:30 +03:00
ApsZoldat c20684025e Small git shenanigans to actually (i really hope) revert all the bad stuff 2023-12-07 18:24:51 +03:00
ApsZoldat cf131696bd Merge remote-tracking branch 'upstream/master' 2023-12-04 22:43:59 +03:00
ApsZoldat cf02b0f36d Make setmarker ignor null values, remove redundant marker control operations 2023-12-04 22:39:32 +03:00
Anuken de50b207e5 Revert back to {0}-style format 2023-12-01 21:16:37 -05:00