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,003 Commits 4 Branches 160 Tags 2.3 GiB
6613e4ec42
Commit Graph

1689 Commits

Author SHA1 Message Date
Anuken
6613e4ec42 Generaor changes 2018-08-23 23:26:45 -04:00
Anuken
bb7e2c7cee Commit #2000 2018-08-21 19:01:35 -04:00
Anuken
69eb6469f9 Merge branch 'continuous-servers' of https://github.com/Anuken/Mindustry 2018-08-21 18:56:32 -04:00
Anuken
d2eb3be7f8 Merge remote-tracking branch 'origin/master' 2018-08-21 18:54:15 -04:00
Anuken
5aa76639d1 Changed noise octaves with non-detailed worldgen 2018-08-21 18:54:11 -04:00
Anuken
b745d88299 Player State reset / Improved messages / Round end time 2018-08-21 17:23:17 -04:00
Anuken
3aedc07ad0 Initial continuous server implementation 2018-08-21 16:37:57 -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
0ddee379ca Added mode-specific respawn time 2018-08-21 10:56:06 -04:00
Anuken
6dcbe4fabb Added phase walls 2018-08-21 10:36:42 -04:00
Anuken
5dbb9fdf3f Final tweaks, ready to merge 2018-08-21 09:45:54 -04:00
Anuken
914fa3079d Per-mode no-build radius 2018-08-20 23:47:56 -04:00
Anuken
2e958d8d8f New team system / Prototype dedicated PvP gamemode 2018-08-20 23:45:27 -04:00
Anuken
7a5e61fd2e Fixed off-color stone floor blocks 2018-08-20 22:17:34 -04:00
Anuken
6a031d8f53 Nerfed wall health 25% 2018-08-20 22:13:29 -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
Anuken
01ae8bec85 Turret sprite fixes 2018-08-20 21:30:37 -04:00
Anuken
258ab87f6b Palette swap / Blocks changed and renamed 2018-08-20 21:04:03 -04:00
Anuken
8ba2db6c58 Dense alloy / Compile errors fixed 2018-08-20 17:43:56 -04:00
Anuken
a7599e85dc Merge remote-tracking branch 'origin/master' 2018-08-20 10:21:56 -04:00
Anuken
28389d698e Fixed editor fill freeze 2018-08-20 10:21:51 -04:00
Gureumi
c47a220721 Update bundle_ko.properties (#198) 2018-08-20 09:21:13 -04:00
Anuken
69f7296baa Merge remote-tracking branch 'origin/master' 2018-08-19 22:49:39 -04:00
Anuken
855f56bb45 Crash fix 2018-08-19 22:49:35 -04:00
Anuken
a79d072aaf More copper 2018-08-19 22:47:46 -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
Anuken
9d654c1f18 Copper added, carbide removed 2018-08-19 13:34:36 -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
Anuken
360494f971 Fixed connect/disconnect message color tags 2018-08-19 10:31:25 -04:00
Anuken
81931eb536 Removed unnecessary tungsten references 2018-08-19 10:30:12 -04:00
Gureumi
a2ef11eb0f Fix 'has connected' message + Add chat font (#194) 
* Fix 'has connected' message

* Add chat font
 2018-08-19 10:29:40 -04:00
Anuken
b872252771 Removed unnecessary tungsten references 2018-08-18 23:02:10 -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
Anuken
0f173bcc5a Increased blink frequency 2018-08-18 13:10:01 -04:00
Anuken
64dbe8312e Fixed merge issues 2018-08-18 13:07:54 -04:00
Anuken
7f443c71ae Merge remote-tracking branch 'origin/master' 2018-08-18 13:06:59 -04:00
Anuken
27276c025c Merge branch 'remove-ammo' of https://github.com/Anuken/Mindustry 2018-08-18 13:06:54 -04:00
Anuken
e9d03c179c init() test 2018-08-18 12:19:20 -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
e0eb227ce5 Recipe init() method added 2018-08-17 22:49:45 -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