mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-10 15:19:24 +07:00
Code Issues Packages Projects Releases Wiki Activity
9,354 Commits 4 Branches 160 Tags 2.1 GiB
a3abadd8c2
Commit Graph

64 Commits

Author SHA1 Message Date
Anuken
d06449f311 space 2020-10-08 14:06:07 -04:00
Patrick 'Quezler' Mounier
8e4d00d594
Move cryofluid mixer emoji back to the old number 2020-10-01 11:03:59 +02:00
Anuken
b15cdfef46 sprites repacked 2020-09-30 22:37:32 -04:00
slava0135
feb8202b73 better stats... 2020-09-30 21:17:44 +03:00
slava0135
a806d7c019 Fun fact: 1.0 is smaller than 10 2020-09-30 20:41:56 +03:00
slava0135
d4402ee3bb Merge branch 'master' of https://github.com/Anuken/Mindustry into tsunami 
 Conflicts:
	core/assets/icons/icons.properties
	core/assets/sprites/block_colors.png
	core/assets/sprites/fallback/sprites.atlas
	core/assets/sprites/fallback/sprites3.png
	core/assets/sprites/fallback/sprites4.png
	core/assets/sprites/fallback/sprites5.png
	core/assets/sprites/fallback/sprites7.png
	core/assets/sprites/fallback/sprites8.png
	core/assets/sprites/sprites.atlas
	core/assets/sprites/sprites.png
	core/assets/sprites/sprites2.png
	core/assets/sprites/sprites4.png
	core/assets/sprites/sprites5.png
	core/src/mindustry/content/Blocks.java
 2020-09-30 09:48:18 +03:00
Anuken
2b2a12267a Long-range 4x4 turret (wip) / Java 14 language upgrade 2020-09-29 23:55:55 -04:00
slava0135
3e81d194cb New liquid turret - Tsunami 2020-09-25 11:49:04 +03:00
Anuken
0a07458186 Power-based ammo / Refactoring / IP kicks / Fixes 2020-09-24 13:05:39 -04:00
Anuken
ada664a2ca Fixed #2690 2020-09-23 21:46:40 -04:00
Anuken
87032c82b1 T4/5 support mechs 2020-09-21 23:32:30 -04:00
Anuken
1aa8bb9dd2 T5 air support unit 2020-09-21 11:41:11 -04:00
Anuken
63e35bd462 T4 air carrier unit (*unfinished*) 2020-09-20 19:34:12 -04:00
Anuken
f53af781ba T4/5 naval / Controversial weapon outlines 2020-09-18 18:54:09 -04:00
Anuken
6b6783f201 Fixed #2591 / Fixed #2591 / Fixed #2589 / Fixed #2587 2020-09-18 11:21:50 -04:00
Anuken
ea224bd1f1 many things 2020-09-17 21:05:16 -04:00
Anuken
50816deb9e Smarter payload routers / 2x display / Campaign tweaks 2020-09-14 14:09:15 -04:00
Anuken
74cefb3ec9 Dacite decoration block / Environmental renaming 2020-09-10 15:17:10 -04:00
Anuken
0e61d61dd2 Saner naming scheme of wall blocks 2020-09-10 12:09:25 -04:00
Anuken
3b5d6860d6 Bugfixes 2020-09-09 23:39:00 -04:00
Anuken
739c4f2de2 Final mech boss unit (unfinished) 2020-09-04 22:05:15 -04:00
Anuken
ee2b099799 Initial Vestige mech implementation 2020-09-04 14:27:55 -04:00
Anuken
c1cc11c7cb Initial toxopid sprites, WIP 2020-09-02 00:13:25 -04:00
Anuken
b128155615 Added T3 logic processor 2020-08-22 11:16:15 -04:00
Anuken
b9ff4ba9c5 Bugfixes 2020-08-20 16:21:40 -04:00
Anuken
bb3c80c055 Dedicated memory cells 2020-08-11 10:50:12 -04:00
Anuken
4f7d6fc018 Bugfixes / Logic category (no icon) / Switch block 2020-08-10 17:09:54 -04:00
Anuken
1d5a25ce75 Graphics 2020-08-09 12:46:44 -04:00
Anuken
ac46b77380 Logic progress 2020-08-08 14:14:33 -04:00
Anuken
5dc78a24e0 Logic progress 2020-08-06 12:31:04 -04:00
Anuken
17f86c5f77 Added missing tech tree blocks 2020-07-24 19:15:09 -04:00
Anuken
58c39e14d6 risse -> risso 2020-07-24 13:27:15 -04:00
Anuken
5c9e005397 Per-unit cap (still broken) 2020-07-21 15:43:02 -04:00
Anuken
cecb5cf4b4 Added tractor beam turret 2020-07-02 14:02:33 -04:00
Anuken
2280ed6071 Research block tweaks / Merged in #1927 2020-06-19 12:26:41 -04:00
Anuken
b48736e771 Reconstructor sprites / Bugfixes 2020-06-13 16:27:15 -04:00
Anuken
2b1bd90dfa Out of atlas space / GL30 progress 2020-06-10 12:55:01 -04:00
Anuken
43762e82a8 Unit tweaks 2020-06-08 16:33:21 -04:00
Anuken
5bcaed54c6 3x3 separator 2020-06-03 19:42:42 -04:00
Anuken
6fff4ad8a1 Point defense blocks 2020-06-03 16:22:07 -04:00
Anuken
3c89ccf7c3 Added silicon crucible 2020-06-03 12:11:40 -04:00
Anuken
0382d40dcc Payload router 2020-06-03 01:13:44 -04:00
Anuken
5b4a22e219 Implemented #1329 2020-05-31 20:16:32 -04:00
Anuken
aae6d2038b Payload API changes 2020-05-25 15:03:31 -04:00
Anuken
1ae9d04f47 Experimental: block loader/unloaders 2020-05-25 14:36:40 -04:00
Anuken
65f63fd4d2 Re-added Tau 2020-05-23 21:53:11 -04:00
Anuken
2dbb099d79 AI tweaks / Control tweaks / Plastanium conveyor tweaks / Unit factories 2020-04-30 14:46:22 -04:00
Patrick 'Quezler' Mounier
32e32ecae2
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites2.png
#	core/assets/sprites/sprites4.png
#	core/assets/sprites/sprites6.png
 2020-04-16 22:38:51 +02:00
Anuken
280f3dd428 Added experimental package 2020-04-16 16:31:43 -04:00
Patrick 'Quezler' Mounier
5c28985ee6
Merge branch '6.0' into crater 
# Conflicts:
#	core/assets/icons/icons.properties
#	core/assets/sprites/block_colors.png
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
#	core/assets/sprites/sprites3.png
#	core/assets/sprites/sprites5.png
#	core/src/mindustry/content/Blocks.java
#	core/src/mindustry/ui/fragments/PlayerListFragment.java
#	core/src/mindustry/world/BlockStorage.java
 2020-04-16 12:39:52 +02:00