mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-30 17:34:23 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,112 Commits 4 Branches 160 Tags 2.3 GiB
3d0b02ee23
Commit Graph

954 Commits

Author SHA1 Message Date
Predator127
e41f560ecd
Fixed PT-BR 
Small fixes.
 2018-07-31 17:49:14 -03: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
Anuken
3a06e319b0
Merge pull request #163 from toushangyouxiang/master 
Add bundle_zh_CN.properties
 2018-07-31 07:02:25 -07:00
Anuken
fe31c404ff
Merge pull request #162 from Predator127/patch-3 
Huehue
 2018-07-31 07:02:16 -07:00
toushangyouxiang
5cac949ea8 fix translation 2018-07-31 21:02:25 +08:00
toushangyouxiang
a35e897194 translate fix 2018-07-31 21:01:29 +08:00
toushangyouxiang
8e92edeae1 add bundle_zh_CN.properties 2018-07-31 14:25:32 +08:00
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
ddac5cbfbc Added unit type descriptions / Changed blast drill sprite 2018-07-30 21:20:00 -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
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
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
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
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
c832a7b93f Full command center implementation 2018-07-26 17:51:25 -04:00
Anuken
2a6ee6d65b Bundle cleanup 2018-07-26 14:19:58 -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
Prosta4okua
9a7ea0d28c
Update bundle_ru.properties 2018-07-26 17:40:38 +03: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
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
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
06b9d328f4 Added auto-generated cliffs for floor blocks 2018-07-20 16:06:26 -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
ac039ce7cd Fixed sector world gen / Added sector goal unlocks 2018-07-17 19:12:44 -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
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
d35f736548 Updated traditional chinese bundle / Fixed korean bundle 2018-07-14 12:14:22 -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
Gureumi
6cbb645b10
Update bundle_ko.properties 2018-07-14 08:54:55 +09: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
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
2b58bd5bd8 Optimizations 2018-07-11 12:19:21 -04:00
Anuken
cb58eb82fc Added requirement display / Text fixes / Better crash reports 2018-07-10 16:53:35 -04:00
Anuken
66b9cdf64c Conduit autotiling / Added Block.onProximityUpdate() 2018-07-10 10:14:10 -04:00
Anuken
d6969d2c74 Removed unused bundle keys 2018-07-09 11:06:15 -04:00
Anuken
b7e28a73ba Bugfixes / Added tool to re-format bundles with missing text 2018-07-09 11:02:30 -04:00
Anuken
1e8206757d Various bugfixes / Fixed persistent inventory, block crashes 2018-07-08 23:59:02 -04:00
Anuken
a0e94577fc Fixed infinite red square, glitchy shadows 2018-07-08 17:04:32 -04:00
Anuken
a2a0c2f791 Fixed startup error 2018-07-08 16:50:52 -04:00
Jaiun Lee
b712301804
Revised 2018-07-07 13:29:11 +09:00
Jaiun Lee
76ebe3ff41
Translated a few parts 
Mostly focused on grammatical errors and inconsistency in styling. Still need multiple revisions on a full spectrum. Discord: Reaper#7917
 2018-07-07 13:24:00 +09:00
Anuken
d988bb1821 Massive amount of bugfixes / Multi-liquid support / Broken build 2018-07-06 23:24:14 -04:00
Anuken
b6531efe08 Merge remote-tracking branch 'origin/4.0' into 4.0 2018-07-06 09:52:26 -04:00
Anuken
2c97a4aefe Fixed importing saves / File chooser bad size 2018-07-06 09:52:18 -04:00
Anuken
6dd2eec1b6
Merge pull request #131 from Lorex/master 
Add Traditional Chinese support
 2018-07-05 18:56:12 -04:00
Anuken
df13436688
Merge pull request #135 from cloud9350/patch-1 
Update language file for game beta version
 2018-07-05 18:54:27 -04:00
