Anuken
|
d691e9f39d
|
it is commit o'clock
|
2019-01-05 23:00:58 -05:00 |
|
Anuken
|
a5cbe19d23
|
Merge branches 'crafting-rework' and 'master' of https://github.com/Anuken/Mindustry into crafting-rework
# Conflicts:
# core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
# core/src/io/anuke/mindustry/content/blocks/TurretBlocks.java
# core/src/io/anuke/mindustry/core/Renderer.java
# core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
|
2019-01-04 16:15:23 -05:00 |
|
Anuken
|
b8e6e5df61
|
Power PR merged / Various bugfixes
Closes #288
|
2019-01-03 18:22:13 -05:00 |
|
Anuken
|
16851a457e
|
Further recipe tweaks
|
2019-01-03 12:30:25 -05:00 |
|
Anuken
|
1c5bb605c3
|
Removed recipe dependencies
|
2019-01-03 12:26:49 -05:00 |
|
Anuken
|
dc12d58054
|
Standardized item capacity across blocks
|
2019-01-03 12:00:14 -05:00 |
|
Anuken
|
120e0f6971
|
Changed several more resources
|
2019-01-02 18:49:04 -05:00 |
|
Anuken
|
edd3fb3440
|
Graphite, scrap
|
2019-01-01 14:04:17 -05:00 |
|
Anuken
|
dd1034e37b
|
Merge
|
2018-12-31 19:03:51 -05:00 |
|
Anuken
|
86b35fc43d
|
Various graphical fixes
|
2018-12-29 13:06:17 -05:00 |
|
Anuken
|
35348f1150
|
Re-implemented block shadows / Removed alpha drones
|
2018-12-29 09:12:37 -05:00 |
|
Anuken
|
36b27458b6
|
Merged 4x graphics
|
2018-12-28 23:46:09 -05:00 |
|
Anuken
|
3b1066e16f
|
Removed block bars / Fixed some input issues
|
2018-12-28 16:54:19 -05:00 |
|
Anuken
|
1e8b844eac
|
Debugging, cleanup
|
2018-12-27 20:26:18 -05:00 |
|
Anuken
|
db546412f1
|
Arc compatibility update
|
2018-12-27 15:47:17 -05:00 |
|
Anuken
|
3b42b604e1
|
Successful desktop compilation
|
2018-12-26 17:38:40 -05:00 |
|
Anuken
|
8879593381
|
hhhhhhh
|
2018-12-26 13:22:31 -05:00 |
|
Anuken
|
44e4ffbe62
|
Fixed most things besides drawing
|
2018-12-22 22:17:28 -05:00 |
|
Anuken
|
3abfaf1bca
|
ctrl-shift-f
|
2018-12-21 21:33:05 -05:00 |
|
Anuken
|
94908bc599
|
🔥🔥🔥🔥🔥🔥maximum breakage
|
2018-12-20 12:38:27 -05:00 |
|
Anuken
|
cabcfc7136
|
Initial creation of Arc port
|
2018-12-20 11:49:32 -05:00 |
|
Anuken
|
9d744580a1
|
Merge
|
2018-12-14 21:48:34 -05:00 |
|
Anuken
|
b295f51c29
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework
|
2018-12-14 19:11:50 -05:00 |
|
Anuken
|
99bf50ee52
|
Core recipe tweak
|
2018-12-14 19:10:58 -05:00 |
|
Timmeey86
|
f48a19a3bc
|
Merged master into branch
|
2018-12-15 00:49:38 +01:00 |
|
Timmeey86
|
fed11db92e
|
Buffered consumers now fill instantly
|
2018-12-15 00:47:47 +01:00 |
|
Anuken
|
df44f82198
|
Drownable tar and lava
|
2018-12-12 10:10:15 -05:00 |
|
Anuken
|
c1a7b452e0
|
Misc cleanup
|
2018-12-09 23:28:36 -05:00 |
|
Timmeey86
|
e50ff6b0a5
|
Merged current master and fixed conflicts
|
2018-12-09 22:40:33 +01:00 |
|
Anuken
|
931fc93b4b
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework
|
2018-12-09 11:16:39 -05:00 |
|
Anuken
|
061c55614b
|
Balancing / Tau mech mobile block repair
|
2018-12-08 20:11:15 -05:00 |
|
Timmeey86
|
41c6887f33
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger
|
2018-12-08 20:07:45 +01:00 |
|
Anuken
|
6fa14accfe
|
Added proper core blocks / Murdered snek
|
2018-12-07 15:19:14 -05:00 |
|
Timmeey86
|
e6261a6bf8
|
Merge branch 'master' of https://github.com/Anuken/Mindustry into baltitenger
|
2018-12-07 19:40:10 +01:00 |
|
Timmeey86
|
787706b1f7
|
Set default minimum power to 50% and set four blocks to 100%
|
2018-12-07 19:37:51 +01:00 |
|
Anuken
|
a09bd09a0e
|
Removed tank chaining
|
2018-12-07 12:11:58 -05:00 |
|
Timmeey86
|
5bda5124e6
|
Merged current master to branch
|
2018-12-06 19:48:01 +01:00 |
|
Anuken
|
da86dee981
|
Freezing armor multiplier
|
2018-12-06 09:30:41 -05:00 |
|
Anuken
|
6d59fe3080
|
Bugfixes
|
2018-12-03 10:33:50 -05:00 |
|
Anuken
|
fd3beaf2b9
|
Removed silicon coal requirement
|
2018-12-01 14:48:55 -05:00 |
|
Timmeey86
|
62c6d8e42d
|
Fixed Arcs not firing
|
2018-12-01 16:49:30 +01:00 |
|
Timmeey86
|
14e057cf05
|
- Resolved all remaining TODOs
|
2018-12-01 16:13:03 +01:00 |
|
Timmeey86
|
b4aba3d263
|
All power blocks now produce power as stated in v63 tool tips
|
2018-12-01 13:41:14 +01:00 |
|
Anuken
|
236e3c7e61
|
Added wet shocking
|
2018-11-30 23:12:48 -05:00 |
|
Timmeey86
|
149f7a1d9d
|
Merged current master into branch (with manual changes)
|
2018-11-30 21:33:09 +01:00 |
|
Timmeey86
|
965fec5927
|
Continued work on power generators
|
2018-11-30 21:08:33 +01:00 |
|
Anuken
|
99fb1a4c5f
|
Implemented null-items for sorters and item sources
|
2018-11-30 10:28:27 -05:00 |
|
Anuken
|
d9ade96fad
|
Compile fix
|
2018-11-29 14:47:39 -05:00 |
|
Anuken
|
9ac8a4211e
|
Merge
|
2018-11-28 22:37:49 -05:00 |
|
Anuken
|
ab69cd8027
|
Initial crafting rework changes
|
2018-11-28 19:00:59 -05:00 |
|