Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,071 Commits 4 Branches 180 Tags
521174f9111dbef2d6d969eed464b7d2a4fc0240
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 79e722b5ff Ignored annotation out folder 2019-01-06 15:57:39 -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 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 3b41ded045 More zoom fixes 2019-01-04 12:18:26 -05:00
Anuken f61f3af687 Zoom fixes 2019-01-04 11:39:49 -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
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
AnukenandGitHub b9136e4e98 Merge pull request #364 from Prosta4okua/patch-43 
(Complete) Close before 64 build
 2019-01-02 21:00:15 -02:00
Anuken 912136d174 Merge remote-tracking branch 'origin/master' 2019-01-01 18:41:07 -05:00
Anuken 653c85c58d Manually implemented #376 2019-01-01 18:41:00 -05:00
AnukenandGitHub 638c99981d Merge pull request #389 from Prosta4okua/patch-47 
Create strings.xml
 2019-01-01 21:35:24 -02:00
AnukenandGitHub 71e61abcd6 Merge pull request #356 from DaGamerFiles/patch-1 
Update bundle_in_ID.properties [INCOMPLETE]
 2019-01-01 21:33:57 -02:00
AnukenandGitHub fa1d440bb0 Merge pull request #355 from JustYanns/patch-2 
Update bundle_fr.properties [Incomplete]
 2019-01-01 21:32:16 -02:00
AnukenandGitHub 88d208268a Merge pull request #387 from CinExPL/patch-4 
Update bundle_pl.properties
 2019-01-01 21:13:28 -02:00
AnukenandGitHub 6aa90a44f7 Merge branch 'master' into patch-4 2019-01-01 21:13:20 -02:00
AnukenandGitHub 3c9322ee08 Update strings.xml (#383) 2019-01-01 21:09:55 -02: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 745d8122f5 Removed GH API calls 2018-12-30 10:27:37 -05:00
Anuken 98e4f7409b Removed main arc dependency 2018-12-30 10:11:54 -05:00
AnukenandGitHub cdb3971b8d Update build.gradle 2018-12-30 09:21:16 -05:00
Anuken d01b8c7ad1 Improved snapshot netcode 2018-12-29 22:46:46 -05:00
Anuken 7c35b6e95a Minor build file fixes 2018-12-29 15:58:11 -05:00
Anuken 86b35fc43d Various graphical fixes 2018-12-29 13:06:17 -05:00
Anuken 5b2c8ac337 Removed '-snapshot' based dependencies 2018-12-29 12:22:41 -05:00
Anuken 734d4a912b Fixed failing tests 2018-12-29 12:05:29 -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 bbb2153112 Merge branch 'arc-port' of https://github.com/Anuken/Mindustry 2018-12-28 22:22:08 -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
AnukenandGitHub c097841d78 Fixed #385 2018-12-23 17:11:19 -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 d2c6305548 Merge remote-tracking branch 'origin/master' 2018-12-17 05:09:41 -02:00
Anuken 414af6a5d5 Minor button optimizations 2018-12-17 05:09:17 -02:00
Anuken 6dc64cf2f6 Cleanup 2018-12-15 21:00:03 -05:00
Anuken 832582caa9 Cleanup 2018-12-15 20:59:28 -05:00
Anuken 6029b6d67f Updated smooth UI 2018-12-14 22:07:43 -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 5c6aea0d50 Merge remote-tracking branch 'origin/master' 2018-12-14 19:11:05 -05:00
Anuken 99bf50ee52 Core recipe tweak 2018-12-14 19:10:58 -05:00
Anuken fefdad5335 Minimap switched to container 2018-12-14 10:27:23 -05:00
Anuken 982f9ce8fb Padding fix 2018-12-14 00:12:08 -05:00
Anuken 5c6d4b9ac2 Fixed extremely strange join dialog server padding 2018-12-14 00:09:44 -05:00
Anuken 49954f5c07 Merge remote-tracking branch 'origin/master' 2018-12-13 18:02:05 -05:00
Anuken 0b837925a2 Build script reformatting / 'Fixed' all unchecked warnings 2018-12-13 18:01:51 -05:00
Anuken 18ddc040d1 Merge remote-tracking branch 'origin/master' 2018-12-13 16:46:50 -05:00
Anuken aeb28f67e4 Overlapping icon button casings will bother me no more 2018-12-13 16:46:45 -05:00
Anuken 2e28525c4b Typo fix 2018-12-13 08:37:05 -05:00
Anuken 8aa8de570f Fixed editor UI bug 2018-12-12 22:19:46 -05:00
Anuken 6723479c32 Removed sound config 2018-12-12 20:13:21 -05:00
Anuken e318b6a113 Fixed #374 (temporary workaround) 2018-12-12 13:17:11 -05:00
Anuken df44f82198 Drownable tar and lava 2018-12-12 10:10:15 -05:00
Anuken 97d54868e9 Grid mode tweak 2018-12-11 17:48:55 -05:00
Anuken 65e65ba308 Formatting cleanup / Bugfix 2018-12-11 17:29:13 -05:00
Anuken 2056d5e350 Merge branch 'master' of https://github.com/Anuken/Mindustry 2018-12-11 17:24:14 -05:00
Anuken 13e5df62c9 Removed fog classes 2018-12-10 14:12:50 -05:00
Anuken 8debf8caf8 Message cleanup / Player target reset 2018-12-10 14:10:54 -05:00
Anuken 271dcd46bc Bugfixes 2018-12-10 10:38:09 -05:00
Anuken c1a7b452e0 Misc cleanup 2018-12-09 23:28:36 -05:00