Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,995 Commits 4 Branches 180 Tags
4c7259843c97e1ea9d97fc9c1a2ca5145801e005
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 4c7259843c Merge branch 'master' of https://github.com/Anuken/Mindustry into mech-rework 
# Conflicts:
#	core/assets/sprites/sprites.atlas
#	core/assets/sprites/sprites.png
 2019-10-20 10:21:35 -04:00
Anuken 4be22822d4 Bugfixes 2019-10-20 10:06:13 -04:00
Anuken 00054e2c61 Bugfixes 2019-10-19 21:09:59 -04:00
Anuken cc105e5029 Merge branches 'master' and 'schematics' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	gradle.properties
 2019-10-19 20:46:25 -04:00
Anuken f6899cf3c3 Mobile bugfixes 2019-10-19 20:45:17 -04:00
Anuken a2a4c8c43d Bugfixes 2019-10-19 19:54:41 -04:00
Anuken 0faae5d5ca Bugfix 2019-10-19 19:11:54 -04:00
Anuken 2586c53f0d Complete refactoring of workshop / Schematic+mod support 2019-10-19 18:53:27 -04:00
Anuken d0dc21a52c Workshop refactoring 2019-10-19 02:00:43 -04:00
Anuken f7be953bb5 Schematic import 2019-10-19 01:19:32 -04:00
Anuken 08a51d8f1b Schematic export buttons, workshop support progress 2019-10-19 01:03:49 -04:00
Anuken 32edf58f75 Fixed zips 2019-10-18 20:11:02 -04:00
Anuken 88e1770f2e Bugfixes 2019-10-18 19:31:01 -04:00
Anuken 142e93f3e9 Schematic search button 2019-10-18 17:18:29 -04:00
Anuken db9eb36c8c Updating arc 2019-10-18 15:07:13 -04:00
Anuken 6a12effd6a Schematic flipping + rotation 2019-10-18 14:38:43 -04:00
Anuken f7d98591c9 Schematic rotation 2019-10-18 11:38:00 -04:00
Anuken 30bcfb6d5e Functional desktop schematic placement 2019-10-18 00:41:30 -04:00
Anuken 61d15782d0 More functionality, lots of bugfixes 2019-10-17 23:51:23 -04:00
Anuken dec6a1296b Better schematic previews, keep on game export 2019-10-17 22:57:37 -04:00
Anuken 44c8b07eb1 Things 2019-10-17 22:14:04 -04:00
Anuken 0095d89543 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-17 21:58:55 -04:00
Anuken 4977f598fd Config drawing 2019-10-17 21:58:49 -04:00
Anuken 25cacbb28d Merge remote-tracking branch 'origin/master' 2019-10-17 17:00:49 -04:00
Anuken a0c93ea7d3 Made incend bullets apply status instead of creating fire 2019-10-17 17:00:38 -04:00
Anuken 1921bc87a2 Dialog 2019-10-17 16:53:43 -04:00
AnukenandGitHub 6437e6b878 Update ContentParser.java 2019-10-17 10:56:10 -04:00
Anuken 41284ac3bc Bugfix 2019-10-17 09:01:59 -04:00
Anuken 8cf0df7ac5 Crash fix 2019-10-17 08:40:11 -04:00
Anuken b804f7fa6e Bugfixes 2019-10-16 23:08:07 -04:00
Anuken ddf2ce353f Merge branches 'master' and 'mech-rework' of https://github.com/Anuken/Mindustry into mech-rework 2019-10-16 19:46:20 -04:00
Anuken 95cda0d9ab no 2019-10-16 19:46:03 -04:00
Anuken 2dae3c4b4a Fixed sound loading 2019-10-16 19:19:08 -04:00
Anuken 9f9e838a3a Alpha stuff 2019-10-16 18:57:19 -04:00
Anuken 0f52fc1f4f Alpha sprite 2019-10-16 18:36:02 -04:00
Anuken 71be99ad6d Tweaks 2019-10-16 17:30:47 -04:00
Anuken 4b5d3ba4d8 Added laser bullet type 2019-10-16 16:33:09 -04:00
Anuken fd12027873 Merge remote-tracking branch 'origin/master' 2019-10-16 14:37:31 -04:00
Anuken ff4c7e4302 Multithreaded packing 2019-10-16 14:36:46 -04:00
Anuken b2ea1b7ca5 Some refactoring 2019-10-16 14:22:54 -04:00
AnukenandGitHub 3939d1855d Merge pull request #831 from Quezler/patch-2 
Fix loadout reset
 2019-10-16 12:27:20 -04:00
