Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,700 Commits 4 Branches 180 Tags
4ffe2333219bb40af4a5eb856959cdcd4086be99
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken 4ffe233321 Added repair point range display 2019-12-16 18:37:11 -05:00
Anuken 6971a76c8e І 2019-12-16 12:50:18 -05:00
Anuken d47f86cc21 Cleanup 2019-12-16 10:12:39 -05:00
Anuken 487607e1d6 Removed references to GWT completely 2019-12-16 00:08:14 -05:00
Anuken 3cefc085bd Tentative RU bundle changes 2019-12-15 22:11:07 -05:00
Anuken 3d8e5bd36a Added new Cyrillic font 2019-12-15 21:31:55 -05:00
Anuken e9ed0512f7 Removed Path API usage 2019-12-15 21:12:41 -05:00
Anuken 0cf39bf5c3 Eliminated 8 characters 2019-12-15 20:01:06 -05:00
Anuken 95a1474b9a Merge remote-tracking branch 'origin/master' 2019-12-15 19:36:38 -05:00
Anuken 53aedcee2c Cleanup 2019-12-15 19:35:04 -05:00
AnukenandGitHub 9758a05002 Merge pull request #1218 from joshuaptfan/break-cancel 
Prevent right-click from deconstructing when schematic is selected
 2019-12-15 18:38:08 -05:00
Anuken 9f3dcdf727 Fixed #1215 - made all valid floors show up in drill mine list 2019-12-15 16:29:11 -05:00
Anuken 7d2354a653 Mod path resolving fixes 2019-12-15 16:00:50 -05:00
Anuken ab21b88001 Mod sort fix 2019-12-15 15:22:19 -05:00
Anuken a560978dcf Sync fixes / Fixed linear filtering resetting on mod load 2019-12-15 14:30:28 -05:00
Anuken 047f479a2f Fixed server 2019-12-15 14:00:07 -05:00
Anuken d78d3daaf9 Updated script stub 2019-12-15 13:56:01 -05:00
Anuken 976d0f54b3 Merge branches 'master' and 'safe-mod-loading' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/mod/Mods.java
 2019-12-15 13:55:30 -05:00
Anuken 1c1db3990f Fully implemented safe content loading 2019-12-15 13:54:51 -05:00
Anuken bcc8f65ac8 More cleanup 2019-12-14 20:49:55 -05:00
Anuken e043f4bb66 API cleanup 2019-12-14 18:19:02 -05:00
Anuken 9d3dda035c Compile fixes 2019-12-14 12:53:37 -05:00
Anuken 6e16aab794 Merge remote-tracking branch 'origin/master' 2019-12-14 11:05:32 -05:00
Anuken c1cf3183ac Fixed some Android-related script issues 2019-12-14 11:04:22 -05:00
Anuken 252d0f6aa1 aaaaa 2019-12-14 10:51:36 -05:00
Anuken 1f5a6e1bf8 Compile error fixes 2019-12-14 10:06:09 -05:00
Anuken 58e3143e2a Content cleaning 2019-12-14 09:33:07 -05:00
AnukenandGitHub 9033ebcfd7 Merge pull request #1019 from Kieaer/patch-4 
Add WithdrawEvent
 2019-12-13 23:19:19 -05:00
AnukenandGitHub 1f5e773c77 Fixed double-event firing 2019-12-13 23:15:49 -05:00
AnukenandGitHub 7b1a0a42d4 Merge pull request #1206 from joshuaptfan/zoom-no-hold 
Make scroll zoom by default, remove zoom hold keybind
 2019-12-12 18:35:29 -05:00
AnukenandGitHub 3d78175e50 Merge pull request #1208 from Kieaer/patch-6 
Update MessageBlock.java
 2019-12-12 18:33:20 -05:00
