Commit Graph
3097 Commits
Author SHA1 Message Date
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 7889db43a8 Zone generator requirement 2019-01-11 09:46:49 -05:00
Anuken ae3aa20508 elevation is gone but this time I'm not doing the crab rave meme 2019-01-10 21:45:18 -05:00
Anuken 84e754dd10 Added zone class / Dialog method inline 2019-01-09 18:50:10 -05:00
Anuken b9618d66f2 Removed 'text.*' prefix 2019-01-09 16:58:06 -05:00
Anuken daa7b20e4a World generation launch pad preset 2019-01-09 16:37:14 -05:00
Anuken 48a7254aa3 Code generation fix 2019-01-09 11:52:45 -05:00
Anuken 2bc63b37e4 Bugfixes 2019-01-09 11:49:28 -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 28fa0b070d Merge branch 'unsector'
# Conflicts:
#	core/src/io/anuke/mindustry/maps/SectorPresets.java
#	core/src/io/anuke/mindustry/maps/Sectors.java
#	core/src/io/anuke/mindustry/maps/TutorialSector.java
#	core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java
#	core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
2019-01-08 22:28:13 -05:00
Anuken dc0be93b25 Status effect cleanup 2019-01-08 20:32:22 -05:00
Anuken 5e49d2d8d6 Cleanup 2019-01-08 18:02:25 -05:00
Anuken 1d8efe5f9d Packer reorganization 2019-01-08 17:41:51 -05:00
Anuken 8b791b68d3 Removed exe scaling 2019-01-08 17:24:01 -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 77b4f3e930 Merge branch 'crafting-rework' 2019-01-07 18:49:28 -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 b64c38809e Removed unused upload build script 2019-01-07 10:50:31 -05:00
Anuken a163db485b Merge branch 'master' into crafting-rework 2019-01-07 10:40:22 -05:00
Anuken 47f7507af3 Merge branch 'master' into unsector 2019-01-07 10:38:07 -05:00
Anuken 568e55e373 Crash fix 2019-01-07 10:37:58 -05:00
Anuken 79e722b5ff Ignored annotation out folder 2019-01-06 15:57:39 -05:00
Anuken 415252a5b2 Merge branches 'master' and 'unsector' of https://github.com/Anuken/Mindustry into unsector 2019-01-06 10:21:15 -05:00
Anuken 307bb7aeec Merge branch 'master' of https://github.com/Anuken/Mindustry into crafting-rework
# Conflicts:
#	core/src/io/anuke/mindustry/content/Recipes.java
2019-01-06 09:45:11 -05:00
Anuken 397da91ab4 Fixed all code generation errors 2019-01-06 09:42:08 -05:00
Anuken fdd0c25a25 Removed core drone 2019-01-06 09:27:56 -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 5661124d86 Merge branches 'master' and 'unsector' of https://github.com/Anuken/Mindustry into unsector 2019-01-04 16:11:30 -05:00
Anuken 1346e163e9 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-01-04 15:27:39 -05:00
Anuken d5626bfe52 Updated to next version of kryonet 2019-01-04 15:12:34 -05:00
Anuken 0900c13fa1 Cleanup 2019-01-04 15:11:58 -05:00
Anuken 5019f200b7 Large world size optimizations 2019-01-04 13:55:06 -05:00
Anuken 3b41ded045 More zoom fixes 2019-01-04 12:18:26 -05:00
Anuken 9f84b84819 Removed all extra floor rendering for larger worlds 2019-01-04 12:17:42 -05:00
Anuken f61f3af687 Zoom fixes 2019-01-04 11:39:49 -05:00
Anuken 0a6f7ac817 Functional play button 2019-01-03 20:42:34 -05:00
Anuken 153e6c5f1b Re-structuring 2019-01-03 19:46:25 -05:00
Anuken e24d96da6f Note 2019-01-03 18:35:48 -05:00
Anuken 59e5099ed6 Merge remote-tracking branch 'origin/master' 2019-01-03 18:22:26 -05:00