mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-22 02:07:20 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,379 Commits 4 Branches 160 Tags 2.3 GiB
26dd7e00eb
Commit Graph

1011 Commits

Author SHA1 Message Date
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
8143cb7be0 Unit balancing 2021-08-24 12:10:44 -04:00
Anuken
dd8279bab3 Crawl progress 2021-08-22 20:25:46 -04:00
Anuken
b2aaca45d5 progress 2021-08-21 18:35:27 -04:00
Anuken
7afc6d3631 CrawlComp progress 2021-08-21 15:32:25 -04:00
Anuken
efb4a643e4 Liquid container tweak 2021-08-19 22:26:54 -04:00
Anuken
9e9cd213f3 Liquid container 2021-08-19 21:48:18 -04:00
Anuken
a39f2bd3a9 wip 2021-08-19 17:46:10 -04:00
Anuken
1d32680ab2 sprite tweaks 2021-08-18 20:09:59 -04:00
Anuken
130f32f3cd Dormany cyst item 2021-08-18 17:38:30 -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
Sunny Kim
d1271f3e4b
Boss (Guardian) Status Sprite (#5773) 
* boss status

* almost forgot

* Update bundle_ko.properties
 2021-08-17 18:00:00 -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
1b0de739f9 Sector info list / Minor hint fixes 2021-08-12 22:16:13 -04:00
Anuken
5d86390e28 Turret heat cleanup 2021-08-11 10:31:36 -04:00
Anuken
ec89db7cb1 Things 2021-08-11 09:54:30 -04:00
Anuken
14dc293a09 Fixed #5734 / New derelict icon 2021-08-10 19:56:31 -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
Anuken
b1b89290b9 Implemented Anuken/Mindustry-Suggestions/issues/2809 2021-08-07 12:08:30 -04:00
Anuken
b80129e17b Improved environmental block internal names 2021-08-06 11:52:25 -04:00
Anuken
79bf77f4be WIP team icons 2021-07-31 18:23:22 -04:00
Anuken
78f55765c1 Clear fallback sprite for core thrusters 2021-07-28 17:49:01 -04:00
Anuken
f5222674ff Unused sprite cleanup 2021-07-26 19:54:22 -04:00
Anuken
c19a7e8452 New core landing animation 2021-07-26 19:29:14 -04:00
Anuken
17e68f7a93 Fixed additive reconstructor center sprite 2021-07-23 19:39:52 -04:00
Anuken
385f493f36 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/content/Blocks.java
	core/src/mindustry/net/CrashSender.java
	core/src/mindustry/ui/Links.java
	core/src/mindustry/ui/dialogs/SchematicsDialog.java
	core/src/mindustry/world/blocks/power/LightBlock.java
	gradle.properties
 2021-07-23 17:58:02 -04:00
Anuken
ed1d02d2c2 Payload loader/unloader progress 2021-07-22 21:07:36 -04:00
Anuken
d30c32eddc reorganization 2021-07-22 16:52:05 -04:00
Anuken
0c46d5088c Better laser/blast drill rotators 2021-07-19 14:11:07 -04:00
Anuken
103f24d41d Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	core/src/mindustry/world/blocks/environment/Floor.java
	core/src/mindustry/world/blocks/payloads/Payload.java
	gradle.properties
 2021-07-15 09:13:35 -04:00
Anuken
8644844b7d beam drill visual improvements 2021-07-13 21:41:53 -04:00
Anuken
c43fd88f55 lasers. 2021-07-13 17:34:57 -04:00
Anuken
4f98bc95a2 Better sliders 2021-07-12 12:36:45 -04:00
Anuken
cfb7d29013 Beam drill texture improvements 2021-07-10 18:54:13 -04:00
Anuken
5ceb8e2b48 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 
 Conflicts:
	gradle.properties
 2021-07-09 19:48:35 -04:00
Anuken
b8717b62c8 a 2021-07-08 16:16:53 -04:00
Anuken
1baa82a7c6 Mostly-complete cliff crusher implementation 2021-07-08 16:16:44 -04:00
Anuken
972ca71978 Team-colored force projectors 2021-07-08 12:14:20 -04:00
Anuken
6afb976a44 Payload deconstructor sprite 2021-07-01 17:53:26 -04:00
Anuken
d54b7dc396 WIP payload deconstructor 2021-06-24 12:35:44 -04:00
Anuken
d4b6073c01 Name cleanup 2021-06-22 16:52:48 -04:00
Anuken
b87b79f4ba when git add . is too hard 2021-06-21 20:53:08 -04:00
Anuken
afec6181c4 More stone blocks 2021-06-21 20:52:49 -04:00
Anuken
4a88f64fa9 Asteroid ores (1) 2021-06-20 21:02:31 -04:00
Anuken
5d74795c02 Cleanup 2021-06-20 08:47:30 -04:00
Anuken
3c65a26d72 New ferric blocks, improved asteroid generation 2021-06-19 21:19:46 -04:00
Anuken
93651939f2 stop 2021-06-12 10:55:18 -04:00
Anuken
c4b1bf3e55 Asteroid progress 2021-06-11 19:59:18 -04:00
Anuken
9e8e0709b5 Merge 2021-06-10 18:51:49 -04:00
Anuken
c4803d29da Pulverizer texture cleanup 2021-06-10 16:14:53 -04:00