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

1790 Commits

Author SHA1 Message Date
Anuken
25051980ce Fixed category bundle properties missing 2018-08-17 14:51:18 -04:00
Anuken
25bd8a7eaa Fixed sector name not being displayed in saves 2018-08-17 13:02:53 -04:00
Anuken
c92e8161a1
Merge pull request #190 from Prosta4okua/patch-21 
[Complete] bundle_ru.properties
 2018-08-17 11:33:29 -04:00
Anuken
258555c990 Merge remote-tracking branch 'origin/master' 2018-08-17 11:32:19 -04:00
Anuken
0f7799422e Crashes fixed 2018-08-17 11:32:12 -04:00
Anuken
177b565d7c
Merge pull request #173 from Gab351/patch-1 
Translate l227 to l239
 2018-08-17 10:38:24 -04:00
Prosta4okua
a62b336b6c
Update bundle_ru.properties 2018-08-17 12:59:51 +03:00
Prosta4okua
3ea61c8b3a
Update bundle_ru.properties 2018-08-17 12:02:44 +03:00
Prosta4okua
4c57f9f902
Update bundle_ru.properties 2018-08-17 10:48:29 +03:00
Anuken
020c6388c2 Block renaming 2018-08-16 18:38:04 -04:00
Anuken
53d35e8c77 Bundles updated / Fixed some localization bugs 2018-08-16 17:43:43 -04:00
Anuken
a786167b04 Reduced health flash 2018-08-16 17:38:16 -04:00
Anuken
1699ab48e8 Added alternate health bar on all units 2018-08-16 17:07:20 -04:00
Leone25
b15c04a532
Update bundle_ita.properties 2018-08-16 21:10:04 +02:00
Anuken
20d3740e75 Branch created 2018-08-16 11:46:34 -04:00
Anuken
80d57f8c0c Comma fix 2018-08-16 11:25:27 -04:00
Anuken
1de367e89c Full chat revert / Crash fixes 2018-08-16 10:09:22 -04:00
Anuken
4f72011cf7 Fixed markup crash / setsector command fixed / Drone crash fixed 2018-08-15 21:00:40 -04:00
Anuken
c569232e74 Fixed multiblocks not accepting items 2018-08-15 19:38:13 -04:00
Anuken
14c526d0c4 Power distribution fix 2018-08-15 18:41:21 -04:00
Anuken
5c4ac6b702 Fixed major issue with Vector2.ZERO mutation 2018-08-15 18:37:20 -04:00
Anuken
d58cc18136 Fixed block targeting bug 2018-08-15 18:18:57 -04:00
Anuken
d4d9d59fe4 Server sector commands / World data compression / Snapshot sent w/ world 2018-08-15 17:25:19 -04:00
Anuken
8dbd0a6130 Fixed drones repairing incorrect blocks 2018-08-15 16:28:00 -04:00
Anuken
3746344cba Crash fixes 2018-08-15 16:26:08 -04:00
Anuken
d07fd1bbfe Improved build sync 2018-08-15 15:16:56 -04:00
Anuken
02f95c0ed4 Merge remote-tracking branch 'origin/master' 2018-08-15 14:16:42 -04:00
Anuken
c98fcbd795 Turrets target blocks / Added core no-build radius 2018-08-15 14:13:50 -04:00
Anuken
d071877963
Merge pull request #186 from Leone25/patch-1 
Big update for italian bundle
 2018-08-15 13:12:18 -04:00
Anuken
0267cb4006 Conduit sprites improved / Fixed incorrect proximity update 2018-08-15 13:11:55 -04:00
Leone25
bf571e595c
Update bundle_ita.properties 2018-08-15 19:05:18 +02:00
Anuken
c0cad70212 Merge remote-tracking branch 'origin/master' 2018-08-15 10:49:05 -04:00
Anuken
7bd6dbb4b4 Partial korean font PR revert / Crash fixes 2018-08-15 10:48:19 -04:00
Prosta4okua
e154b5179d
Update bundle_ru.properties 2018-08-15 08:27:26 +03:00
Anuken
52110d6008 ok 2018-08-14 19:30:05 -04:00
Anuken
103b08fd1d Added build progress sync 2018-08-14 18:56:42 -04:00
Anuken
cb09d10e7f Merge remote-tracking branch 'origin/master' 2018-08-14 18:51:13 -04:00
Anuken
a041c1e60d Synced whole place queue / Fixed player flash desync 2018-08-14 18:51:06 -04:00
Anuken
586b4cf4bd
Merge pull request #183 from cloud9350/master 
Add korean chat fonts + fix typos
 2018-08-14 18:32:52 -04:00
