Commit Graph

2452 Commits

Author SHA1 Message Date
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
568e55e373 Crash fix 2019-01-07 10:37:58 -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
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
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
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
653c85c58d Manually implemented #376 2019-01-01 18:41:00 -05:00
Anuken
edd3fb3440 Graphite, scrap 2019-01-01 14:04:17 -05:00
Anuken
a105c017d5 Tile cost tweak 2019-01-01 13:48:20 -05:00
Anuken
dd1034e37b Merge 2018-12-31 19:03:51 -05:00
Anuken
41f16a54de Logo downscale 2018-12-30 12:54:03 -05:00
Anuken
b91510efb3 Input fixes 2018-12-30 11:41:06 -05:00
Anuken
d01b8c7ad1 Improved snapshot netcode 2018-12-29 22:46:46 -05:00
Anuken
86b35fc43d Various graphical fixes 2018-12-29 13:06:17 -05:00
Anuken
4386d3169a JITPack-based dependencies 2018-12-29 11:59:43 -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
9ec1d8f16b Vars cleanup 2018-12-28 22:18:58 -05:00
Anuken
e1858df645 Clamping fix 2018-12-28 22:03:34 -05:00
Anuken
3b1066e16f Removed block bars / Fixed some input issues 2018-12-28 16:54:19 -05:00
Anuken
75709a7812 Fixed android version / Smooth zoom 2018-12-28 16:05:49 -05:00
Anuken
81c68e90cb Fixed shadow rendering 2018-12-28 13:22:44 -05:00
Anuken
bc9110b344 Fixed most world rendering 2018-12-28 13:01:35 -05:00
Anuken
1e8b844eac Debugging, cleanup 2018-12-27 20:26:18 -05:00
Anuken
3fc278c7b7 Fixed most main menu bugs 2018-12-27 17:14:07 -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
22b7086bea Additional fixes 2018-12-23 23:58:24 -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