Anuken 19675068ea Fixed wave time not saving properly 2019-12-12 17:09:29 -05:00
Anuken c3e41140e0 Disabled smart resource usage for now 2019-12-12 16:39:34 -05:00
Anuken bce379d40d Merge remote-tracking branch 'origin/master' 2019-12-12 16:34:37 -05:00
Anuken 8fde8695d0 Fixed tests 2019-12-12 16:33:24 -05:00
AnukenandGitHub 8c1c54d49a Merge pull request #1207 from Prosta4okua/master 
1 new line
 2019-12-12 16:31:04 -05:00
Anuken 01e3912827 Implemented conservative generators / Closes #804 2019-12-12 16:28:02 -05:00
Anuken 1ae20553ff Merge remote-tracking branch 'origin/master' 2019-12-12 16:07:40 -05:00
AnukenandGitHub c68eaade94 Merge pull request #1204 from Prosta4okua/master 
Ukrainian translation.
 2019-12-12 16:07:29 -05:00
AnukenandGitHub 1461b5b357 Merge pull request #1205 from Prosta4okua/patch-2 
True Ukrainian translation
 2019-12-12 16:07:05 -05:00
AnukenandGitHub f0dd3b3a39 Merge pull request #1109 from ballgamer56/patch-1 
Thai translation
 2019-12-12 15:54:50 -05:00
Anuken 61d724ee2b Added Thai font 2019-12-12 15:54:25 -05:00
AnukenandGitHub 0f23bf9d08 Merge pull request #1156 from martin-mfg/master 
add and fix some German translations
 2019-12-12 15:34:44 -05:00
AnukenandGitHub 202d79817a Merge pull request #1149 from itskatt/french-translation 
Update the French Translation
 2019-12-12 15:34:06 -05:00
AnukenandGitHub a29ce3b0b9 Merge pull request #1202 from AmateurPotion/patch-23 
Update bundle_ko.properties
 2019-12-12 09:30:18 -05:00
Anuken fbed11e927 Fixed #1198 2019-12-11 15:13:45 -05:00
Anuken 45ce4013d0 Merge remote-tracking branch 'origin/master' 2019-12-11 14:26:51 -05:00
AnukenandGitHub 6f3d585118 Merge pull request #1183 from GioIacca9/patch-2 
Update bundle_it.properties
 2019-12-11 14:24:37 -05:00
AnukenandGitHub 962ce7bfa6 Merge pull request #1187 from AmateurPotion/patch-22 
Update bundle_ko.properties
 2019-12-11 14:24:24 -05:00
