Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,077 Commits 4 Branches 180 Tags
cd07d3b13d78e0a23ae8af9b46a4236188b80e4e
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
AnukenandGitHub cd07d3b13d Update Block.java 2019-10-26 08:52:53 -04:00
AnukenandGitHub b582c79593 Update PowerNode.java 2019-10-26 08:51:26 -04:00
AnukenandGitHub df0d81db7c Update Tile.java 2019-10-26 08:49:52 -04:00
Anuken 708acdfe95 Merge remote-tracking branch 'origin/master' 2019-10-25 15:06:16 -04:00
Anuken f84a7e7661 Mobile layout fix 2019-10-25 15:06:12 -04:00
AnukenandGitHub 5fde533bcc a 2019-10-25 15:01:51 -04:00
AnukenandGitHub 16e57f6f24 Update bug_report.md 2019-10-25 15:01:45 -04:00
Anuken 44dc250a2b Various bugfixes 2019-10-25 14:48:44 -04:00
Anuken 742fb3dece Fixed #880 2019-10-25 14:08:31 -04:00
Anuken bd0a6636e6 Minor bugfixes 2019-10-25 14:00:38 -04:00
Anuken 6023b312e3 iOS mod dialog layout 2019-10-25 13:13:13 -04:00
Anuken c4cbb85e03 iOS fix 2019-10-25 13:08:50 -04:00
Anuken 3280bceaa1 Bugfixes 2019-10-25 13:05:04 -04:00
Anuken b7e788d529 Fixed #877 / Fixed #871 / Other fixes 2019-10-25 12:58:07 -04:00
Anuken 15cbc5fe42 Minor bugfixes 2019-10-24 23:41:17 -04:00
Anuken 70d80bb32e Cleanup / Added server-side rule change Call 2019-10-24 20:13:29 -04:00
Anuken 6d878e33fd Support for mp3 without iOS 2019-10-24 20:01:15 -04:00
Anuken e865d17fd1 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-10-24 18:53:21 -04:00
Anuken f971061ef4 Bugfixes 2019-10-24 18:52:42 -04:00
Anuken 5d7f14c21f Better error messages 2019-10-24 18:11:18 -04:00
Anuken 955dc5f48d Bugfixes / Copy over plugins to mod folder 2019-10-24 18:04:39 -04:00
Anuken cbfcb5de2c Bugfixes 2019-10-24 09:03:49 -04:00
Anuken eaaf3a9e60 Fixed compilation 2019-10-24 08:21:37 -04:00
Anuken ab199633f8 Check version when connecting 2019-10-23 21:47:08 -04:00
Anuken 80ccc0eee0 Merge remote-tracking branch 'origin/master' 2019-10-23 20:14:24 -04:00
Anuken 7179b147b2 Added Reddit link 2019-10-23 20:13:22 -04:00
Anuken 74366f10e9 Bugfix 2019-10-23 17:49:29 -04:00
Anuken f1a423f8fb Bugfixes 2019-10-23 16:04:19 -04:00
Anuken b7c1660b07 Merge remote-tracking branch 'origin/master' 2019-10-23 14:48:39 -04:00
Anuken b0409b31d8 Display content in mod error 2019-10-23 14:37:22 -04:00
Anuken 151dca6fb9 Updated bundles 2019-10-22 20:33:52 -04:00
Anuken 56e5705ed6 Bugfixes 2019-10-22 20:17:43 -04:00
Anuken 1f5e639fb2 Use short map names 2019-10-22 19:37:03 -04:00
Anuken b98b9a98e3 Cleanup 2019-10-22 18:55:15 -04:00
Anuken ae4ec55abe Merge remote-tracking branch 'origin/master' 2019-10-22 18:45:15 -04:00
Anuken 17e219f142 Fixed #859 2019-10-22 18:45:05 -04:00
Anuken d39ceb1f5e Respawn players on restart 2019-10-22 09:22:06 -04:00
Anuken ceec999922 Merge remote-tracking branch 'origin/master' 2019-10-21 21:22:44 -04:00
Anuken d7ebbbf2b6 Better organization 2019-10-21 21:22:35 -04:00
Anuken bb593af463 Bugfixes 2019-10-21 19:55:21 -04:00
Anuken 4ae4456c43 Merge remote-tracking branch 'origin/master' 2019-10-21 19:32:51 -04:00
Anuken d2fda57f2c Revert merge 2019-10-21 19:32:46 -04:00
Anuken 4f6bd5b684 Bugfixes 2019-10-21 18:55:01 -04:00
Anuken 181c418cea Merge remote-tracking branch 'origin/master' 2019-10-21 17:53:05 -04:00
Anuken 01f6fff823 Correct liquid boost display for turrets 2019-10-21 17:50:26 -04:00
Anuken ad5cb37ed5 Merge remote-tracking branch 'origin/master' 2019-10-21 00:02:40 -04:00
Anuken eb1d3c27c5 Mods + crash message for iOS/Android 2019-10-21 00:02:36 -04:00
Anuken ec59396035 Fixed sharing crash 2019-10-20 21:31:34 -04:00
Anuken c5a550bf78 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-10-20 20:44:59 -04:00
Anuken 83b3bd9a2e Fixed flip not taking into account offset 2019-10-20 20:39:58 -04:00
Anuken a2ff516112 Merge branch 'master' of https://github.com/Anuken/Mindustry 2019-10-20 17:09:02 -04:00
Anuken 513e5b4019 iOS fix 2019-10-20 17:08:54 -04:00
AnukenandGitHub fe4783dc63 Merge pull request #814 from Maxattax97/minimap-players 
Add username labels to map/minimap
 2019-10-20 17:06:48 -04:00
Anuken ffa6894e56 Merge remote-tracking branch 'origin/master' 2019-10-20 17:05:56 -04:00
Anuken 982483f178 Merged #812 2019-10-20 17:05:23 -04:00
AnukenandGitHub b1d9be707d Merge pull request #847 from clfer/feature/build-queue-improvement 
Allow to replace previous build request in queue
 2019-10-20 16:57:25 -04:00
Anuken 907f1e7dfd Merge remote-tracking branch 'origin/master' 2019-10-20 16:52:06 -04:00
Anuken 2e0e351228 Bugfixes 2019-10-20 16:50:04 -04:00
AnukenandGitHub e4b267d757 Merge pull request #838 from ado1928/master 
Added more rubble pngs
 2019-10-20 16:32:07 -04:00
Anuken 4b428c6636 Bugfixes 2019-10-20 14:06:43 -04:00
Anuken b5e9f280e6 Schematic preview improvements 2019-10-20 12:48:39 -04:00
Anuken 3c65e366e8 Clear previous schematic when selecting new one 2019-10-20 10:56:17 -04:00
Anuken e9efe4169c Fixes of bug variety 2019-10-20 10:42:40 -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 95cda0d9ab no 2019-10-16 19:46:03 -04:00
Anuken 2dae3c4b4a Fixed sound loading 2019-10-16 19:19:08 -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
AnukenandGitHub 3939d1855d Merge pull request #831 from Quezler/patch-2 
Fix loadout reset
 2019-10-16 12:27:20 -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