Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,771 Commits 4 Branches 180 Tags
f0cab65a6dcc80c08bd90d261c44b38dbe0258c6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken f0cab65a6d Bundles updated 2018-08-01 18:38:48 -04:00
Anuken af004da699 Added mission completion dialog / Bundle fixes 2018-08-01 18:31:44 -04:00
Anuken ae90db50fe Added monsoon pad / Renamed factories to pads 2018-08-01 16:18:13 -04:00
Anuken c1de67032c Nerfed monsoon bomber 2018-08-01 13:09:46 -04:00
Anuken 890d49fdd7 Merge remote-tracking branch 'origin/master' 2018-08-01 12:46:54 -04:00
Anuken ba96ea5a0c Gamemode-specfic missions / Red-enabled location verification 2018-08-01 12:19:17 -04:00
AnukenandGitHub b481b784bb Merge pull request #166 from Predator127/patch-4 
Fixed PT-BR
 2018-07-31 21:56:58 -04:00
Anuken 53b6e68a85 Merge remote-tracking branch 'origin/master' 2018-07-31 21:55:22 -04:00
Anuken e3d16418a0 Added island around core generation 2018-07-31 21:53:40 -04:00
AnukenandGitHub d394d9a529 Merge pull request #165 from bdjnk/patch-1 
fix english translation bundle link, fix spelling
 2018-07-31 15:55:14 -04:00
Anuken 87846864cc Merge remote-tracking branch 'origin/master' 2018-07-31 12:57:48 -04:00
Anuken f3b976bdd1 All web version bugs fixed 2018-07-31 12:57:34 -04:00
AnukenandGitHub 3a06e319b0 Merge pull request #163 from toushangyouxiang/master 
Add bundle_zh_CN.properties
 2018-07-31 07:02:25 -07:00
AnukenandGitHub fe31c404ff Merge pull request #162 from Predator127/patch-3 
Huehue
 2018-07-31 07:02:16 -07:00
Anuken cc23378758 Updated gradle version 2018-07-31 09:48:33 -04:00
Anuken 43be3259c9 Removed all websocket code 2018-07-30 23:43:11 -04:00
Anuken 54a4c95a1b Minor UI fixes 2018-07-30 23:32:43 -04:00
Anuken ddac5cbfbc Added unit type descriptions / Changed blast drill sprite 2018-07-30 21:20:00 -04:00
Anuken 22342d01a5 Added blast drill 2018-07-30 19:40:44 -04:00
Anuken 2534496543 Merge remote-tracking branch 'origin/master' 2018-07-30 17:00:24 -04:00
Anuken fe9b11e771 Fully implemented mass driver 2018-07-30 17:00:18 -04:00
AnukenandGitHub 032347840f Merge pull request #161 from Prosta4okua/patch-6 
[COMPLETE] Upt8te bundle_ru.properties
 2018-07-30 10:50:24 -07:00
AnukenandGitHub 884b649b53 Merge pull request #160 from Predator127/patch-2 
Update bundle_pt_BR.properties
 2018-07-29 16:29:31 -07:00
Anuken e88ce078df Fixed place distance not being respected 2018-07-29 19:00:29 -04:00
Anuken 77f0dfb9b1 Added system to query block outputs / Editor bugfixes 2018-07-29 17:41:27 -04:00
Anuken 78d1accf07 Added resource mission 2018-07-29 12:26:48 -04:00
Anuken 2ec68a7f07 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_pt_BR.properties
 2018-07-29 12:01:52 -04:00
Anuken bbaa2a2c92 Updated bundles, removed unused text 2018-07-29 12:01:25 -04:00
AnukenandGitHub 341bb67ef4 Merge pull request #159 from TriggeredBoi/patch-1 
Update bundle_pt_BR.properties
 2018-07-29 09:00:43 -07:00
Anuken e377cb423b Merge remote-tracking branch 'origin/master' 2018-07-29 11:57:56 -04:00
Anuken 81e954c258 Implemented multi-mission sectors / Various bugfixes 2018-07-29 11:57:46 -04:00
AnukenandGitHub e740e4da87 Merge pull request #158 from Predator127/patch-1 
Update bundle_pt_BR.properties
 2018-07-29 06:51:58 -07:00