Anuken
8c6cda0d97 Fixed pathfinding using water / Fixed mech factories moving too fast 2018-07-05 13:38:42 -04:00
Anuken
b9ef88951e Massive amount of bugfixes, too many to list in commit log 2018-07-05 12:05:53 -04:00
Gureumi
14fe35bba0
Update bundle_ko.properties 2018-07-05 22:21:12 +09:00
Anuken
4a32706c5a Misc bugfixes / Unified build/break block system 2018-07-04 23:52:21 -04:00
Anuken
76d0285e3f Added freebuild / Power system fix / Net packet pool fix / Crash fixes 2018-07-04 11:38:59 -04:00
Anuken
60deb9205b uCore update / Kick packet priority / Custom client lock / Net fixes 2018-07-03 19:48:29 -04:00
Anuken
359a392cca Fixed various bugs and crashes 2018-07-03 15:53:06 -04:00
Anuken
04dcc262ee Portrait alignment fixes 2018-07-02 16:01:58 -04:00
Anuken
e3bee43163 Portrait mode support / Mobile fixes 2018-07-02 15:49:01 -04:00
Anuken
cf0a25fdfc Mobile placement guide / Bugfixes / Switched mobile test to arg 2018-07-02 13:06:52 -04:00
Anuken
e9436426b7 Gradle update / Block inventory improved / Crash fixes 2018-07-02 11:04:24 -04:00
Anuken
37ba95f8b3 Disabled mobile debug / Added no-core error message 2018-07-01 18:15:51 -04:00
Anuken
deadcd5339 Level selection improvements 2018-07-01 17:58:19 -04:00
Anuken
95d01f0ef5 Unlockable cleanup / Added javelin ship / Mobile fixes 2018-07-01 15:44:56 -04:00
Anuken
02b8e34242 Crash fixes / New ammo types / New turrets / Missiles added 2018-07-01 14:36:16 -04:00
Anuken
b2c99fd0fd Power transfer algo fix / Battery link fix / Fireball fix / 'and' 2018-06-30 23:59:38 -04:00
Anuken
cc5910f997 Added massive amount of partially-unfinished content to recipe menu 2018-06-30 20:59:05 -04:00
Anuken
c0a649ffcb Added item names and descriptions, better unlock menu 2018-06-30 00:09:16 -04:00
Anuken
bebc1a22f3 Added content unlock menu 2018-06-29 19:47:47 -04:00
Anuken
ab82faf7ba Implemented scalable snapshot sizes 2018-06-28 20:49:12 -04:00
Anuken
5ec495987e Un-broke editor block icons 2018-06-28 13:25:29 -04:00
Anuken
66c9fd8431 Added descriptions for some transportation blocks, fixed wrapping 2018-06-28 12:00:30 -04:00
Anuken
576af67587 Fixed crude turret icons 2018-06-28 11:50:50 -04:00
Anuken
cad44cf379 Added warning text on first startup, tutorial stub text, desc fixes 2018-06-28 10:11:25 -04:00
Anuken
ff07e99e39 Added more detailed drill tier lists 2018-06-27 21:53:52 -04:00
Anuken
18b137a1a6 New block stat system, names for all current block recipes 2018-06-27 21:29:57 -04:00
Anuken
6364b9e06b Implemented new spawnlist 2018-06-27 13:54:50 -04:00
Anuken
c89123b18a Unit weapon rework, titan and bomber enemies added, various fixes 2018-06-26 22:48:18 -04:00
Anuken
20b3bb8f13 Mech palette change, delta mech implementation 2018-06-26 16:01:40 -04:00
Anuken
a6ca84308e Added phaseweaver to recipe list 2018-06-26 14:50:12 -04:00
Anuken
a71f3f55b0 Removed unnecessary language file entries 2018-06-26 14:21:03 -04:00
Anuken
24ac823f06 Added new recipes, fixed conveyor bug 2018-06-26 13:54:06 -04:00
Anuken
e407ba3ad3 Fully implemented dart ship factory 2018-06-26 12:44:40 -04:00
Anuken
7a049d64d8 Many various bugfixes, more aggressive memory optimization 2018-06-26 11:15:23 -04:00
Anuken
91501d39ee Balancing, fixed drone AI, fixed placement, fixed stacking effects 2018-06-25 22:47:18 -04:00
Anuken
92a748a762 Nerfed drone mined speed, new ore sprite packing 2018-06-25 15:05:42 -04:00
Anuken
89ddbfc83d Added turbine generator to recipe list 2018-06-25 12:54:03 -04:00
Anuken
ca10ab0274 Increased fog view range, added tile fog discovery 2018-06-24 16:20:42 -04:00
Anuken
41e611d7db Improved fog of war, added minimap display 2018-06-24 14:42:45 -04:00
Anuken
77a63a39ad Added terrible fog-of-war 2018-06-24 00:09:00 -04:00
Anuken
8f2aae6065 Added unit death scorch effects, more bugfixes 2018-06-23 12:30:54 -04:00
Anuken
f9947d2e53 Improved world generation 2018-06-23 10:36:47 -04:00
Anuken
98cfb4d5ed New block color and ore system 2018-06-22 22:48:00 -04:00
Anuken
74878b5cb1 Loads of bugfixes, gameplay tweaks 2018-06-22 19:14:50 -04:00
Anuken
c24eb231ab Added core miner drone, massive amount of balancing/setup 2018-06-22 15:07:48 -04:00
Anuken
f7dbe807e4 Added unit drops, boosting 2018-06-21 15:58:37 -04:00
Anuken
13bb78ffa0 Added new conveyor animation 2018-06-21 12:41:33 -04:00
Anuken
8c194398a9 Added deselection, fixed pump placement and junction skipping 2018-06-21 10:20:37 -04:00
Anuken
3c3147d665 Implemented flying for desktop, new ship bodies 2018-06-19 15:38:09 -04:00
Anuken
23f3f68767 Implemented basic mech factories 2018-06-19 14:23:59 -04:00
Anuken
6cfd1a1ef6 Improved texture gen system, mech icon generation 2018-06-18 23:05:31 -04:00
Gureumi
d3eb9c9d99
Update bundle_ko.properties 2018-06-19 10:18:32 +09:00
Gureumi
a0ef3a0e44
fix fatal language translate (bundle ko) 
fix no show server version + host user name on list
 2018-06-19 10:13:07 +09:00
