mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,872 Commits 4 Branches 160 Tags 2.3 GiB
2b23b7876a
Commit Graph

1572 Commits

Author SHA1 Message Date
toushangyouxiang
f289a0a9a8 fix name 2018-07-31 14:20:20 +08:00
toushangyouxiang
65a7e89a8c add bundle_zh_CN.properties 2018-07-31 14:17:01 +08: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
Predator127
7cffaeb193
Huehue 
small changes
 2018-07-30 19:34:55 -03: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
Prosta4okua
a3b0bb323f
Update bundle_ru.properties 2018-07-30 19:23:06 +03:00
Prosta4okua
a6246d27d9
[INCOMPLETE]Upt8te bundle_ru.properties 2018-07-30 19:11:25 +03:00
Predator127
92a2f770b4
Update bundle_pt_BR.properties 2018-07-29 20:02:54 -03: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
Anuken
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
Trigg
79d41ba7ac
Update bundle_pt_BR.properties 
fixed some stuff for now, I guess

(Don't want to be rude, but a good chunk of Predator's translation seems to have been made by fucken google translate )
 2018-07-29 12:20:30 -03:00
Predator127
b476c47194
Update bundle_pt_BR.properties 2018-07-28 23:33:56 -03: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
295824f440 Minor cleanup 2018-07-28 12:50:11 -04: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
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
Anuken
9dba304011
Merge pull request #151 from Prosta4okua/patch-5 
[COMPLETE]Update bundle_ru.properties
 2018-07-27 09:09:37 -04:00
Prosta4okua
69b0020d15
Update bundle_ru.properties 2018-07-27 10:03:52 +03: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
Prosta4okua
9ed4f2b7a3
Update bundle_ru.properties 2018-07-26 19:40:51 +03:00
Prosta4okua
7396f91a5e
Update bundle_ru.properties 2018-07-26 19:39:48 +03:00
Prosta4okua
ccc926d812
Update bundle_ru.properties 2018-07-26 19:36:26 +03:00
Prosta4okua
bd39255ead
Update bundle_ru.properties 2018-07-26 19:31:21 +03:00
Prosta4okua
add7b1a7d9
Update bundle_ru.properties 2018-07-26 19:29:19 +03:00
Prosta4okua
8e471f9939
Update bundle_ru.properties 2018-07-26 19:24:08 +03:00
Prosta4okua
c61568ef98
Update bundle_ru.properties 2018-07-26 19:13:47 +03:00
Prosta4okua
3260e45e71
Update bundle_ru.properties 2018-07-26 19:11:48 +03:00
Prosta4okua
ea61b560b8
Update bundle_ru.properties 2018-07-26 19:03:58 +03:00
Prosta4okua
f8ad7d485b
[INCOMPLETE]Update bundle_ru.properties 2018-07-26 18:58:24 +03:00
Anuken
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
Prosta4okua
9a7ea0d28c
Update bundle_ru.properties 2018-07-26 17:40:38 +03: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
Leone25
38e1944503
Update bundle_ita.properties 2018-07-24 16:34:52 +02: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
Anuken
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
Prosta4okua
56239b6bbf
Up8te bundle_ru.properties 
It's all?!
 2018-07-24 13:44:30 +03:00
Leone25
cedd2bfe57
Update bundle_ita.properties 2018-07-24 10:42:09 +02: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
Prosta4okua
6cdb016c2c
[WIP] Update bundle_ru.properties 2018-07-23 23:45:43 +03:00
Leone25
ababb7f5ab
Update bundle_ita.properties 2018-07-23 21:24:23 +02:00
Leone25
9f2b66e09d
Update bundle_ita.properties 2018-07-23 20:56:38 +02:00
Leone25
8de267f6a9
Update bundle_ita.properties 2018-07-23 19:20:58 +02: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
Leone25
787163fb06
Flew changes at the bottom 2018-07-22 22:18:51 +02: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
theshadowknight
0a489f1117
. 2018-07-21 18:16:33 +02:00
theshadowknight
9cc7c061a3
FINAL 2018-07-21 18:10:38 +02:00
theshadowknight
a1e7274ec3
I think it is final 
*think*
 2018-07-21 17:59:44 +02:00
theshadowknight
51d516a39e
. 2018-07-21 17:49:32 +02:00
theshadowknight
de7c38231c
look 2018-07-21 17:46:48 +02:00
theshadowknight
c352ef9382
PL update 
YAY! *Some easter eggs here*
 2018-07-21 17:15:14 +02:00
theshadowknight
0eaca8b80a
PL translation update 
I finished at 458
 2018-07-21 13:00:56 +02: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