Anuken b2d61a93d9 Added sector mission display and generation 2018-07-28 22:06:01 -04:00
Anuken a045ec9d46 Fixed sector dialog UI scaling 2018-07-28 12:59:52 -04:00
Anuken 1daf8d2743 cleanup of cleanup 2018-07-28 12:52:02 -04:00
Anuken 295824f440 Minor cleanup 2018-07-28 12:50:11 -04:00
AnukenandGitHub 22b59e0cf6 Merge pull request #157 from Ameb/libgdx-miui-fix 
Introduce workaround for libgdx issue by @codegist
 2018-07-28 08:49:52 -07:00
Anuken 924b1c1a67 Fixed #156 2018-07-28 10:06:28 -04:00
Anuken 0454c4c25a Added skin aliases 2018-07-28 09:44:38 -04:00
Anuken 3a3b81941b Fixed server fog not being cleared by blocks 2018-07-27 20:18:04 -04:00
Anuken 0875c29da5 Implemented fog saving 2018-07-27 17:26:12 -04:00
Anuken 0d4cf9f6c4 Mac crash fix 2018-07-27 14:26:34 -04:00
Anuken 6a525dcf59 Mac crash fix 2018-07-27 14:25:06 -04:00
Anuken 01f6904f82 Tile field encapsulation 2018-07-27 10:52:14 -04:00
Anuken 23bd9a989b Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_ru.properties
 2018-07-27 09:15:24 -04:00
Anuken acfa02475b Updated bundles 2018-07-27 09:10:39 -04:00
AnukenandGitHub 9dba304011 Merge pull request #151 from Prosta4okua/patch-5 
[COMPLETE]Update bundle_ru.properties
 2018-07-27 09:09:37 -04:00
Anuken ce2896cb38 Command center name added / Regression fix 2018-07-26 23:04:37 -04:00
Anuken 68fd09c222 Improved unit commands 2018-07-26 19:20:47 -04:00
Anuken c832a7b93f Full command center implementation 2018-07-26 17:51:25 -04:00
Anuken 49e19ab34d Removed 'in' class 2018-07-26 15:40:35 -04:00
Anuken c1c82b451d Removed multi-class call generation 2018-07-26 15:24:48 -04:00
Anuken ea6f88b7f6 Added basic command center logic 2018-07-26 15:17:23 -04:00
Anuken 2a6ee6d65b Bundle cleanup 2018-07-26 14:19:58 -04:00
Anuken 583342b430 Merge remote-tracking branch 'origin/master' 2018-07-26 13:34:25 -04:00
Anuken 7289c1080c Cleaned up custom game dialog / Disabled saving in sectors 2018-07-26 13:34:20 -04:00
AnukenandGitHub 229e624434 Merge pull request #150 from Prosta4okua/patch-4 
Update bundle_ru.properties
 2018-07-26 11:19:31 -04:00
Anuken 7a3fb9c759 Sector size increased / Cores moved / Fixed desktop recipes appearing 2018-07-26 10:47:46 -04:00
Anuken ee5e655668 Made splitter faster when unchained 2018-07-25 17:29:43 -04:00
Anuken 58be055f57 Added interceptor factory / Sector-specific ore gen 2018-07-24 21:57:09 -04:00
Anuken 992b402e9c Merge remote-tracking branch 'origin/master' 2018-07-24 10:15:31 -04:00
Anuken 81bf28e4ed Fixed build error / Added per-type drone mine config 2018-07-24 10:15:25 -04:00
AnukenandGitHub f10734b083 Merge pull request #149 from Prosta4okua/patch-3 
[Сomplete]Upd8te bundle_ru.properties
 2018-07-24 10:00:35 -04:00