Leone25
d0ff149cca
Update bundle_ita.properties 2018-08-14 21:07:39 +02:00
Anuken
f8ddc8325c Fixed puddle/IO crash / crafter storage / player NaN position / red tint 2018-08-14 12:24:04 -04:00
Anuken
59ec09e82c Crash fixes / Resource-steal fixed / No-build while shooting fixed 2018-08-14 12:16:21 -04:00
Anuken
2ae5c96690 Merge remote-tracking branch 'origin/master' 2018-08-14 10:42:09 -04:00
Anuken
fda9e6bb9c Various crashes fixed 2018-08-14 10:41:54 -04:00
Anuken
29bcb8e07c Removed bars 2018-08-14 10:29:45 -04:00
Leone25
b70de81c2d
Update bundle_ita.properties 2018-08-14 14:41:38 +02:00
Gureumi
5e89b2568f Add korean chat fonts + fix typos 2018-08-14 15:59:07 +09:00
Leone25
fefc734bfa
Update bundle_ita.properties 2018-08-12 22:24:10 +02:00
Prosta4okua
7f8735842c
Update bundle_ru.properties 2018-08-12 22:28:23 +03:00
Prosta4okua
a226983470
Update bundle_ru.properties 2018-08-12 19:19:07 +03:00
Prosta4okua
28526d0a12
Update bundle_ru.properties 2018-08-12 18:54:51 +03:00
Prosta4okua
913e005bae
Update bundle_ru.properties 2018-08-12 10:44:56 +03:00
Prosta4okua
7bd9fd5bae
Update bundle_ru.properties 2018-08-12 00:12:55 +03:00
Anuken
8986b89d67 Removed unit ammo 2018-08-10 10:45:37 -04:00
Anuken
ef936214f0
Merge pull request #180 from Prosta4okua/patch-17 
[Complete]Update bundle_uk_UA.properties
 2018-08-10 10:20:43 -04:00
Prosta4okua
ecda4d74ab
Update bundle_uk_UA.properties 2018-08-10 16:12:44 +03:00
Prosta4okua
31124037b5
Update bundle_uk_UA.properties 2018-08-10 16:07:46 +03:00
Prosta4okua
aaf95e0756
Update bundle_uk_UA.properties 2018-08-10 16:06:01 +03:00
Gureumi
804e311875 Update 2018-08-10 19:21:46 +09:00
Anuken
61ad9bc47d Merge remote-tracking branch 'origin/master' 2018-08-09 22:20:52 -04:00
Anuken
2b23b7876a Minor bugfix 2018-08-09 22:20:46 -04:00
Anuken
547d334f43
Merge pull request #178 from Leone25/patch-1 
update italian boundle_ita
 2018-08-09 19:29:34 -04:00
Leone25
7432dc115e
Update bundle_ita.properties 2018-08-10 00:48:20 +02:00
Prosta4okua
0a8ff0cde7
Update bundle_ru.properties 2018-08-10 00:59:27 +03:00
Prosta4okua
bd5f44030e
Update bundle_ru.properties 2018-08-10 00:53:41 +03:00
Anuken
79abb86262 Merge remote-tracking branch 'origin/master' 2018-08-09 17:45:09 -04:00
Anuken
fe6f98ec5a Minor bugfixes / Added block names to bundle/ Autogen ore names 2018-08-09 17:44:52 -04:00
Gureumi
8328b11f6b
Update. 2018-08-09 19:54:09 +09:00
Anuken
b7842014c1 Fixed minor autotile bug 2018-08-08 22:29:56 -04:00
Anuken
a804053904 Typo fix / Biomatter compressor buffed 2018-08-08 21:10:57 -04:00
Anuken
2aee72b47b Improved host command 2018-08-08 20:57:24 -04:00
Anuken
0cb8c600b7 Merge remote-tracking branch 'origin/master' 2018-08-08 20:53:02 -04:00
Anuken
aa5348f37e Auto-play server sectors / Difficulty decrease / Improved d/c messages 2018-08-08 20:52:51 -04:00
Anuken
0736574a57
Merge pull request #174 from Prosta4okua/patch-13 
[Сomlete]Update bundle_ru.properties
 2018-08-08 20:07:23 -04:00
Anuken
d56365ce63
Merge pull request #175 from CinExPL/patch-1 
Update bundle_pl.properties
 2018-08-08 20:07:14 -04:00
