mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-04-06 14:11:05 -07:00
Code Issues Projects Releases Wiki Activity
9277 commits 5 branches 183 tags 2.3 GiB
Commit graph

9277 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anuken
7d12e18b98 Merge remote-tracking branch 'origin/master' 2018-11-17 13:04:39 -05:00
Anuken
de6bca424f Re-added hacky power graph fix 2018-11-17 13:04:34 -05:00
Milinai
03268a5575 Update ServerControl.java (#339) 
* Update ServerControl.java

Hopefully made core fill for teams.

* Fixed compile errors and incorrect team handling
 2018-11-17 12:57:10 -05:00
Sonnicon
1251680a1c Fixed BlocksFragment categories row limit (#340) 2018-11-17 12:56:59 -05:00
Anuken
f8d55ba837 Better scaling algorithm 2018-11-17 12:51:06 -05:00
William So
cd0e49914b Complete most of the Chinese translations (#338) 
* Update some Chinese translations

* Translate control guides

* Translate mission text, server text, and others

* Translate generic text

* Translate a lot of short strings

* Translate a bunch of mech strings

* Translate rest of the strings except mainly the descriptions

The descriptions will probably take 3 more days to translate. I will stop here now.

I will translate the rest later.
 2018-11-17 12:36:31 -05:00
beito
700e845727 Update Japanese translations (#337) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations

* Update Japanese

* Update Japanese
 2018-11-17 12:26:57 -05:00
Anuken
bab8120814 Crash reporting fixes 2018-11-17 12:25:38 -05:00
Anuken
c6f1f19866 Removed shadow sprites 2018-11-17 11:33:56 -05:00
Anuken
745592f507 Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-17 11:24:37 -05:00
Anuken
afec65eb56 New mobile text dialog / Cleanup / Minimap fix / Collision optimization 2018-11-17 11:13:59 -05:00
Anuken
d6661da0a7 Syncing enemy display 2018-11-17 00:04:11 -05:00
Anuken
dcc4732748 Updated to libGDX 1.9.9 2018-11-16 23:36:11 -05:00
Anuken
6a5bf08d55 Implemented local server configs 2018-11-16 22:28:27 -05:00
Anuken
d52f5e6e03 Shadow tweaks 2018-11-16 21:33:10 -05:00
Anuken
eb62356313 Merge remote-tracking branch 'origin/rendering-optimizations' into rendering-optimizations 2018-11-16 21:20:08 -05:00
Anuken
919dc248e3 Less terrible shadows 2018-11-16 21:20:03 -05:00
Anuken
ca5db2bff8 Fixed bugs with waiting for players, world border 2018-11-16 18:17:24 -05:00
Anuken
658698ed2f Merge remote-tracking branch 'origin/master' 2018-11-16 17:28:47 -05:00
Anuken
7f391dacbd Fixed low-FPS movement getting broken 2018-11-16 17:28:42 -05:00
beito123
09598e0ced
Update Japanese 2018-11-16 19:39:16 +09:00
beito123
6af2696f6a
Update Japanese 2018-11-16 19:01:05 +09:00
beito123
69dac77932
Merge remote-tracking branch 'fork_master/master' 2018-11-16 18:44:14 +09:00
Timmeey86
90e0bf95d1 Negative power values will be fixed by reloading the map (#335) 2018-11-15 19:02:17 -05:00
Anuken
930bfb26f4 Merge remote-tracking branch 'origin/master' 2018-11-15 12:40:29 -05:00
Anuken
7e788f212a Additional fixes 2018-11-15 12:38:36 -05:00
Anuken
8f99530795 Fix for off-screen players and laggy interpolation 2018-11-15 12:37:07 -05:00
VizardAlpha
434af4b998 Updates bundle_fr_BE.properties (#333) 
* Updates bundle_fr_BE.properties

* Updates

* last update
 2018-11-15 10:50:21 -05:00
Anuken
a011728cc9 Build shader update 2018-11-15 10:01:03 -05:00
Anuken
e584139b6d Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-15 09:56:09 -05:00
Anuken
a7c8526f3e Merge remote-tracking branch 'origin/master' 2018-11-14 23:46:37 -05:00
Anuken
459256e83a Slower unloader 2018-11-14 23:46:33 -05:00
Anuken
21f3f52c7b Fixed minimap / Improved ore shadows 2018-11-14 18:15:47 -05:00
Anuken
568e43cf3d Script fixes, padding improvements 2018-11-14 17:14:22 -05:00
Anuken
e004e540d7 Correct tile edges 2018-11-14 17:05:51 -05:00
Anuken
cac6172344 Incomplete point shaders 2018-11-14 16:28:59 -05:00
beito
8dbfb87246 Add Japanese translations (#332) 
* Add new japanese translation

It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.

* Update Japanese translation

Applies commit 7a51693. and small changes.

* Upadte Japanese translations
 2018-11-14 14:12:41 -05:00
beito123
2764e0e5fa
Upadte Japanese translations 2018-11-15 01:42:11 +09:00
beito123
fa5cdc3afa
Update Japanese translation 
Applies commit 7a51693. and small changes.
 2018-11-15 01:07:39 +09:00
Anuken
d8cbc7ddd8 "point shader" 2018-11-14 10:39:43 -05:00
beito123
8dae5ec47a
Add new japanese translation 
It translated on commit 66810c8.
so it don't apply changes from commit 17e0489.
 2018-11-15 00:39:37 +09:00
Anuken
bdf3a2dfe8 Merge remote-tracking branch 'origin/rendering-optimizations' into rendering-optimizations 2018-11-14 10:12:12 -05:00
Anuken
693b82e47d Merge branch 'master' of https://github.com/Anuken/Mindustry into rendering-optimizations 2018-11-14 10:12:12 -05:00
Anuken
888be0fd5e Completely cleaned FloorRenderer class 2018-11-14 10:12:03 -05:00
Anuken
9f97ed331b Various bugfixes / Updated uCore 2018-11-14 09:55:54 -05:00
LQ
e8ea2af298 add drawRequest for mobile input (#330) 2018-11-14 09:49:27 -05:00
Anuken
785c2e36c6 Fixed some things 2018-11-13 23:24:59 -05:00
Anuken
ee043e67a4 Probable crash fix 2018-11-13 22:43:10 -05:00
Anuken
d824b41bbb Added replacement sprites 2018-11-13 22:11:29 -05:00
Anuken
a9df64f861 Semi-usable sprites 2018-11-13 22:10:41 -05:00