Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,562 Commits 4 Branches 180 Tags
61fa72dcd3a2933df1d053547b7b85da2b13857f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
 2021-09-17 21:33:01 -04:00
Anuken 5d5d1f8953 0 scroll support 2021-09-17 21:32:43 -04:00
Anuken cdb12a381d Custom background renderer support for mods 2021-09-17 21:20:16 -04:00
Anuken 01771c5288 Merge remote-tracking branch 'origin/master' 2021-09-17 11:46:58 -04:00
Anuken 58a21c3cc7 Arc compatibility 2021-09-17 11:46:52 -04:00
Anuken 263850624a Cleanup 2021-09-17 11:36:57 -04:00
Anuken e08e51b939 Planet background system 2021-09-17 11:23:32 -04:00
Anuken 84935e1bb0 Fixed #6008 2021-09-16 21:25:31 -04:00
Anuken 32baf06c97 Experimental alternate Serpulo generation / Spawn margin decrease 2021-09-16 18:10:38 -04:00
Anuken 76b0ca53c5 Fixed wall assignment 2021-09-16 15:48:08 -04:00
Anuken 18d34c5854 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 14:18:24 -04:00
Anuken ed911d87a3 Planet rendering refactoring 2021-09-16 14:18:17 -04:00
Anuken 0756da0dd1 Fixed shader warnings 2021-09-16 12:41:45 -04:00
Anuken c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken ad425f322c Proper asteroid albedo 2021-09-16 10:33:15 -04:00
Anuken a8fd047cd6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 10:23:31 -04:00
Anuken 845b64945e "Realistic" specular planet lighting 2021-09-16 10:20:32 -04:00
Anuken 7b623e964c gitignore fixes 2021-09-15 22:34:15 -04:00
Anuken e3cceea1af Re-trying JITPack 2021-09-15 22:30:53 -04:00
Anuken e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Anuken c4fe53955b Moved Scripts loaders to Vars.tree.loadSound/Music 2021-09-15 11:24:39 -04:00
Anuken 0068952ba6 Content parser listener 2021-09-15 10:49:22 -04:00
Anuken a3b3745d01 Merge remote-tracking branch 'origin/master' 2021-09-14 21:28:39 -04:00
Anuken 95c3476144 Fixed #6001 2021-09-14 21:28:34 -04:00
Anuken 72841afd96 too soon, apparently 2021-09-14 12:29:29 -04:00
Anuken eb9c3c8033 Use JDK 17 for tests 2021-09-14 12:25:09 -04:00
Anuken e23837a4ba Updated RoboVM / Switched to hard-coded SDK platform jar 2021-09-14 12:21:07 -04:00
Anuken 625f2640d8 Merge remote-tracking branch 'origin/master' 2021-09-14 09:55:40 -04:00
Anuken 01c67b77cb Fixed #5995 2021-09-14 09:55:35 -04:00
Anuken ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Anuken e1ba9f16f6 Merge remote-tracking branch 'origin/master' 2021-09-13 09:04:01 -04:00
Anuken 826ddf4aad strip message newlines 2021-09-13 09:03:56 -04:00
Anuken edbe795aa5 Merge remote-tracking branch 'origin/master' 2021-09-12 20:21:59 -04:00
Anuken 087cd2c55a Cleanup 2021-09-12 20:21:55 -04:00
Anuken 35ffbef557 #5932 2021-09-12 11:07:18 -04:00
Anuken 24db94a55b No server category colors 2021-09-12 11:05:05 -04:00
Anuken 46bda97362 Merge remote-tracking branch 'origin/master' 2021-09-12 09:05:23 -04:00
Anuken a1b9f7d1b3 Fixed #5979 2021-09-12 09:05:18 -04:00
Anuken 2f7c5994a7 Fixed #5978 2021-09-11 15:43:24 -04:00
Anuken 2664bb84be Fixed #5974 2021-09-11 13:30:10 -04:00
Anuken bdcfb7ab45 Merge remote-tracking branch 'origin/master' 2021-09-11 12:15:39 -04:00
Anuken 5cf47f4198 Clamp sector description in info 2021-09-11 12:15:34 -04:00
Anuken 90c2473448 Duct bridge crash fix 2021-09-11 10:07:00 -04:00
Anuken c5a90759e5 Fixed #5971 / Fixed #5973 2021-09-11 08:45:17 -04:00
Anuken cccce6badd Make Base AI walls correspond to tier 2021-09-10 21:11:57 -04:00
Anuken decc570867 Slightly denser generated bases 2021-09-10 17:23:17 -04:00
Anuken caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
Anuken b8fa15e546 Merge remote-tracking branch 'origin/master' 2021-09-10 16:33:30 -04:00
Anuken 47d5be679d Map progress 2021-09-10 16:33:26 -04:00
Anuken 7c028ffcb8 Experimental positional spawn support / WIP map 2021-09-10 13:56:12 -04:00
Anuken 10c3f9e44a River noise target field 2021-09-10 09:22:39 -04:00
Anuken b2a634e5e7 Untested/WIP naval campaign map 2021-09-10 09:17:25 -04:00
Anuken ae0a70703b Wave edit dialog cleanup 2021-09-09 22:25:08 -04:00
Anuken 08d7390775 Merge remote-tracking branch 'origin/master' 2021-09-09 17:05:00 -04:00
Anuken cbe188abab Map editor bugfixes / Re-added build noise 2021-09-09 17:04:55 -04:00
Anuken a3ede6cf0b Merge remote-tracking branch 'origin/master' 2021-09-09 12:08:38 -04:00
Anuken e997768a0a d 2021-09-09 12:08:33 -04:00
Anuken 1a686c44a1 Fixed editor crash 2021-09-09 09:59:35 -04:00
Anuken 9e737cd3fe Merge remote-tracking branch 'origin/master' 2021-09-08 20:44:31 -04:00
Anuken deed84f9a3 Public power graph contents 2021-09-08 20:44:26 -04:00
Anuken a5697a7d4b Fixed mod alpha bleeding not applying correctly 2021-09-08 15:09:05 -04:00
Anuken 2222330b43 Added hint for high threat level sector 2021-09-08 11:23:37 -04:00
Anuken cde192b59a Added Block#allowConfigInventory 2021-09-08 09:04:04 -04:00
Anuken c98eb2edd7 Fixed #5958 2021-09-08 08:42:23 -04:00
Anuken dd7062f0f7 ParticleEffect#sizeInterp / Log usable RAM 2021-09-07 22:32:27 -04:00
Anuken 8adefb7b72 Merge remote-tracking branch 'origin/master' 2021-09-07 17:57:17 -04:00
Anuken 5e13f71fde Minor bugfixes & compatibility fixes 2021-09-07 17:57:03 -04:00
Anuken 5641b4901c Easier stained mountains guardian 2021-09-05 23:01:26 -04:00
Anuken 4da21ba363 Added cliff support to editor 2021-09-05 20:08:02 -04:00
Anuken 00eca00f11 space payloads 2021-09-05 19:04:04 -04:00
Anuken 508abba2ec Merge remote-tracking branch 'origin/master' 2021-09-05 18:00:21 -04:00
Anuken 87ff876db3 Take block timeScale into account for sector damage 2021-09-05 18:00:16 -04:00
Anuken e35d09fe62 Merge remote-tracking branch 'origin/master' 2021-09-05 12:07:20 -04:00
Anuken fb74dfa02f Default visualElevation for ships 2021-09-05 12:07:15 -04:00
Anuken 227fb388b8 Update building consume module before main update 2021-09-05 11:18:31 -04:00
Anuken dedfd8efd3 Cloud improvements 2021-09-05 11:10:36 -04:00
Anuken 9feedabf07 Serpulo clouds, now with 2 layers 2021-09-05 01:18:50 -04:00
Anuken ed86f50a2f Serpulo clouds 2021-09-05 00:42:47 -04:00
Anuken e958cce816 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/type/Planet.java
 2021-09-04 23:29:02 -04:00