Prosta4okua
c82d2f856a
Update bundle_ru.properties 2018-08-09 00:02:22 +03:00
Prosta4okua
8432677826
Update bundle_ru.properties 2018-08-08 23:58:41 +03:00
Prosta4okua
0c0c6e5470
Update bundle_ru.properties 2018-08-08 23:56:42 +03:00
Anuken
57019b6e20 Fixed oil extractor desync / Buffed thermal genenerator / Typo fix 2018-08-08 16:00:33 -04:00
CinExPL
12ab2249b4
Update bundle_pl.properties 2018-08-08 21:10:42 +02:00
Anuken
f8def04653 Overall difficulty decrease / Crash fix / Server fillitems command 2018-08-08 15:02:51 -04:00
Anuken
91552a3a2b Various bugfixes 2018-08-08 12:22:47 -04:00
Anuken
4e3204bc6d All known crashes fixed 2018-08-08 11:18:30 -04:00
Anuken
a94998bd02 Merge remote-tracking branch 'origin/master' 2018-08-08 10:43:09 -04:00
Anuken
81c78eafa6 Biomass compressor fix / Crash fix / Removed spawners in waves 2018-08-08 10:43:03 -04:00
Prosta4okua
273523480f
Update bundle_ru.properties 2018-08-08 08:34:44 +03:00
Anuken
b27fefae88 Misc fixes 2018-08-08 01:09:57 -04:00
Anuken
aa00a1b8d1 Minor save-time fix 2018-08-07 20:16:50 -04:00
Anuken
ba62e0eefc Fixed playtime not resetting on save exit 2018-08-07 19:46:05 -04:00
Anuken
cb16c75e11 Minor bundle fixes / Web build fixed 2018-08-07 19:36:56 -04:00
Anuken
3efed0ace3 Added sector loc display 2018-08-07 19:04:58 -04:00
Anuken
879fb8194f Further nerfed AI 2018-08-07 19:01:23 -04:00
Anuken
049dd89470 Fixed drone spam 2018-08-07 18:49:43 -04:00
Anuken
1f59d4354a Fixed retreat command, more pathfinding 2018-08-07 18:26:16 -04:00
Anuken
8dea45d9d5 More pathfinding fixes 2018-08-07 18:19:02 -04:00
Anuken
21ba6e257c Added indicator when core is under attack 2018-08-07 17:01:17 -04:00
Anuken
18ebda01a4 Drill balancing / More starting resources 2018-08-07 16:13:37 -04:00
Leone25
3acb843109
Update bundle_ita.properties 2018-08-07 21:48:42 +02:00
Leone25
1768aea66f
Update bundle_ita.properties 2018-08-07 20:54:40 +02:00
Anuken
4b61f273d5 Targeting fixes / command center fixes 2018-08-07 11:59:16 -04:00
Anuken
a1dbbbdafc Crash fixes / 2x2 drills 2018-08-07 11:40:25 -04:00
Anuken
dcb840f290 Many bugfixes / Dagger unit buffed / Build times increased 2018-08-07 11:17:32 -04:00
Anuken
e6c4c66199 All drill costs decreased / Fixed specific sector save errors 2018-08-06 23:32:43 -04:00
Anuken
b76cd558aa Added difficulty grace period scaling 2018-08-06 22:58:22 -04:00
Anuken
85b077b5c5 Additional recipe balancing 2018-08-06 22:03:25 -04:00
Anuken
c34d6e6606 Improved targeting / Balancing / Monsoon nerf 2018-08-06 19:17:42 -04:00
Anuken
a5fd0aebe6 Fixed armageddon / Removed idle command / Balancing 2018-08-06 19:04:07 -04:00
Anuken
aaec04d04a Balancing / Made pads spawn infinite units 2018-08-06 16:58:44 -04:00
Leone25
b4272e0387
Update bundle_ita.properties 2018-08-06 20:44:09 +02:00
Anuken
77f9d6cb1d Grace period increased / Even more starting resources / Pulverizer buff 2018-08-06 12:52:29 -04:00
Anuken
aaa82b34e4 Difficulty display / More starting resources / Recipe tweaks 2018-08-06 12:42:34 -04:00
Anuken
1f8918c773 Added starter items based on difficulty 2018-08-06 12:22:55 -04:00
Anuken
80001246ef Added sector wave difficulty / ita bundle updated 2018-08-06 11:19:44 -04:00
Anuken
c7c7cfde74
Merge branch 'master' into patch-2 2018-08-06 11:17:20 -04:00
Anuken
dcc29c0c48 Fixed extremely suicidal enemies / Conveyor tile fixes 2018-08-06 10:54:56 -04:00
Anuken
635e299464 Tweaked spawn times / Liquid bridge fixes 2018-08-06 10:31:50 -04:00
Gab_351
502c4e51ae
Translate l227 to l239 2018-08-06 15:16:39 +03:00
Anuken
468e092422 Pad ammo autofill / Per-mission waves / Better core resource selection 2018-08-05 23:19:11 -04:00
Anuken
6904d4693f Merge remote-tracking branch 'origin/master' 2018-08-05 19:19:55 -04:00
Anuken
3ef7ec3be5 Bundles updated 2018-08-05 19:19:50 -04:00
Anuken
70257cbbfa
Merge pull request #170 from Prosta4okua/patch-10 
[Complete] Update bundle_ru.properties
 2018-08-05 19:18:25 -04:00
