Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,526 Commits 4 Branches 180 Tags
ba0892fdcb3ecb4801566cd84a1d27d897ca6a88
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anuken cc689fd114 Fixed #5895 2021-08-29 10:26:39 -04:00
Anuken be5d9154a7 Merge remote-tracking branch 'origin/master' 2021-08-29 09:12:08 -04:00
Anuken bb9d7fedf7 Fixed #5894 2021-08-29 09:12:03 -04:00
Anuken e30d7e998d Allow unit icons for sectors 2021-08-28 20:49:39 -04:00
Anuken c6873a72f6 a 2021-08-28 20:46:54 -04:00
Anuken 259d0baeb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-28 16:30:07 -04:00
Anuken a3270dd908 this turned out to be pretty difficult 2021-08-28 16:29:58 -04:00
Anuken 48d568978b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/src/mindustry/entities/Damage.java
 2021-08-28 14:17:29 -04:00
Anuken 9a7324ce54 Fixed #5887 2021-08-28 14:17:01 -04:00
Anuken 4d62b0321f Fixed #5885 2021-08-28 08:44:42 -04:00
Anuken 6ca2855365 Fixed RailBulletType effect length 2021-08-27 22:33:56 -04:00
Anuken ced97888e4 why 2021-08-27 21:51:37 -04:00
Anuken 8c32acbc30 Fixed #5878 2021-08-27 09:58:08 -04:00
Anuken bfc9b07651 Redundant cast cleanup 2021-08-27 09:31:18 -04:00
Anuken e53b578043 Merge remote-tracking branch 'origin/master' 2021-08-27 09:17:31 -04:00
Anuken b2ed066faa Fixed BE server not updating 2021-08-27 09:17:26 -04:00
Anuken 9b22777dfb AGP 7.0.1 2021-08-26 15:15:29 -04:00
Anuken 3bd08bb047 Merge remote-tracking branch 'origin/master' 2021-08-26 15:07:13 -04:00
Anuken 139d6cd5cc Proper #5872 2021-08-26 15:07:08 -04:00
Anuken c25e6b586b Allow empty maps in FileMapGenerator 2021-08-25 21:57:18 -04:00
Anuken f46b22e4a7 Merge remote-tracking branch 'origin/master' 2021-08-25 13:22:23 -04:00
Anuken 2b6856634c Fixed #5864 2021-08-25 13:22:19 -04:00
Anuken 9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken 55269846f1 Unit drown color fixes 2021-08-25 09:35:07 -04:00
Anuken 26dd7e00eb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/UnitTypes.java
 2021-08-25 09:22:23 -04:00
Anuken c573fd34a1 Bullet raycast clamp 2021-08-25 09:10:59 -04:00
Anuken da7873cbd8 #5855 2021-08-25 08:49:41 -04:00
Anuken a15f8131fa Merge remote-tracking branch 'origin/master' 2021-08-24 19:14:44 -04:00
Anuken 0d27e3afdc Fixed #5856 2021-08-24 19:14:40 -04:00