Anuken 47f423540d Vanguard mech visuals 2019-10-15 20:35:43 -04:00
Anuken a3871cca90 Added correctly named mech pads for alpha/dart 2019-10-15 18:32:47 -04:00
AnukenandGitHub af3067c08b Merge pull request #800 from laohuaji233/patch-23 
Update bundle_zh_CN.properties
 2019-10-15 18:30:57 -04:00
AnukenandGitHub d0006eaa26 Merge pull request #793 from 1RedOne/patch-2 
Adds Japanese menu items for Mods
 2019-10-15 18:21:04 -04:00
AnukenandGitHub 52b2731a42 Merge pull request #785 from osoitz/patch-2 
Update bundle_eu.properties
 2019-10-15 18:19:11 -04:00
AnukenandGitHub 08f3368766 Merge pull request #782 from Amon-Senpai/patch-2 
Update bundle_de.properties
 2019-10-15 18:17:30 -04:00
AnukenandGitHub 86474484ae Merge pull request #780 from PlayerBrasil13/patch-3 
Update bundle_pt_BR.properties
 2019-10-15 18:17:11 -04:00
AnukenandGitHub e31fb13378 Merge pull request #774 from dase1353/patch-1 
Update bundle_zh_TW.properties
 2019-10-15 18:15:44 -04:00
AnukenandGitHub c147389d25 Merge pull request #769 from Tunacan427/master 
Huge updates to Turkish translations
 2019-10-15 18:15:12 -04:00
AnukenandGitHub 0581f500cc Merge pull request #767 from mdtrooper/master 
Update bundle_es.properties
 2019-10-15 18:08:26 -04:00
AnukenandGitHub e5335e9a97 Merge branch 'master' into master 2019-10-15 18:08:21 -04:00
AnukenandGitHub 5c0a338e6b Merge pull request #765 from azureblue/azureblue-patch-1_bundle_pl 
Update bundle_pl.properties
 2019-10-15 18:07:52 -04:00
AnukenandGitHub 73329ccaf2 Merge pull request #753 from clfer/feature/update_bundle_fr_FR 
Update bundle_fr.properties
 2019-10-15 18:05:09 -04:00
AnukenandGitHub 8b5b7cf5fc Merge pull request #759 from laohuaji233/patch-21 
Create achievements.vdf
 2019-10-15 18:01:35 -04:00
