Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,948 Commits 4 Branches 180 Tags
cdb7a4c9d8801749b7c9badb6a3e8b5bf8af154a
Commit Graph
550 Commits
Author SHA1 Message Date
Anuken f31759bb96 Update/draw payload buildings (broken) 2021-10-18 11:37:26 -04:00
Anuken 7a94af5e82 drag multiplier 2021-10-15 17:10:24 -04:00
Anuken 6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken 44c47586a7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-12 12:36:20 -04:00
GlennFolkerandGitHub 758921c077 Added 2 versatile trigger event types (#6130) 
* t

* oops
 2021-10-10 08:08:04 -04:00
Anuken 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
Anuken 0483e3f900 Serpulo naval wave support 2021-09-30 18:22:50 -04:00
Anuken 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
Anuken 2d2052e39f "ok" 2021-09-27 11:00:33 -04:00
Anuken bd8b0c985a Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-20 09:19:16 -04:00
Anuken 7e0f68b24d Made replaced preset sector saves auto-delete 2021-09-19 12:50:45 -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 e08e51b939 Planet background system 2021-09-17 11:23:32 -04:00
Anuken c9fa7356c2 Asteroid background improvements 2021-09-16 12:40: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 2664bb84be Fixed #5974 2021-09-11 13:30:10 -04:00
Anuken c5a90759e5 Fixed #5971 / Fixed #5973 2021-09-11 08:45:17 -04:00
Anuken caa34c959e More campaign map progress 2021-09-10 17:07:06 -04:00
Anuken 7c028ffcb8 Experimental positional spawn support / WIP map 2021-09-10 13:56:12 -04:00
Anuken ae0a70703b Wave edit dialog cleanup 2021-09-09 22:25:08 -04:00
TranquillyUnpleasantandGitHub 9076325fa1 Add a copy button to spawn groups (#5957) 
* copy button

* rebuild groups on removal

* two factor sorting

* copy method for spawngroup

* implement Clonable

* revert to copy to call clone
 2021-09-09 19:38:56 -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 48f359ca9b Fixed #5907 2021-09-04 09:55:23 -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
Darkness6030andGitHub d254d971a9 Add unitSpawnEvent (#5876) 2021-08-28 10:53:19 -04:00
Anuken 9e16d7385a Implemented #5853 2021-08-25 10:09:00 -04:00
Anuken f0a8c6e281 Oyxgen env 2021-08-20 10:06:16 -04:00
Anuken 946bba63d0 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-08-19 23:52:06 -04:00
Anuken ba48373bbc Game stats cleanup 2021-08-18 16:39:20 -04:00
Anuken f3cacb9e99 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-18 15:04:30 -04:00
Anuken 356c2cfa80 Fixed #5797 2021-08-18 11:41:38 -04:00
Anuken f0c0900770 Lambda memory allocation optimizations 2021-08-17 11:38:57 -04:00
Anuken 0c5f781702 Sector wave spawning fixes 2021-08-16 13:15:14 -04:00
Anuken 2200a44653 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/ui/dialogs/PlanetDialog.java
 2021-08-13 10:08:34 -04:00
Anuken 0cac972061 Support for team-specific multipliers (no UI) 2021-08-11 21:18:48 -04:00
Anuken e6bd259c0e Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/logicids.dat
	core/src/mindustry/ui/dialogs/PlanetDialog.java
	core/src/mindustry/world/blocks/distribution/ItemBridge.java
	core/src/mindustry/world/blocks/liquid/LiquidExtendingBridge.java
	core/src/mindustry/world/blocks/storage/StorageBlock.java
	gradle.properties
 2021-08-10 15:15:07 -04:00
JrTRinnyandGitHub 6c963a2de7 comment fix (#5730) 
* there is no mech pads

* factories
 2021-08-10 09:38:46 -04:00
Anuken 01f759a992 Fixed #5722 2021-08-08 20:42:48 -04:00
Anuken 4fa04b9e23 Bannable units / Show tech tree icon for unresearched units 2021-08-05 23:01:58 -04:00
Anuken 6fdbe1d5f0 Fixed minimap not updating when build team changes 2021-08-05 14:20:23 -04:00
ArikandGitHub 2f57705f13 Fix saving tags of overwritten schematic (#5696) 2021-08-04 09:27:01 -04:00
Anuken f820121e08 Sector bugfixes / More sector info 2021-08-03 16:01:27 -04:00
Anuken fc80c23dde Auto-generate block paletted team regions for mods 2021-07-31 21:31:36 -04:00
Anuken 84b69a683a PvP team color palettes 2021-07-31 18:50:55 -04:00
Anuken 79bf77f4be WIP team icons 2021-07-31 18:23:22 -04:00
Anuken bdb4ae2f85 Typo fix 2021-07-28 17:28:01 -04:00
Anuken c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken c14532ecae Fixed #5645 2021-07-25 12:04:17 -04:00
Anuken f77c32cbb2 New flying unit targeting system 2021-07-24 21:10:39 -04:00