mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 13:09:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
12,969 Commits 4 Branches 160 Tags 2.3 GiB
6b3dfa6036
Commit Graph

1119 Commits

Author SHA1 Message Date
Anuken
6b3dfa6036 Carbide, surge conveyors 2021-11-05 16:41:08 -04:00
Anuken
57ef7c823e WIP carbide 2021-11-05 08:47:05 -04:00
Anuken
0effae1cd7 sprites 2021-11-04 15:42:25 -04:00
Anuken
240ffe1ca3 impact drill progress 2021-11-04 15:42:16 -04:00
Anuken
1a8a2c326e impact drill wip 2021-11-04 11:41:12 -04:00
Anuken
38f7d2dcd0 tungsten 2021-11-02 14:49:05 -04:00
Anuken
18f28ef224 Full BuildTower impl 2021-11-02 11:47:35 -04:00
Anuken
00293d022c progress 2021-11-02 10:39:05 -04:00
Anuken
fbc140e99d sprites 2021-11-01 12:23:44 -04:00
Anuken
64a6f10338 Misc polish 2021-10-30 19:01:47 -04:00
Anuken
87a8453871 Beam node balance 2021-10-30 15:15:06 -04:00
Anuken
37379b23ae a 2021-10-30 00:30:16 -04:00
Anuken
8ec1976bd5 a 2021-10-29 20:14:43 -04:00
Anuken
0781a325c7 new core unit 2021-10-29 19:42:51 -04:00
Anuken
ee8bcdfa50 gsd 2021-10-28 22:27:36 -04:00
Anuken
58544e6a21 Beam nodes 2021-10-28 22:18:07 -04:00
Anuken
cd909913ca turbine condenser 2021-10-27 19:41:12 -04:00
Anuken
3ee7ee7e79 WIP pressure turbine 2021-10-27 18:25:58 -04:00
Anuken
705c85281c the vent 2021-10-26 20:34:45 -04:00
Anuken
471fdd61b1 klmnbsdfhx 2021-10-25 22:09:18 -04:00
Anuken
bc0b9e9eb3 plasma bore 2021-10-25 20:51:45 -04:00
Anuken
d01404d7ca intellij stop 2021-10-24 18:09:00 -04:00
Anuken
f347ab4714 WIP core bastion 2021-10-24 18:08:07 -04:00
Anuken
b19691078f a 2021-10-24 15:14:43 -04:00
Anuken
255f97dc56 breach 2021-10-23 17:32:58 -04:00
Anuken
693e420074 WIP breach turret 2021-10-23 14:35:37 -04:00
Anuken
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
Anuken
a72adef051 Fixed off-tinted cells 2021-10-17 16:03:05 -04:00
Anuken
176343e862 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-10-15 14:24:48 -04:00
Anuken
9a5ac14bc3 Fixed #6158 2021-10-15 11:40:55 -04:00
Anuken
6b59c1cd83 More branch merging 2021-10-14 20:58:03 -04:00
Anuken
ad1c75d050 WIP branch merging 2021-10-14 19:15:03 -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
TranquillyUnpleasant
dbd31b9031
Cryo tiles (#6054) 
* Cryo tile

* tile name

* Shader

* Icon and property
 2021-09-27 14:46:28 -04:00
Anuken
2d2052e39f "ok" 2021-09-27 11:00:33 -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
Matthew Peng
efae0d3b6a
Anuke what is this (#5949) 2021-09-06 20:45:42 -04:00
CancerGuy
4720f1b876
Add files via upload (#5943) 2021-09-05 17:06:00 -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
24b0f445b8 Added rivers on Serpulo / Added deep tainted water 2021-09-04 15:23:47 -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
CancerGuy
3901ae1720
change (#5923) 2021-09-04 10:14:40 -04:00
Anuken
cc689fd114 Fixed #5895 2021-08-29 10:26:39 -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
ced97888e4 why 2021-08-27 21:51:37 -04:00
Anuken
9e16d7385a Implemented #5853 2021-08-25 10:09:00 -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
8143cb7be0 Unit balancing 2021-08-24 12:10:44 -04:00
Anuken
dd8279bab3 Crawl progress 2021-08-22 20:25:46 -04:00