Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,682 Commits 4 Branches 180 Tags
65f1780dcc92f43e70734bba6cc5196607ce099e
Commit Graph
575 Commits
Author SHA1 Message Date
Anuken 9c29706297 Only draw status for player's team blocks 2021-06-30 19:09:48 -04:00
Anuken 3ea3df5c73 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-28 18:57:27 -04:00
Anuken 17eee61a93 Fixed #5478 2021-06-26 09:34:25 -04:00
Anuken d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken 448d1e2c77 Cleanup 2021-06-20 09:50:25 -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 7ab0c86978 Stencil buffer fallback 2021-06-18 15:14:08 -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 865ee952c9 WIP polygonal core protection 2021-06-16 13:26:18 -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 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 4eb0852f9f Lighting bugfixes 2021-06-12 17:22:12 -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 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 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 a7de30ba53 RidgedPerlin cleanup / More river noise options 2021-06-07 20:38:17 -04:00
Anuken 0582cfac2b Prefer Team#data() for team data 2021-06-07 15:04:45 -04:00
Anuken 9144f57b16 Fixed #5369 2021-06-05 13:38:32 -04:00
Anuken 974ebe6937 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-06-05 11:57:14 -04:00
genNAowlGitHubLeonwang4234Leonwang4234Anuken
 		6d28098180 Fix Boat Trails Being Drawn on Land (#5340) 
* update

* Revert "update"

This reverts commit 6ff3523276.

* Hacky Implementation

* Revert "Hacky Implementation"

This reverts commit 632121312d.

* Not so Hacky Implementation

Co-authored-by: Leonwang4234 <62972692+Leonwang4234@users.noreply.github.com>
Co-authored-by: Leonwang4234 <leonwang4234@gmail.com>
Co-authored-by: Anuken <arnukren@gmail.com>
 2021-06-03 14:31:23 -04:00
Anuken f1cf1efe32 Build retry 2021-06-03 14:23:16 -04:00
Anuken ac20b17e0b Mod bugfixes 2021-06-03 13:58:56 -04:00
Anuken 7a93c21d10 Test: Disable antialiasing 2021-06-03 09:49:41 -04:00
Anuken 7dd2a3ba70 uncomment 2021-06-02 12:42:09 -04:00
Anuken 92e970456e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-06-02 12:41:46 -04:00
Anuken 662473936c Remove unused shader 2021-06-02 12:41:19 -04:00
Anuken e9129e6f43 Unspoiled 2021-06-02 11:15:30 -04:00
Anuken 28b235ef07 Partial 7.0 merge - API preview 2021-06-02 11:08:08 -04:00
Anuken afd6570ced More floor render optimization 2021-03-18 22:18:21 -04:00
Anuken 49c099a03c Minor floor renderer optimization 2021-03-18 21:55:33 -04:00
Anuken 9384d661c1 Removed unnecessary dispose() 2021-03-18 16:14:53 -04:00
Anuken a8c31d838f Mesh attribute cleanup 2021-03-18 15:18:59 -04:00
Anuken 46cf48e012 Reverted IntelliJ's "cleanup" 2021-03-18 12:58:57 -04:00
Anuken bfa9d65314 Ban player ID before IP 2021-03-18 12:57:27 -04:00
Anuken b1e8001ae8 Minor cleanup 2021-03-09 19:04:29 -05:00
MEEP of FaithandGitHub 569293e577 Shadow with width/height (#4609) 2021-03-05 11:21:23 -05:00
Anuken 9d5454e5ce Fixed #4694 2021-02-16 09:13:44 -05:00
Anuken 07a27e913c Added UnitBuild transition class 2021-02-14 08:47:53 -05:00
Anuken 9050937900 Name cleanup 2021-02-12 19:40:29 -05:00