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
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
3bf72a1af6 Forced hovering while on block 2018-08-21 17:28:35 -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
Anuken
dbb164f4be Increased mech damage 2018-08-21 14:21:00 -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
0003a58210 Added land effect / Cleanup 2018-08-21 13:25:04 -04:00
Anuken
34f2704dc7 Added ground mech flight 2018-08-21 12:22:49 -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
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