Anuken
80d0a1555a Added phasewalls 2018-06-18 14:37:50 -04:00
Anuken
ee2cba89d5 New generators, projectors, status system, sprites renamed 2018-06-18 14:27:50 -04:00
Anuken
84d80525fa Duplicate ID check, hasItems cleanup, web host message, projector start 2018-06-17 23:19:58 -04:00
Anuken
4d9fab6cf2 Added all new stat definitions to bundle 2018-06-17 10:25:10 -04:00
Anuken
e1cdf80b17 Changed teleporter name, fixed some bugs 2018-06-16 21:55:38 -04:00
Anuken
1a8cd2e24c Added reconstructor blocks 2018-06-16 19:41:54 -04:00
Anuken
6c620182ea Implemented mass drivers 2018-06-16 14:34:11 -04:00
Anuken
eb94a4ee14 Added deflector walls 2018-06-15 21:52:02 -04:00
Anuken
09ebb7a01c Added entries for all new smelters 2018-06-15 18:47:53 -04:00
Anuken
11d2ada6b3 Added texture generation system 2018-06-15 18:06:05 -04:00
Anuken
ffbb6bb40b Sprite reorganization, new power and tier-based pumps 2018-06-15 15:53:43 -04:00
Anuken
fab3704dbd Moved over Streamable inner classes, added test map 2018-06-14 17:11:38 -04:00
Anuken
4ca9a26bdd Added name validation 2018-06-13 11:38:12 -04:00
Anuken
9abbd8c158 Implemented slopes 2018-06-12 11:36:55 -04:00
Anuken
4b093812bc Added elevation tool 2018-06-12 10:58:07 -04:00
Anuken
e36a666542 Implemented elevation in-game with sprites 2018-06-11 21:08:15 -04:00
Anuken
b609b5909b Implemented elevation in editor and mechanically in-game 2018-06-11 15:18:25 -04:00
Lorex
2e210e7adc Add Traditional Chinese support 2018-06-09 16:15:17 +08:00
Anuken
ccb97e34d5 Moved many block files; work on annotation processor 2018-06-06 14:51:25 -04:00
Anuken
917e2e40fb Memory optimizations, multithreading fixes, uCore updated 2018-06-05 14:03:08 -04:00
Anuken
3202d62a92 Further targeting improvements for AI 2018-06-03 20:03:53 -04:00
Anuken
9555b10b97 Bugfixes, cleanup, optimization 2018-06-02 21:45:07 -04:00
Anuken
ae6b4211b9 Added mining 2018-06-02 11:13:07 -04:00
Anuken
3fe7e4e8da mess cleanup 2018-06-02 00:47:22 -04:00
Anuken
5b65c2e27e Fixed MapIO not reading map stream fully 2018-06-02 00:19:31 -04:00
Anuken
1bc4b16d38 Added map import button 2018-06-01 14:45:55 -04:00
Anuken
c79c23899f
Merge branch 'master' into feature-blocklogsandrollback 2018-06-01 11:21:34 -06:00
Anuken
a141df434c Merge branch 'master' of https://github.com/Anuken/Mindustry into 4.0 
# Conflicts:
#	build.gradle
#	core/src/io/anuke/mindustry/Vars.java
#	core/src/io/anuke/mindustry/core/Control.java
#	core/src/io/anuke/mindustry/core/Platform.java
#	core/src/io/anuke/mindustry/mapeditor/MapEditorDialog.java
#	core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java
#	core/src/io/anuke/mindustry/ui/fragments/MenuFragment.java
#	desktop/src/io/anuke/mindustry/desktop/DesktopPlatform.java
 2018-05-31 17:00:47 -04:00
Anuken
13b0c8880d Implemented block breaking on Android 2018-05-31 16:27:30 -04:00
Anuken
24e7d755eb Added respawn animation on game start 2018-05-31 11:48:07 -04:00
Anuken
e534a6b7fc Merge remote-tracking branch 'origin/4.0' into 4.0 2018-05-31 11:41:38 -04:00
Anuken
277d75016c Updated uCore, added new respawn mechanics 2018-05-31 11:41:31 -04:00
Gureumi
8f283b2226
Update bundle_ko.properties 
Early update language file!
may be?
 2018-05-31 20:53:38 +09:00
Anuken
fae7bfa8c5 Dynamic layout for unlocking blocks 2018-05-30 22:41:52 -04:00
Anuken
e9e7d2e289 Place menu scrolling, fixed some settings menu bugs 2018-05-30 18:32:01 -04:00
Anuken
9d05cfba36 Implemented desktop line placement 2018-05-30 12:40:51 -04:00
Anuken
1cf91c0ce3 Added rotation to Android placement 2018-05-29 23:18:31 -04:00
Anuken
0f09a0b152 New shaders, remake of Android placement partially done 2018-05-29 22:03:43 -04:00
Anuken
2bf7d06a91 Scrapped current place menu 2018-05-28 16:23:23 -04:00
Anuken
857f36e01a Re-definition of all ammo and new turrets 2018-05-28 12:28:50 -04:00