AnukenandGitHub b6ee157adb Update bundle_zh_TW.properties (#1190) 
* Update bundle_zh_TW.properties

* Update bundle_zh_TW.properties
 2019-12-11 14:24:15 -05:00
Anuken 675e15ddca Minor refactor of class names 2019-12-11 14:23:53 -05:00
Anuken aeb6e6498e Minor server tweaks 2019-12-10 17:00:49 -05:00
Anuken f4ee67c08b Fixed gradle complaining about absolutely nothing 2019-12-10 10:45:07 -05:00
Anuken b74696b312 Fixed effect loading 2019-12-09 22:20:53 -05:00
Anuken da849085ec Status effect cleanup 2019-12-09 22:08:22 -05:00
Anuken 2a03ef0c43 More cleanup 2019-12-09 16:59:43 -05:00
Anuken 0078a8cb8e Fixed scripts not working on older Android phones 2019-12-09 12:48:15 -05:00
Anuken 177cea5c5d Added block size error 2019-12-09 11:48:59 -05:00
Anuken 74dc31b10a Removed unnecessary unit types 2019-12-09 11:27:09 -05:00
Anuken 9e07b95223 Functional tweaks 2019-12-08 22:50:54 -05:00
Anuken 2554433f8d Fixed #1184 2019-12-08 21:29:03 -05:00
Anuken e06d61dcc9 FX cleanup 2019-12-08 18:38:56 -05:00
Anuken 1aca302518 Many changes to improve scripting 2019-12-08 18:34:23 -05:00
Anuken a7d37b7e6c Fixed tests 2019-12-08 15:59:48 -05:00
Anuken 9f29898713 Better console / Better logging 2019-12-08 15:17:14 -05:00
Anuken 803719b216 Added mod displayName property [for color tags, etc] 2019-12-08 13:44:27 -05:00
Anuken 6588fc6581 Removed pointless base object 2019-12-08 13:14:47 -05:00
Anuken 9f4d44f0f3 Cleanup / Added server support for scripting 2019-12-08 11:00:59 -05:00
Anuken 07fb5aa88e Bugfixes 2019-12-08 10:27:06 -05:00
Anuken b3e1436074 Fixed #1176 2019-12-08 10:09:29 -05:00
Anuken fd202421b1 Changed console keybind to prevent confusion 2019-12-08 00:25:13 -05:00
Anuken 268f3cc3c2 Merge branches 'master' and 'rhino-js-suffering' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/content/Blocks.java
#	gradle.properties
 2019-12-08 00:15:42 -05:00
Anuken 477ebc91bf Fixed reloading 2019-12-07 21:53:50 -05:00
Anuken fd6abaff62 More class support 2019-12-07 21:46:35 -05:00
Anuken 5ca01bf234 Effect parsing 2019-12-07 15:55:51 -05:00
Anuken d3747f0d4c Content loading improvements 2019-12-07 15:41:52 -05:00
Anuken 07598e3f2f Minor tweaks 2019-12-07 14:26:14 -05:00
Anuken dd5e3b2aba JS console / Scripting tweaks 2019-12-07 14:10:39 -05:00
Anuken 06abc43aea Fixed slow imports 2019-12-07 11:37:13 -05:00
Anuken 93fd6c5bd6 Removed massive import wall 2019-12-07 01:51:09 -05:00
Anuken 96aa3ccee0 Various improvements 2019-12-07 00:34:27 -05:00
Anuken f3a5798a7f Various fixes 2019-12-06 22:24:32 -05:00
Anuken 2b49c300f8 Security / Android compat / Functional extension 2019-12-06 21:57:47 -05:00
Anuken 50a6071cfc Fixed maps not reloading on mod reload 2019-12-06 14:07:18 -05:00
Anuken ef24e5ecad Merge remote-tracking branch 'origin/master' 2019-12-05 22:06:57 -05:00
Anuken 6f146c6cad Added support for mod map/schematic packs 2019-12-05 21:15:28 -05:00
Anuken a087df0771 Added experimental server block syncing 2019-12-04 17:03:49 -05:00
Anuken c85847567d h 2019-12-03 18:03:21 -05:00
Anuken 1e3bfba31a this engine is also broken 2019-12-03 17:16:23 -05:00
Anuken 5788c27aaa hmmm 2019-12-03 01:01:18 -05:00
Anuken 5c30f4bc9c Fixed nothing 2019-12-02 17:52:49 -05:00
Anuken 5a9957c578 Merge remote-tracking branch 'origin/master' 2019-12-01 17:36:30 -05:00
Anuken 42687fb47e Fixed crash caused by missing sounds 2019-12-01 17:35:47 -05:00
Anuken 9cb55b9745 a mess 2019-12-01 14:21:47 -05:00
Anuken e66ecb6c90 Removed unnecessary option 2019-12-01 12:50:11 -05:00
Anuken 0e7c403bd8 Tweaks 2019-12-01 12:32:35 -05:00
Anuken b6915a0483 Fixed script load crash 2019-12-01 01:30:40 -05:00
Anuken b21c25bccf Added features that don't work 2019-11-30 22:15:30 -05:00
Anuken ceae04aa5b Desktop-specific scripting 2019-11-30 18:30:39 -05:00
Anuken 3abcdf2063 Better access 2019-11-30 17:45:02 -05:00