mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 13:09:27 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,813 Commits 4 Branches 160 Tags 2.3 GiB
6caf0fc1cc
Commit Graph

566 Commits

Author SHA1 Message Date
Prosta4okua
8b7fa3b646 [WIP]Update bundle_ru.properties (#243) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-10-18 21:56:00 -04:00
Anuken
5e5838a8c1 let me make this PAINFULLY CLEAR 2018-10-18 16:04:40 -04:00
Skybbles // L5474
0fffbc06dd Spelling correction (#252) 
*maybe you mean CLI board.*
 2018-10-18 14:35:33 -04:00
Anuken
4d360bfb73 Bugfixes 2018-10-18 09:19:29 -04:00
Anuken
6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken
f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken
8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken
81ce12a38c Added random PvP/Waves map generation 2018-10-14 13:24:32 -04:00
Anuken
f670d522bf PvP merge 2018-10-14 10:01:50 -04:00
VizardAlpha
31b39231a2 Updates bundle_fr_be.properties (#242) 2018-10-13 23:32:08 -04:00
Anuken
4eb2c1f646 PvP autohost 2018-10-13 23:30:05 -04:00
Anuken
5f89d8588d Added 'abandon sector' button 2018-10-13 23:07:57 -04:00
Anuken
0aabc09b82 Made game-overs remote events 2018-10-13 21:58:17 -04:00
Anuken
870f5caca9 PvP game over condition 2018-10-13 17:33:23 -04:00
Anuken
28b4ddfc72 PvP game over condition and message 2018-10-13 17:31:38 -04:00
Prosta4okua
13a4a26e97 Update bundle_ru.properties (#241) 2018-10-13 17:29:09 -04:00
Anuken
81c7e63994 Added 'waiting for players' message 2018-10-13 16:03:21 -04:00
Anuken
f8d0682810 Added warnings for missing enemy cores 2018-10-13 15:49:18 -04:00
Anuken
1cd8e8a097 Improved server discovery 2018-10-13 12:21:11 -04:00
Anuken
3688dde5e5 Merged mobile mechs 2018-10-13 10:52:48 -04:00
Anuken
ae6a5b2512 Made PvP a selectable mode 2018-10-13 10:50:22 -04:00
Anuken
8bda5e16cd Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	core/assets/bundles/bundle_fr.properties
 2018-10-13 08:59:15 -04:00
Anuken
d70d3d95f0 Bundles updated 2018-10-13 08:58:41 -04:00
Baramos666
554b7d2ec4 Update bundle_fr.properties (#239) 2018-10-13 08:58:04 -04:00
Baramos666
18020d64cc Update bundle_fr.properties (#234) 2018-10-11 22:58:05 -04:00
Anuken
5f1bc6c6c2 Custom spawn locations 2018-10-10 13:02:00 -04:00
Anuken
38f2f1e30a Added legacy map importer 2018-10-09 22:52:28 -04:00
Anuken
4792828da1 Missions now displayed as number / Improved mission gen 2018-10-09 09:22:06 -04:00
VizardAlpha
9566155bdb Created bundle_fr_be.properties (#233) 
For Belgian player
 2018-10-08 14:14:16 -04:00
Anuken
c1d9dee46c Added content mission / Working implementation of preset sectors 2018-10-07 19:21:53 -03:00
Anuken
fd107ab5b8 Code cleanup 2018-10-06 11:56:39 -04:00
Anuken
14e0b471d3 Mobile mechs implemented 2018-10-05 22:58:46 -04:00
Anuken
ed0df64cf9 Fixed compile errors / Refactored sector presets 2018-10-05 22:16:40 -04:00
Anuken
35bc2c9803 Sector preset class / New missions 2018-10-05 16:36:50 -04:00
Anuken
d2ce051c4a Implemented Fortress unit / Made artillery ignore air 2018-10-01 09:51:12 -04:00
Anuken
d5d90bde9a Removed mech ability key 2018-09-30 19:22:19 -04:00
Anuken
b43c542213 Auto-target configuration 2018-09-29 20:49:19 -04:00
Anuken
e7533232c0 Fixed custom game waves / Fixed Windows appdata being incorrect 2018-09-29 14:25:29 -11:00
Anuken
d062dffc13 Cleanup / Fixed unlock system in custom games 2018-09-29 02:50:21 -07:00
Jae
24decf8abc Update bundle_zh_CN.properties (#230) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties

* Added zh_CN translations

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
 2018-09-27 17:46:17 -04:00
DinoWattz
db3dac261a Update bundle_pt_BR.properties (#231) 
Fixed some words and translated some words
 2018-09-27 13:09:09 -04:00
Jae
720e1a038e French translations added (#228) 
* Added translations

* Update bundle_fr.properties

* Update bundle_fr.properties
 2018-09-26 13:42:20 -04:00
Baramos666
1753c54e88 Update bundle_fr.properties (#229) 2018-09-26 13:28:18 -04:00
Anuken
554d9b4047 Updated bundles 2018-09-25 16:41:18 -04:00
Prosta4okua
02d565ce58 [COMPLETE]Rare update bundle_ru.properties (#223) 
* Update bundle_ru.properties

Added the same thing as in bundle.properties. Also added 9 descriptions. Because of this PL, a PL from xga is old.

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-09-25 16:39:52 -04:00
Anuken
d5bb1b72b9 Merge branch 'continuous-sectors' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/assets/bundles/bundle.properties
 2018-09-24 22:57:49 -04:00
Anuken
af86564adc Final tutorial fixes 2018-09-24 22:56:48 -04:00
Anuken
5354e02b6f Finally a somewhat functional tutorial / Many bugfixes 2018-09-24 20:24:51 -04:00
Prosta4okua
4ee17a656f Update bundle.properties (#226) 2018-09-24 14:14:23 -04:00
Anuken
20732f04ff Block position starting missions 2018-09-23 23:45:35 -04:00
Anuken
8d20c46228 Basic tutorial text 2018-09-22 16:41:55 -04:00
Anuken
b77caed0ba Added sample tutorial text / Refactoring 2018-09-22 12:20:04 -04:00
Baramos666
df976f1212 Update bundle_fr.properties (#225) 2018-09-22 11:17:07 -04:00
Anuken
999dd5eb6f Better mission display / Improved tutorial item amounts 2018-09-21 23:29:17 -04:00
Anuken
a1a6a3ab81 Tutorial sector prototype / New mission display 2018-09-21 23:14:26 -04:00
Anuken
d067bbfa65 New mission classes 2018-09-21 19:36:19 -04:00
Anuken
2d25948c57 Revenant factory definition / Crash fix 2018-09-16 21:57:37 -04:00
Anuken
8946af4831 Mass renaming of blocks and units 2018-09-16 19:48:15 -04:00
Anuken
f0aca90de2 Bundle update 2018-09-16 14:19:56 -04:00
Anuken
097228066a Revenant sprite / Training mode / Mine transfer range / Drone heal buff 2018-09-16 14:05:43 -04:00
Anuken
1290d1e9d4 Balancing / Wall renaming 2018-09-13 23:04:43 -04:00
Anuken
f229f1e9fe Added LaserTurret class / Updated bundles 2018-09-13 22:33:03 -04:00
Anuken
649fc5a0e6 Bundles updated 2018-09-11 16:34:31 -04:00
Anuken
67cfa5d42f Made blocks no longer unlock in custom games 2018-09-11 16:27:45 -04:00
Prosta4okua
e8df6ed3be Nice Update bundle_uk_UA.properties. :) (#220) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-09-11 09:22:16 -04:00
Anuken
6ef2256bf2 Removed all reflection 2018-09-09 21:44:10 -04:00
xgamezs
fb9f42ff93 Update bundle_uk_UA.properties (#219) 2018-09-08 23:02:49 -04:00
Anuken
e98457c540 Fixed server build error 2018-09-08 11:57:57 -04:00
Anuken
c73c97dc7b Added arc turret 2018-09-08 11:35:29 -04:00
Anuken
7dd487ccc5 Force projector implementation 2018-09-07 23:24:55 -04:00
Anuken
2ad8f1c112 Bundles updated / Crash fix 2018-09-07 09:18:58 -04:00
Prosta4okua
df3f2ea9c1 [Complete]Russian bundle. (#208) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-09-06 19:53:31 -04:00
Anuken
1960b59629 Packer compile fix / Mapping fix 2018-09-06 19:38:19 -04:00
Anuken
484721fece Fixed game data clearing 2018-09-05 13:00:15 -04:00
Anuken
9c36026991 Data clearing / Bugfixes 2018-09-05 10:24:47 -04:00
Anuken
d4ccfa31b5 Balancing 2018-09-04 22:16:23 -04:00
xgamezs
233ea7bb4a Update bundle_ru.properties (#214) 2018-09-04 21:23:08 -04:00
Anuken
7b90544d91 Fixed player mech icon clip / Added kick confirmation 2018-09-04 17:42:56 -04:00
xgamezs
add525396f Update bundle_ru.properties (#213) 2018-09-04 14:43:35 -04:00
Anuken
26ae4edd63 Added version type 2018-09-04 12:10:48 -04:00
CrazyBearTR
bcde481304 Update of the Turkish Translation Bundle (#212) 
* Update of the Turkish Translation Bundle

Some words were wrong. Fixed in this version.

* Update bundle_tr.properties
 2018-09-03 19:38:01 -04:00
Prosta4okua
5b1341e488 [Complete]Update bundle_uk_UA.properties (#211) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-09-03 19:37:55 -04:00
CrazyBearTR
cebaa6949e Turkish language request (#210) 2018-09-03 09:55:04 -04:00
Anuken
5e29115c2e Fixed ship flight targeting / Fixed unit weapon sprite offset 2018-09-02 16:23:39 -04:00
Anuken
1d21d36253 Fixed font line height / Bundles updated / Changelog date 2018-09-02 13:49:38 -04:00
Prosta4okua
e204b89eaf Update bundle_ru.properties (#206) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-09-02 13:20:40 -04:00
Leone25
e633528a7a Update bundle_ita.properties (#205) 2018-08-31 09:24:26 -04:00
Prosta4okua
8791747453 [Complete]Update bundle_ru.properties (#202) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-30 23:52:41 -04:00
Anuken
f29673a6e3 Made desktop selection rebindable 2018-08-30 16:46:41 -04:00
Senventise
35a85860b1 Add Simplified Chinese font and update translations (#204) 
* update translation

* add simplified chinese font

* delete outdated font

* Update uiskin.json
 2018-08-29 09:38:10 -04:00
Anuken
8c6ae2576d Fuse shot implemented 2018-08-28 19:00:29 -04:00
Anuken
ac9d37d038 Core player shield / Bundles updated 2018-08-27 13:30:34 -04:00
Anuken
6323c13704 Mech descriptions / Balancing / Crash fix / Physics fix 2018-08-27 09:52:33 -04:00
Anuken
2f7f16daff Added mend projector 2018-08-26 23:03:02 -04:00
Anuken
e392c8f0e6 All reconstructors implemented / Balancing 2018-08-25 14:52:46 -04:00
Anuken
86a7f837cd Implemented halberd 2018-08-25 09:55:08 -04:00
Anuken
5e8686db77 Removed Upgrade class / Buffed units / Bugfixes 2018-08-24 09:39:02 -04:00
Anuken
ee835f6514 Merge branch 'master' of https://github.com/Anuken/Mindustry into mechs-balance-altfire 
# Conflicts:
#	core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
 2018-08-24 08:57:19 -04:00
Anuken
5de61aaed3 Unlockable mechs 2018-08-24 08:55:19 -04:00
Prosta4okua
b0103d1ce3 [Complete]Update bundle_ru.properties (#199) 
* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-21 13:27:20 -04:00
Prosta4okua
9c532047d3 [Complete]Update bundle_uk_UA.properties (#201) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-08-21 13:27:09 -04:00
Anuken
6dcbe4fabb Added phase walls 2018-08-21 10:36:42 -04:00
Anuken
dc6f01c0d3 Merge branch 'resource-rework' of https://github.com/Anuken/Mindustry 2018-08-20 22:09:57 -04:00
Anuken
1cc8cbe8a8 Bundles updated / Updated mechanical drill sprite 2018-08-20 22:09:15 -04:00
Gureumi
c47a220721 Update bundle_ko.properties (#198) 2018-08-20 09:21:13 -04:00
Leone25
0288daa39d Update bundle_ita.properties (#195) 2018-08-19 18:40:53 -04:00
Prosta4okua
3f075068a9 Update bundle_ru.properties (#196) 2018-08-19 18:40:43 -04:00
Anuken
278e7027f2 Bundles updated 2018-08-19 13:35:35 -04:00
JustYanns
279187d13b Update bundle_fr.properties [Complete] (#146) 
* Update bundle_fr.properties

Few things translated in french.
I'll do more soon !!

* Update bundle_fr.properties V2

Update with comment of Math2128

* Update bundle_fr.properties V3

Few translations fixed

* Update bundle_fr.properties V4

•1 Thorium is the same in french and in english. 
•2 Carbide and cryofluid are not translatable !!
•3 Phase matter = "matière de Phase" doesn't sound good, I think we have to let the english word.
•4 Pyratite can be translated as "pyrrhotite" is it a good idea ?

* Update bundle_fr V5

Few translations fixed

* Update bundle_fr.properties V6 [Almost complete]

The french translation is almost finished, I will release the final translation soon.

* Update bundle_fr.properties [pre-release1]

Translation almost finished,
I just have 2 problems (see in the conversation)

* Update bundle_fr.properties  [pre-release2]

Translation almost finished
I just have 2 problems (see in the conversation)

* Update bundle_fr.properties [pre-release3]

Thank you to Math2128, for having helping me ;)

* Update bundle_fr.properties  [pre-release4]

Translations of Math2128's commit added
 2018-08-19 13:34:17 -04:00
Leone25
b2c388276f Update bundle_ita.properties (#192) 2018-08-18 18:33:49 -04:00
Prosta4okua
178928f866 [Complete]Update bundle_uk_UA.properties (#188) 
* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties

* Update bundle_uk_UA.properties
 2018-08-18 13:10:57 -04:00
Prosta4okua
7e548f9969 Update bundle_ru.properties (#191) 
* Update bundle_ru.properties

* Update bundle_ru.properties
 2018-08-18 13:10:43 -04:00
Anuken
a60ce3c54c Merge branch 'master' of https://github.com/Anuken/Mindustry into resource-rework 2018-08-18 13:10:22 -04:00
Uriel
dec01c23a9 [Completed] Remaking spanish translation bundle (#187) 
* started translating all the stuff

* translated more of the original english file

* translated more parts

* almost half of the file!

* MOREgit add .!

* Update bundle_es.properties

* completed

* forgot about these ones...
 2018-08-18 08:57:42 -04:00
Anuken
20021c5b31 Fixed 1-character names being valid / Fixed collideLine with tiles 2018-08-17 20:21:49 -04:00
Anuken
f8d6797fc2 Fixed android module being necessary to compile 2018-08-17 18:05:28 -04:00
Anuken
25051980ce Fixed category bundle properties missing 2018-08-17 14:51:18 -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
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
Leone25
b15c04a532
Update bundle_ita.properties 2018-08-16 21:10:04 +02:00
Anuken
d071877963
Merge pull request #186 from Leone25/patch-1 
Big update for italian bundle
 2018-08-15 13:12:18 -04:00
Leone25
bf571e595c
Update bundle_ita.properties 2018-08-15 19:05:18 +02: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
Leone25
d0ff149cca
Update bundle_ita.properties 2018-08-14 21:07:39 +02: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
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
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