Anuken bf8f565631 Fixed ore-cliff blending 2018-07-24 09:18:04 -04:00
Anuken 9bc1ff8fa2 Added unit type unlocking / Fixed viewing of enemy block stats 2018-07-24 09:08:35 -04:00
Anuken 7e187a57d8 Volcanic terrain now more frequent 2018-07-23 22:58:56 -04:00
Anuken 572a30a2c5 Improved worldgen 2018-07-23 22:36:39 -04:00
Anuken f3235ef7e8 Merge remote-tracking branch 'origin/master' 2018-07-23 20:44:42 -04:00
Anuken 7448eb32cc Added battle misson / Team block colors / Mission worldgen 2018-07-23 20:44:33 -04:00
AnukenandGitHub 33e8cc4711 Merge pull request #148 from Prosta4okua/patch-2 
[WIP] Update bundle_ru.properties
 2018-07-23 17:53:27 -04:00
Anuken ecf9a3cbc9 Added FPS cap setting / Bugfixes 2018-07-23 11:09:51 -04:00
Anuken 01300b97e2 Changed game over menu for sectors 2018-07-22 19:06:52 -04:00
Anuken 3701a3c3d9 Updated italian bundle 2018-07-22 15:55:36 -04:00
Anuken 68c51bb1bc More generation improvements 2018-07-22 13:29:01 -04:00
Anuken df147c700c Merge remote-tracking branch 'origin/master' 2018-07-21 22:05:10 -04:00
Anuken f5fc4d99dd Improved generation 2018-07-21 22:04:10 -04:00
AnukenandGitHub 2a4aa9e550 Merge pull request #145 from theshadowknight/patch-2 
PL update
 2018-07-21 17:38:12 -04:00
Anuken e36b5551e9 Added translation testing info, useful information 2018-07-21 11:13:21 -04:00
Anuken 57856c38d6 Merge remote-tracking branch 'origin/master' 2018-07-21 10:07:01 -04:00
Anuken 2a8e02339b Added disclaimer 2018-07-21 10:06:20 -04:00
AnukenandGitHub 57f94ca6a2 Merge pull request #144 from theshadowknight/patch-1 
PL translation update
 2018-07-21 10:03:17 -04:00
Anuken d2dbab57dc Updated translation guide 2018-07-21 00:47:31 -04:00
Anuken cb448a3494 Ignored locales.json 2018-07-21 00:45:11 -04:00
Anuken 3fa6eae05b Removed locales.json 2018-07-21 00:44:49 -04:00
Anuken 52cc7d699a Added translation guide / Added locale list autogen 2018-07-21 00:44:13 -04:00
Anuken ec4eac3a7d Moved locale declaration to json file 2018-07-20 23:48:42 -04:00
Anuken fbcfb23676 fixBundles -> updateBundles 2018-07-20 20:35:53 -04:00
Anuken dbb2371801 Re-added block shadows / Block optimization 2018-07-20 18:41:08 -04:00
Anuken 4d6dc9546f Fixed cliffs not blending properly 2018-07-20 16:52:42 -04:00
Anuken 06b9d328f4 Added auto-generated cliffs for floor blocks 2018-07-20 16:06:26 -04:00
Anuken 48c7daa4ab iOS fixes 2018-07-20 13:59:00 -04:00
Anuken 3c83b88127 Multi-threaded generation previews 2018-07-20 09:26:41 -04:00
Anuken 3a63fa5475 Generation minor improvements / Added debug map view 2018-07-19 20:46:30 -04:00
Anuken 882790d133 Sleeping system changes 2018-07-19 18:10:29 -04:00
Anuken bcf72b894d Fixed conveyor entities not sleeping 2018-07-19 17:58:16 -04:00
Anuken 9f723c39ef Bundles updated / Fixed player name color changing join/leave text 2018-07-19 14:20:51 -04:00
Anuken 56fc40a64d Removed sound assets / Fixed text wrap / Proper screen clear 2018-07-19 11:06:10 -04:00
Anuken 091f591ffb Added sector-specific spawns 2018-07-19 09:58:19 -04:00
Anuken 4d88a8206a Fixed unnecessary disconnect messages / Fixed player ban crash 2018-07-19 09:30:58 -04:00
Anuken 363bf7c552 Removed sector camera clamp / Added map edge padding / Turret sprite fix 2018-07-18 22:43:35 -04:00