Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,732 Commits 4 Branches 180 Tags
448d1e2c7770f20e1e70a815dedbece0673929ee
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 448d1e2c77 Cleanup 2021-06-20 09:50:25 -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
Anuken 9088d9eb39 Polygonal protection bugfixes 2021-06-16 15:07:14 -04:00
Anuken f11f390c1f Polygonal protection for built-in PvP maps 2021-06-16 14:51:37 -04:00
Anuken 865ee952c9 WIP polygonal core protection 2021-06-16 13:26:18 -04:00
Anuken efcae883fb Experimental core-capture PvP map / Editor filter fixes 2021-06-16 11:09:18 -04:00
Anuken c623e66694 hhhh 2021-06-15 19:32:06 -04:00
Anuken 97729fd659 Stateless simplex (2) 2021-06-15 19:31:51 -04:00
Anuken eed91eaaa0 # Conflicts: 
#	core/src/mindustry/mod/ClassMap.java
 2021-06-15 19:29:12 -04:00
Anuken fe9ff212b2 Stateless simplex 2021-06-15 19:28:54 -04:00
Anuken 210fb349de Less editor filter state 2021-06-15 12:26:00 -04:00
Anuken 69d8af7874 Editor filter seed saving & cleanup 2021-06-15 11:58:26 -04:00
Anuken 183c922b6b Do not save MirrorFilter temporary vectors 2021-06-15 11:32:49 -04:00
Anuken 964104db65 Merge remote-tracking branch 'origin/master' 2021-06-15 09:39:27 -04:00
Anuken 2d8f7cb680 Fixed #5425 2021-06-15 09:39:23 -04:00
Anuken a0f80a8865 it is solved 2021-06-14 11:35:53 -04:00
Anuken 6b5a743583 confusion 3 2021-06-14 11:33:00 -04:00
Anuken 28252173b4 confusion 2 2021-06-14 11:32:46 -04:00
Anuken 2e733273a0 confusion 2021-06-14 11:28:28 -04:00
Anuken 39f4e90fff s t o p 2021-06-14 11:23:47 -04:00
Anuken 22d1700fb2 JITPack appears to be throwing a fit (2) 2021-06-14 11:22:56 -04:00
Anuken 31c39e0148 JITPack appears to be throwing a fit 2021-06-14 11:15:06 -04:00
Anuken e5b80c37eb Renamed misleading github jobs 2021-06-14 11:05:37 -04:00
Anuken 2a451aa41f Disable preview features 2021-06-14 10:59:38 -04:00
Anuken 1a03151966 Enforce JDK 16 as a minimum 2021-06-14 10:55:28 -04:00
Anuken 51040f9f3d Hash fix 2021-06-14 10:42:24 -04:00
Anuken 3ad16ab8aa Upgraded to Gradle 7 & JDK 16 2021-06-14 10:41:19 -04:00
Anuken b58e64ea16 Fixed #5422 2021-06-14 08:47:38 -04:00
Anuken 7fe9e7f9c2 Merge remote-tracking branch 'origin/master' 2021-06-13 19:27:34 -04:00
Anuken 2d9204d638 I guess everything is unsafe now 2021-06-13 19:27:28 -04:00
Anuken a756dec379 Fixed #5419 2021-06-13 11:02:17 -04:00
Anuken 5601f97266 Fixed #5418 2021-06-13 10:12:50 -04:00
Anuken 347b38ba26 Added unit tests for Java, JavaScript and JSON mods 2021-06-12 20:59:28 -04:00
Anuken ac111677c0 Cleanup 2021-06-12 19:56:33 -04:00
Anuken db054add64 Merge 2021-06-12 17:22:46 -04:00
Anuken 4eb0852f9f Lighting bugfixes 2021-06-12 17:22:12 -04:00
Anuken d6016f1b04 Support for hidden weather 2021-06-12 16:59:18 -04:00
Anuken 816ac51beb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-06-12 16:08:17 -04:00
Anuken 7ec713ab66 No URLClassLoader super delegation 2021-06-12 14:26:47 -04:00
Anuken 3d76609f42 . 2021-06-12 14:09:24 -04:00
Anuken ecbf0dcf31 Planet lighting parameters 2021-06-12 11:07:40 -04:00
Anuken 446c2d2dcb more mod loader fixes 2021-06-12 11:00:56 -04:00
Anuken 93651939f2 stop 2021-06-12 10:55:18 -04:00
Anuken 9a8c9dff17 Red ice 2021-06-12 10:54:58 -04:00
Anuken 4b695a5047 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-06-12 10:11:42 -04:00
Anuken d710c2e8b5 Minor generation improvements 2021-06-12 10:11:37 -04:00
Anuken c5261cf2e5 Fixed #5414 2021-06-12 08:44:16 -04:00
Anuken ae52eaab19 Asteroid progress 2021-06-11 21:51:49 -04:00
Anuken c4b1bf3e55 Asteroid progress 2021-06-11 19:59:18 -04:00
Anuken 1eebb48baa Displaced orbit fix 2021-06-11 11:43:55 -04:00
Anuken 537c8f3cc5 Planet progress 2021-06-11 11:31:21 -04:00
Anuken cb0382a15b Clipping bugfixes 2021-06-11 10:15:19 -04:00
Anuken 3527acd33e Mod class loading bugfix 2021-06-11 09:18:59 -04:00
Anuken 83854169b7 Fixed #5412 2021-06-11 08:51:34 -04:00
Anuken 31ebb1d156 Planet progress 2021-06-10 20:46:10 -04:00
Anuken f99b8e35bd Testing single-sector planets 2021-06-10 19:55:06 -04:00
Anuken 9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
Anuken dfd2b22917 Planet method renaming 2021-06-10 18:51:29 -04:00
Anuken c4803d29da Pulverizer texture cleanup 2021-06-10 16:14:53 -04:00
Anuken 8d9d6385f9 Editor variant regions for wall blocks 2021-06-10 15:52:33 -04:00
Anuken e4bd3fab7c Removed MetalFloor class 2021-06-10 15:39:43 -04:00
Anuken e3ea1bdaae Merge remote-tracking branch 'origin/master' 2021-06-10 15:10:56 -04:00
Anuken a180aae838 Blending cleanup / Misc bugfixes 2021-06-10 15:10:52 -04:00
Anuken 448604062d Merge remote-tracking branch 'origin/master' 2021-06-10 09:32:05 -04:00
Anuken bcdbca7337 Fixed #5410 2021-06-10 09:32:01 -04:00
AnukenandGitHub dd500a747b Update deployment.yml 2021-06-10 09:06:05 -04:00
Anuken 32d8f59b5a Merge remote-tracking branch 'origin/master' 2021-06-10 09:04:06 -04:00
Anuken 86bf068ac3 Fixed #5406 2021-06-10 09:03:57 -04:00
Anuken ec2c273c97 Add an automatic item produce requirement 2021-06-09 22:55:48 -04:00
Anuken 35be671d86 Planet constructor tweaks 2021-06-09 22:18:54 -04:00
Anuken 1ce6772601 Merge 2021-06-09 17:15:22 -04:00
Anuken 8c32c00e2b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-09 17:10:49 -04:00
Anuken e3da0f713e Modded techtree bugfixes 2021-06-09 16:15:17 -04:00
Anuken 6f609aa4ee ConsumeCoolant 2021-06-09 14:38:49 -04:00
Anuken c9ff84d03b Test fix 2021-06-09 14:03:29 -04:00
Anuken b04c04f69f New metal floor / Selective floor attribute stats 2021-06-09 13:26:01 -04:00
Anuken adf6465029 Child-first mod class loading 2021-06-09 10:04:23 -04:00
Anuken a8a163ebe2 Fixed Android builds 2021-06-09 08:57:56 -04:00
Anuken 7dcfd648f7 Minor bugfixes 2021-06-09 08:37:26 -04:00
Anuken 1895c7b8e0 Updated Rhino 2021-06-09 08:32:09 -04:00
Anuken 91c0235ff5 #5402 2021-06-08 22:07:45 -04:00
Anuken 25b2458a92 Merge remote-tracking branch 'origin/master' 2021-06-08 21:59:01 -04:00
Anuken 28203ca6e9 Fixed regression introduced in #5361 2021-06-08 21:58:56 -04:00
Anuken 95da46bfa2 Duct bridge input display 2021-06-08 11:49:55 -04:00
Anuken 8962992ef9 Fixed invalid healing effects 2021-06-08 09:14:54 -04:00