Commit Graph

508 Commits

Author SHA1 Message Date
Anuken
4344af1f02 Added unlock messages for all content 2019-01-16 19:52:58 -05:00
Anuken
6510d83524 Starting items / No editor unlocks / Fixed Block#synthetic() 2019-01-16 19:36:30 -05:00
Anuken
2f76684113 Cheaper arc 2019-01-14 18:38:32 -05:00
Anuken
650b443fd0 Starting items / Zone balancing 2019-01-12 18:51:21 -05:00
Anuken
8aa1509f47 Gamemodes removed 2019-01-12 16:55:24 -05:00
Anuken
777bd60f88 Added basic ore generator 2019-01-11 20:29:50 -05:00
Anuken
84e754dd10 Added zone class / Dialog method inline 2019-01-09 18:50:10 -05:00
Anuken
daa7b20e4a World generation launch pad preset 2019-01-09 16:37:14 -05:00
Anuken
33afab7294 Launchpad block 2019-01-09 11:44:33 -05:00
Anuken
048b7bd32f Global inventory / 'Deploying' / Removed command center 2019-01-09 09:07:48 -05:00
Anuken
dc0be93b25 Status effect cleanup 2019-01-08 20:32:22 -05:00
Anuken
521174f911 Removed autogenerated liquid sprites 2019-01-08 09:56:42 -05:00
Anuken
a6f7bd9099 Cleanup 2019-01-07 21:22:06 -05:00
Anuken
fed964e0f7 a rather large merge 2019-01-07 21:10:57 -05:00
Anuken
351b8c2469 Fixed content class errors 2019-01-07 18:48:55 -05:00
Anuken
ee9f65d4a3 Block class merge 2019-01-07 18:39:06 -05:00
Anuken
a1a69f62e1 🦀 FX classes are gone 🦀 2019-01-07 17:11:53 -05:00
Anuken
ff52fec663 Cleanup: all bullet definitions moved into one class 2019-01-07 16:53:04 -05:00
Anuken
5743d30851 Removed AmmoType class completely 2019-01-07 16:01:27 -05:00
Anuken
de02061b5e Removed dependency on old BulletEntity/BaseBulletType classes 2019-01-07 12:25:54 -05:00
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
1346e163e9 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-01-04 15:27:39 -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
2e28525c4b Typo fix 2018-12-13 08:37:05 -05: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