Anuken
7ff4e5879d Implemented multi-cell sectors 2018-07-18 13:23:54 -04:00
Anuken
0b7decbfdd Removed static block layer / Minor bugfixes 2018-07-18 10:40:31 -04:00
Anuken
be9ea33aa4 Improved floodfill / Fixed resource use bug / Fixed editor turret draw 2018-07-17 23:20:05 -04:00
Anuken
d4b2cad94e Merge remote-tracking branch 'origin/master' 2018-07-17 19:19:55 -04:00
Anuken
ac039ce7cd Fixed sector world gen / Added sector goal unlocks 2018-07-17 19:12:44 -04:00
Anuken
946e60937d iOS fixes 2018-07-17 14:15:43 -04:00
Anuken
6f6601d270 Improved sector dialog look / Made mobile versions show play select 2018-07-17 13:19:20 -04:00
Anuken
71016f0d7c Updated uCore / Added hidden sector saves 2018-07-17 12:47:11 -04:00
Anuken
c2c2551607 Implemented save time recording 2018-07-17 10:42:44 -04:00
Anuken
d7812ec030 New save slot system / Buffed smelter / Fixed flying shadow glitches 2018-07-17 09:18:19 -04:00
Anuken
f184b0700f Fixed conveyor/conduit crash / Improved conveyor movement 2018-07-16 21:44:15 -04:00
Anuken
07f0be8d8d Updated uCore / Sector deploying support 2018-07-16 20:53:35 -04:00
Anuken
dd45b43d7f Classes moved / Fixed autotile bugs / Added sector display 2018-07-16 18:42:29 -04:00
Anuken
9b505106e3 Fixed ugly oversized shadows in corner autotiles 2018-07-16 09:42:13 -04:00
Anuken
d552f37daf Added conveyor autotiling / Fixed autotile update bug 2018-07-15 22:33:14 -04:00
Anuken
6a7ff13859 Added basic sector classes / Changed play menu dialog 2018-07-15 17:19:33 -04:00
Anuken
92a968217c Fixed power being set to NaN / Set splitter sprite to router 2018-07-15 11:50:06 -04:00
Anuken
37b9df3202 Removed all UI builders / Updated uCore and functional interfaces 2018-07-14 22:06:03 -04:00
Anuken
7dc33111fc Changed default world size back 2018-07-14 20:04:27 -04:00
Anuken
ab2f260a52 Fixed some crashes 2018-07-14 17:16:13 -04:00
Anuken
dfed36748c Fixed saves not loading / Increased biomatter compressor output 2018-07-14 16:06:38 -04:00
Anuken
d35f736548 Updated traditional chinese bundle / Fixed korean bundle 2018-07-14 12:14:22 -04:00
Anuken
cfecdae970 Class package refactoring 2018-07-14 12:11:48 -04:00
Anuken
59ade6cf09 Vault optimizations / Removed unloader 2018-07-14 10:47:18 -04:00
Anuken
3ae51edf3a Merge branch '4.0' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle_ko.properties
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/UI.java
 2018-07-14 09:32:55 -04:00
Anuken
d8ccb81015 Merge remote-tracking branch 'origin/4.0' into 4.0 2018-07-14 09:26:43 -04:00
Anuken
0db6020231 Increased bridge range / Bugfixes 2018-07-14 09:26:34 -04:00
Anuken
9b86ded164
Merge pull request #141 from cloud9350/patch-4 
Update bundle_ko.properties
 2018-07-13 20:00:34 -04:00
Gureumi
6cbb645b10
Update bundle_ko.properties 2018-07-14 08:54:55 +09:00
Anuken
066a1d7591 Merge remote-tracking branch 'origin/4.0' into 4.0 
# Conflicts:
#	core/src/io/anuke/mindustry/Vars.java
 2018-07-13 19:54:20 -04:00
Anuken
5f82d575ee iOS fixes 2018-07-13 19:50:18 -04:00
Anuken
302ae0a83c Merge remote-tracking branch 'origin/4.0' into 4.0 
# Conflicts:
#	core/assets/bundles/bundle_ko.properties
 2018-07-13 13:48:52 -04:00
Anuken
82c4c791cc Added message for loading broken saves 2018-07-13 13:43:37 -04:00
Anuken
3c0310120d
Merge pull request #140 from cloud9350/patch-4 
Update bundle_ko.properties
 2018-07-13 13:24:05 -04:00
Anuken
21c106e9d5 Updated splitter description 2018-07-13 12:53:40 -04:00
Anuken
2c8cd2f8dc Fixed autosave not triggering 2018-07-13 12:50:45 -04:00
Anuken
380d9908b4 Fixed chat stopping velocity / Fixed drone repair not being synced 2018-07-13 11:46:16 -04:00
Anuken
6abef7d645 Fixed item bridge crash 2018-07-13 11:09:33 -04:00
Anuken
98ac25ac29 Fixed distributor 2018-07-13 10:21:17 -04:00
Anuken
93bec04c92 Fixed overflow gate, splitter 2018-07-13 10:11:42 -04:00
Gureumi
136559cddd
Update bundle_ko.properties 2018-07-13 22:34:41 +09:00
Gureumi
3f63a6ed70
Update bundle_ko.properties 2018-07-13 22:24:00 +09:00
Anuken
2fcb3c4420 Bugfixes 2018-07-12 21:13:08 -04:00
Anuken
baaeb229cf Formatting 2018-07-12 20:37:15 -04:00