AnukenandGitHub 799cdc716b Create description.txt (#744) 
* Create description.txt

* Rename fastlane/metadata/steam/description.txt to fastlane/metadata/steam/Simplified Chinese/description.txt
 2019-10-15 17:54:23 -04:00
Anuken 121e27906c Fixed bullet parsing 2019-10-15 14:31:31 -04:00
Anuken 923b3eba96 h 2019-10-15 14:26:11 -04:00
Anuken cee9c8fa01 Merge remote-tracking branch 'origin/mech-rework' into mech-rework 
# Conflicts:
#	gradle.properties
 2019-10-15 09:19:06 -04:00
Anuken a1826763f5 Autotiling begins 2019-10-15 08:56:42 -04:00
Anuken 5a3e4f7fb6 Merge branch 'master' of https://github.com/Anuken/Mindustry into schematics 2019-10-15 08:52:48 -04:00
Anuken f17766c8ce Fixed tests 2019-10-15 08:51:48 -04:00
Anuken 8556b7eef7 Block build visibility 2019-10-15 00:23:38 -04:00
Anuken 8e9b84f4f9 Minor position tweak 2019-10-14 23:50:07 -04:00
Anuken 6b1fd152e5 Merge remote-tracking branch 'origin/master' 2019-10-14 23:48:38 -04:00
Anuken 6bceb7311a Better display of broken stuff / 5x slower wall building 2019-10-14 23:43:13 -04:00
Anuken eb21d5ab67 Experimental schematics 2019-10-14 21:34:06 -04:00
Anuken edfd402ccd Targeting priority 2019-10-14 18:54:50 -04:00
Anuken 3d8547d7dd Better null checks 2019-10-14 18:40:28 -04:00
Anuken 3ffa768cfc Json cleanup 2019-10-14 17:36:58 -04:00
AnukenandGitHub 53e9d4a3e3 Update ModsDialog.java 2019-10-14 12:40:56 -04:00
Anuken 78471c1860 Cleanup 2019-10-13 19:43:51 -04:00
Anuken 7eb3e5c0ea Radial tech tree layout 2019-10-13 19:36:47 -04:00
Anuken adc7c2bdb6 Full zoom+pan in tech tree and campaign 2019-10-13 17:53:50 -04:00
Anuken bef8b905de Added github import dialog 2019-10-13 17:14:35 -04:00
Anuken 53c842492a Tech tree zoom 2019-10-13 14:49:19 -04:00
Anuken 3d624f7eaf Added inverted sorter 2019-10-13 12:58:58 -04:00
Anuken 8366dfcece Vanguard starter mech 2019-10-13 12:38:14 -04:00
Anuken 92dacf18cd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2019-10-13 12:12:03 -04:00
Anuken 6743bd144f Nestable set iteration 2019-10-13 12:11:28 -04:00
Anuken 4b7b07460a Nestable set iteration 2019-10-13 12:09:49 -04:00
Anuken a09320cb4a A warning 2019-10-12 23:12:02 -04:00
Anuken c6173e70eb A warning 2019-10-12 23:11:45 -04:00
Anuken 9ef31201b6 Fixed #821 2019-10-12 21:48:45 -04:00
Anuken e7a5f0a6e6 Fixed editor variants 2019-10-12 18:45:46 -04:00
Anuken 0509c28576 Fixed bizzare single type generator initialization 2019-10-12 18:39:08 -04:00
Anuken 35c13d38a4 Base mech 2019-10-12 18:12:28 -04:00
Anuken dd3fd97b43 Updated arc 2019-10-12 16:56:43 -04:00
Anuken d973283039 Mod loading fixes 2019-10-12 15:22:54 -04:00
Anuken 01e3bd703e Added option to initialize generators without storage properties 2019-10-12 13:10:33 -04:00
Anuken d9f98323c7 Merge remote-tracking branch 'origin/master' 2019-10-12 12:53:05 -04:00
Anuken d7ca2a33c8 Input fixes 2019-10-12 12:52:50 -04:00
Anuken bd3463c824 Override locale names, fixes #757 2019-10-11 18:09:56 -04:00
Anuken 4e0d1b2746 Better mod crash logs 2019-10-11 16:08:14 -04:00
Anuken b927c2df1a Hash update 2019-10-11 10:30:20 -04:00
Anuken 3f3a03c227 ???? 2019-10-11 09:32:58 -04:00
Anuken 36cec98082 ??? 2019-10-11 09:26:49 -04:00
Anuken 4f7561d66c Compile fix 2019-10-11 09:18:21 -04:00
Anuken a05ee8bbb8 Merge remote-tracking branch 'origin/master' 2019-10-11 09:15:30 -04:00
Anuken 21b7a0235b Attempting to fix github CI 2019-10-11 09:14:43 -04:00