Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,264 Commits 4 Branches 180 Tags
v143.1
Commit Graph
16264 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken bdeba22561 Switched to v7 server list 2021-06-24 17:58:26 -04:00
AnukenandGitHub 640c7851cf Update servers_be.json 2021-06-24 17:57:38 -04:00
AnukenandGitHub c0991a9baa Create servers_v7.json 2021-06-24 17:57:27 -04:00
Anuken 5af6e8c5de Preparations for 127 pre-alpha release 2021-06-24 17:25:08 -04:00
Anuken 2d4677aa27 Reduced unit item glow 2021-06-24 17:00:33 -04:00
Anuken 984b646103 Merge remote-tracking branch 'origin/master' 2021-06-24 15:38:26 -04:00
Anuken 0949852758 Logic wait & content look up instructions 2021-06-24 15:38:20 -04:00
Anuken d54b7dc396 WIP payload deconstructor 2021-06-24 12:35:44 -04:00
MEEP of FaithandGitHub d4c409252b Allow shock mines to spawn bullets (#5454) 
* Allow shock mines to spawn bullets

* Fix up some issues
 2021-06-24 08:39:37 -04:00
Anuken 38a9ad9ec1 Fixed #5455 2021-06-23 16:22:00 -04:00
Anuken e7ec2da063 Asteroid variants 2021-06-23 16:21:12 -04:00
Anuken c70be45a25 Merge remote-tracking branch 'origin/master' 2021-06-23 14:02:10 -04:00
Anuken 186e8f707e Fixed #5453 2021-06-23 14:02:06 -04:00
AnukenandGitHub e3351e0c23 Typo fix 2021-06-23 11:59:02 -04:00
Anuken b08f198629 Merge remote-tracking branch 'origin/master' 2021-06-23 11:57:55 -04:00
Anuken 1b3e99fbb0 Remove linear filtering on iOS 2021-06-23 11:57:51 -04:00
buthed010203andGitHub f74c153a47 or (#5449) 2021-06-23 08:47:14 -04:00
Anuken 2613ff6796 Fixed #5448 2021-06-23 08:46:50 -04:00
Anuken c404e7e1c6 Fixed #5447 2021-06-22 16:54:32 -04:00
Anuken d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken d468a4f328 Removed unnecessary TODOs 2021-06-22 16:07:19 -04:00
Anuken 4417a83424 Merge remote-tracking branch 'origin/master' 2021-06-22 14:22:58 -04:00
Anuken 45dc72faf6 Removed unnecessary themes 2021-06-22 14:22:54 -04:00
Anuken 1630e1a7fb Asteroid gen progress 2021-06-22 14:22:31 -04:00
Patrick 'Quezler' MounierandGitHub 42c643f769 Fix ammo multiplier exception in itemturret (#5446) 2021-06-22 13:35:28 -04:00
Volas171andGitHub b7d5f9a7ab Add Mindustry Reborn to v7 and v6 ServerList (#5444) 
* reborn v6

* v7 reborn lol

* yikes
 2021-06-22 10:33:38 -04:00
Anuken b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken ff3940865e A. 2021-06-21 19:35:00 -04:00
Darkness6030andGitHub 7e7d6120ad Update mindurka ip (again) (#5443) 
Sry, anuke
 2021-06-21 14:16:44 -04:00
Anuken 4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken 448d1e2c77 Cleanup 2021-06-20 09:50:25 -04:00
Anuken d6566830ac Ignore Discord RPC exceptions 2021-06-20 08:48:05 -04:00
Anuken 5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken b7b9d48d1e Cleanup 2021-06-19 21:31:37 -04:00
Anuken 3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken ca60309fde Asteroid generator progress 2021-06-19 11:17:52 -04:00
Anuken 8f6365015a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-18 18:40:02 -04:00
Anuken 12dfd71345 Minor load markup fix 2021-06-18 15:44:35 -04:00
Anuken 60b6e93f7c arc 2021-06-18 15:25:40 -04:00
Anuken 128174faa4 NOTHING 2021-06-18 15:19:28 -04:00
Anuken 7ab0c86978 Stencil buffer fallback 2021-06-18 15:14:08 -04:00
Anuken 5f0ec79b0f Fixed crash logs sometimes not saving 2021-06-18 09:33:12 -04:00
Anuken 5d8f6d7c97 More environmental support 2021-06-18 09:31:28 -04:00
Anuken b77b89abfb More environmental support 2021-06-17 14:34:57 -04:00
Anuken 23ced8d006 aa 2021-06-17 11:10:39 -04:00
Anuken 016e5ab97e Env rules for many various blocks 2021-06-17 11:08:01 -04:00
Anuken afe963ca5d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/editor/MapInfoDialog.java
	core/src/mindustry/maps/filters/ClearFilter.java
	core/src/mindustry/mod/ClassMap.java
	gradle.properties
 2021-06-17 10:44:51 -04:00
Anuken 15affaad9b Cleaner impact reactor explosion 2021-06-16 16:53:09 -04:00
MEEP of FaithandGitHub a74bc0c077 block destroyEffect (#5427) 2021-06-16 15:55:08 -04:00