Anuken
6ef31d0ec1 Added spawner grace period 2018-08-05 19:17:46 -04:00
Prosta4okua
d3077bec58
Update bundle_ru.properties 2018-08-06 00:12:50 +03:00
Prosta4okua
a1095353fc
Update bundle_ru.properties 2018-08-06 00:11:19 +03:00
Anuken
66fab1b3df Added thermal generator / Enemy bases with spawning 2018-08-05 17:00:26 -04:00
Prosta4okua
569d6d4272
Update bundle_ru.properties 2018-08-05 19:09:01 +03:00
Anuken
07c19ce085 Added thermal pump / Better conveyor autotile 2018-08-05 10:14:18 -04:00
Anuken
d86dd4f80b Fixed terrible spawn generation 2018-08-04 23:19:10 -04:00
Anuken
f0f89f0894 New non-clipped 8x8 turret sprites 2018-08-04 20:19:04 -04:00
Anuken
47af2e83f7 Improved structure generation 2018-08-04 16:58:31 -04:00
Anuken
8ec87872c8 Added outpost schematic system 2018-08-04 14:51:33 -04:00
Anuken
f30ea80b42 Made units self-destruct after spawner removal 2018-08-03 20:22:33 -04:00
Anuken
1dd6e66167 Added basic enemy outposts 2018-08-03 16:39:12 -04:00
Anuken
4e681b2dd1 Merge remote-tracking branch 'origin/master' 2018-08-03 12:13:39 -04:00
Anuken
58be00b3ce Exploit fixes 2018-08-03 12:13:17 -04:00
Anuken
5604ac6b6a
Merge pull request #169 from Prosta4okua/patch-9 
[COMPLETE]Update bundle_ru.properties
 2018-08-03 10:53:52 -04:00
Anuken
effdaefdf3 Added built-in sandbox map 2018-08-02 13:58:02 -04:00
Anuken
5775fad030 Fixed core generation 2018-08-02 12:00:29 -04:00
Prosta4okua
eabc6d79c3
Update bundle_ru.properties 2018-08-02 12:44:35 +03:00
Prosta4okua
5f4ca6e383
Update bundle_ru.properties 2018-08-02 11:57:11 +03:00
Anuken
c05020e28e Fixed no-wave FPS display / Fixed unit pad inventories 2018-08-01 22:14:43 -04:00
Anuken
5206079e23 Implemented sandbox mode 2018-08-01 20:13:57 -04:00
Anuken
9b01140882 Fixed merge conflicts 2018-08-01 18:44:53 -04:00
Anuken
4dae27da98 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_ru.properties
 2018-08-01 18:44:25 -04:00
Anuken
f0cab65a6d Bundles updated 2018-08-01 18:38:48 -04:00
Anuken
699a47351b
Merge pull request #168 from Prosta4okua/patch-8 
[COMPLETE]Update bundle_ru.properties
 2018-08-01 18:37:51 -04:00
Anuken
af004da699 Added mission completion dialog / Bundle fixes 2018-08-01 18:31:44 -04:00
Prosta4okua
b5ad885237
Update bundle_ru.properties 2018-08-01 23:45:08 +03:00
Prosta4okua
07bd0fec70
Update bundle_ru.properties 2018-08-01 23:44:25 +03:00
Prosta4okua
318e51d736
Update bundle_ru.properties 2018-08-01 23:43:18 +03:00
Anuken
ae90db50fe Added monsoon pad / Renamed factories to pads 2018-08-01 16:18:13 -04:00
Prosta4okua
64772c195e
Update bundle_ru.properties 2018-08-01 21:17:23 +03:00
Prosta4okua
05ead63bdc
Update bundle_ru.properties 2018-08-01 21:16:55 +03:00
Prosta4okua
6f5c64420d
Update bundle_ru.properties 2018-08-01 20:59:45 +03:00
Prosta4okua
d9d9a00a24
Update bundle_ru.properties 2018-08-01 20:53:01 +03: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
Anuken
b481b784bb
Merge pull request #166 from Predator127/patch-4 
Fixed PT-BR
 2018-07-31 21:56:58 -04:00
Anuken
e3d16418a0 Added island around core generation 2018-07-31 21:53:40 -04:00
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
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