Commit Graph

1155 Commits

Author SHA1 Message Date
4a07c95e1c initialWaveSpacing rule 2022-01-24 13:34:55 -05:00
4497f7ab3a Proper interplanetary launch 2022-01-23 14:37:08 -05:00
48585274cf Onset sector 2022-01-22 16:43:36 -05:00
fdcc373813 Editor experimental sector generator 2022-01-22 15:06:46 -05:00
97da66cd44 New environment blocks 2022-01-22 13:33:16 -05:00
cfb01063c0 Misc map creation utilities 2022-01-21 16:32:35 -05:00
698e89e796 Editor fixes 2022-01-19 22:23:50 -05:00
10d8e63368 Multi-liquid sublimate 2022-01-10 14:01:30 -05:00
acaec08781 Evoke repair weapon 2021-12-28 21:48:32 -05:00
677abf4924 3x3 breach 2021-12-27 15:54:09 -05:00
4fbeae1afc Erekir tech sector requirements 2021-12-25 22:17:18 -05:00
45b81fae37 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-12-21 10:39:49 -05:00
3866a9a8e7 the obligatory daily commit 2021-12-17 17:55:03 -05:00
e481de9d28 Payload router sorter mode 2021-12-16 10:31:16 -05:00
3e9747c59c Heat conductor + phase heater 2021-12-10 11:31:32 -05:00
761ee12e6f LAccess.speed / Merged #6293 2021-12-10 00:36:47 -05:00
8a2908374a Selectable tech tree 2021-12-08 21:57:10 -05:00
acb4593390 Fill#rect bugfix 2021-12-08 19:39:44 -05:00
b70c08c2ec Removes -> Destroys (#6409)
* Removes -> Destroys

* inputed

* bad language design TM

english sucks
2021-12-08 00:03:11 -05:00
c8fb0c2e76 Liquids are fluids now 2021-12-03 22:28:05 -05:00
9c9d147b95 TeamEntry class implementation 2021-12-03 10:28:34 -05:00
b3dd7f4b8b WIP arkycite 2021-11-30 18:13:34 -05:00
a24c15117d Cyanogen synthesis retexture 2021-11-27 12:17:45 -05:00
4567ee9a13 Test fixes / Building module presence saving 2021-11-17 10:58:36 -05:00
82eb3a9159 Alloy smelter rename / WIP block ideas 2021-11-16 22:37:13 -05:00
25f44f86f8 Making DrawBlock more generic 2021-11-16 19:55:13 -05:00
486622e3e4 Many crazy things 2021-11-14 23:10:15 -05:00
51301a50cc HeatCrafter 2021-11-11 20:39:43 -05:00
aa6eb73de8 asd 2021-10-23 19:59:11 -04:00
a7c78c4193 Bundle case fixes 2021-10-22 18:17:25 -04:00
5c5acb2d48 Saved games search & Mapsearch filter improvements (#6194)
* better filter menu

* remove unused bundle property

* indent

* Add text instead of using labels

* Saved game search

* Save not map

* auto cursor to search bar

* change icon to terrain
2021-10-22 18:14:33 -04:00
d3343c0ae9 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Planets.java
	tools/src/mindustry/tools/Generators.java
2021-10-20 10:45:51 -04:00
b7f030eb13 Added logic variable display window 2021-10-16 12:30:00 -04:00
56d291c963 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/content/Planets.java
	core/src/mindustry/io/SaveFileReader.java
	core/src/mindustry/mod/ClassMap.java
	core/src/mindustry/type/UnitType.java
	core/src/mindustry/world/Block.java
2021-10-14 21:00:14 -04:00
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
082edbff6f Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	tools/src/mindustry/tools/Generators.java
2021-10-14 19:15:59 -04:00
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -04:00
4a4b336814 Added logic payEnter command 2021-10-13 10:18:34 -04:00
d2ec511ede Bundle things 2021-10-13 09:53:52 -04:00
44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
55537f09dc Torpedos->Torpedoes (#6113)
Typo, yes.
2021-10-07 09:32:24 -04:00
10b8a6e4a5 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/type/UnitType.java
2021-10-01 09:41:33 -04:00
b265ddac03 Don't suggest changing the mod disable option 2021-10-01 09:28:23 -04:00
5f3cef251b Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/assets/logicids.dat
	core/src/mindustry/content/Blocks.java
	gradle.properties
2021-09-28 18:45:09 -04:00
30e6bb2625 Retusa Description Change (#6061)
Now that Retusa has been remaked, the description needs to be changed too.
2021-09-27 19:11:48 -04:00
dbd31b9031 Cryo tiles (#6054)
* Cryo tile

* tile name

* Shader

* Icon and property
2021-09-27 14:46:28 -04:00
bf89ef1e5e Map search (#6004)
* Map search

* Fix format

* check and continue

* icons and style

* grow pane so search bar doesnt move

* Inline focusing

* Use boolean instead of checking size
2021-09-27 11:33:12 -04:00
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
2222330b43 Added hint for high threat level sector 2021-09-08 11:23:37 -04:00