Anuken 89d495fdb1 Merge remote-tracking branch 'origin/master' 2021-09-04 23:28:20 -04:00
Anuken 82e659dd80 Planet rendering infrastructure stuff 2021-09-04 23:28:15 -04:00
Anuken 393d3a19a3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/world/meta/StatValues.java
 2021-09-04 23:12:28 -04:00
Anuken efe5668c5a Merge remote-tracking branch 'origin/master' 2021-09-04 20:37:31 -04:00
Anuken 0331d8c6c4 Fixed #5937 2021-09-04 20:37:26 -04:00
Anuken b4b9a44126 Merge remote-tracking branch 'origin/master' 2021-09-04 18:07:15 -04:00
Anuken 063d2ce6c0 Implemented #5905 properly 2021-09-04 18:07:08 -04:00
Anuken 23d0dfe6bf Deprecated DoubleOverlayFloor 2021-09-04 16:29:14 -04:00
Anuken 0a5b1d1380 Merge remote-tracking branch 'origin/master' 2021-09-04 15:23:53 -04:00
Anuken 24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -04:00
Anuken ed1d4414a0 Payload conveyors are magnetic 2021-09-04 12:27:15 -04:00
Anuken dddb282ce3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
 2021-09-04 12:26:07 -04:00
Anuken 3f49807348 Merge branch 'master' of https://github.com/Anuken/Mindustry 2021-09-04 11:27:29 -04:00
Anuken 13ddca750a arc 2021-09-04 11:27:26 -04:00
Anuken ee8683c734 Do not display overdrive visual for router/conduit 2021-09-04 10:07:13 -04:00
Anuken 8224cc3fce Fixed #5922 2021-09-04 10:03:40 -04:00
Anuken 94a340d3ee Merge remote-tracking branch 'origin/master' 2021-09-04 09:59:32 -04:00
Anuken f8048be429 Fixed #5918 2021-09-04 09:59:28 -04:00
Anuken 6984be2172 Merge remote-tracking branch 'origin/master' 2021-09-04 09:55:28 -04:00
Anuken 48f359ca9b Fixed #5907 2021-09-04 09:55:23 -04:00
Anuken 80acea4708 #5897 with proper formatting 2021-08-29 16:25:26 -04:00