mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-23 04:59:19 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,794 Commits 4 Branches 160 Tags 2.3 GiB
17432d1f94
Commit Graph

2421 Commits

Author SHA1 Message Date
Anuken
6bfd57097f Cleanup of TODOs 2018-11-24 08:21:22 -05:00
Anuken
6f5df6a671 Added list of contributors to credits 2018-11-23 14:30:58 -05:00
Anuken
1baf3190cd Host dialog name selection 2018-11-23 13:35:16 -05:00
Anuken
66c29c49e5 Wave spawner moved / Bundle tweaks / Blank name 2018-11-23 13:32:17 -05:00
Anuken
e5d6740555 Additional tests, inventory fixes 2018-11-23 12:40:36 -05:00
Anuken
f0aa8d73ea Merge remote-tracking branch 'origin/master' 2018-11-23 09:23:48 -05:00
Anuken
8a0761cad8 Bugfixes 2018-11-23 09:23:42 -05:00
키에르
322d76b713 Update bundle_ko.properties (#354) 
* Update bundle_ko.properties

* Update bundle_ko.properties
 2018-11-23 08:41:55 -05:00
Anuken
4f56bf3c3e Consume icon fix / Liquid mixer fix 2018-11-23 08:32:56 -05:00
Anuken
24c72650fb Bundles update 2018-11-22 19:10:31 -05:00
Anuken
f5959c8829 Optional display section 2018-11-22 19:09:51 -05:00
Anuken
7621ebed42 Merge remote-tracking branch 'origin/master' 2018-11-22 08:39:15 -05:00
Anuken
5447c71790 Removed junction item voiding 2018-11-22 08:39:05 -05:00
Anuken
c5241eaaf6 Encoding tests 2018-11-21 23:12:27 -05:00
Anuken
9266b55ddf Fixed charset issues 2018-11-21 23:05:33 -05:00
VizardAlpha
1bc1f66613 Updates bundle_fr_BE.properties (#351) 
I had not seen the last line to translate.
 2018-11-21 22:02:28 -05:00
Anuken
d498ac89f2 Mining bugfix 2018-11-21 21:13:30 -05:00
Anuken
51641cc704 Merge remote-tracking branch 'origin/master' 2018-11-21 11:00:58 -05:00
Anuken
729f5ed5e4 New version format / Updated bundles / ConnectPacket encoding fix 2018-11-21 11:00:50 -05:00
VizardAlpha
03ff33acaf Updates bundle_fr_BE.properties (#350) 2018-11-21 10:00:19 -05:00
Anuken
5ced5ce253 Fixed some bugs/crashes 2018-11-20 10:00:13 -05:00
Anuken
55781e911e Merge remote-tracking branch 'origin/master' 2018-11-20 00:26:18 -05:00
Anuken
ee3c4a4124 Mass driver buff 2018-11-20 00:26:14 -05:00
키에르
6815e56e57 Update bundle_ko.properties (#346) 2018-11-19 22:56:14 -05:00
Anuken
6c744443fb Item list value fix 2018-11-19 20:52:31 -05:00
Anuken
3c37047afb Misc bugfixes 2018-11-19 17:56:26 -05:00
Anuken
f31f09d77a Visual fix 2018-11-19 16:40:33 -05:00
Anuken
de508ee68f "Legacy" unlock loading 2018-11-19 15:08:18 -05:00
Anuken
a932111040 Removed ContentUnlockSet 2018-11-19 14:38:46 -05:00
Anuken
8c437eb815 New UI 2018-11-19 14:30:40 -05:00
Anuken
1ad4815983 Added all placement controls 2018-11-19 14:20:57 -05:00
Anuken
c75cdc6d28 Placement toggle support 2018-11-19 12:27:42 -05:00
Anuken
b9fae7fb7d Bundle update 2018-11-19 10:47:18 -05:00
Anuken
e74a3da5cd Merge remote-tracking branch 'origin/master' 2018-11-19 10:20:46 -05:00
Anuken
08cf986cae Fixed destruction of broken blocks leading to neutral team block 2018-11-19 10:20:41 -05:00
Anuken
ba01ed0153 Flipped place menu 2018-11-18 23:19:39 -05:00
Anuken
19ac8bd9b2 Info menu 2018-11-18 20:50:12 -05:00
Anuken
ab79ccb02b Implemented unlocks for placement 2018-11-18 20:04:15 -05:00
Anuken
d862498516 Replaced tooltips with names 2018-11-18 15:17:19 -05:00
Prosta4okua
b09b03a427 [COMPLETE]Update bundle_ru.properties (#313) 
* 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-11-18 14:12:44 -05:00
Sonnicon
4ef2ede4cf Important comment repair. (#343) 2018-11-18 14:10:35 -05:00
Anuken
0efaa11553 2 new categories, less space used 2018-11-18 14:10:02 -05:00
LQ
ea87b958ef update zh_CN translations (#342) 
* Update bundle_zh_CN.properties

Add descriptions translate for zh_CN

* Update bundle_zh_CN.properties
 2018-11-18 09:46:13 -05:00
Anuken
ff62f075d0 New place menu 2018-11-18 00:07:25 -05:00
Anuken
348744086d Broken BlocksFragment 2018-11-17 18:30:13 -05:00
Anuken
d1d4f79973 Fixed ores appearing as 'air' 2018-11-17 18:01:08 -05:00
Anuken
2a3f7f8cb3 Bundle update 2018-11-17 17:08:31 -05:00
Anuken
7eaef11a84 Improved hover block system 2018-11-17 17:04:16 -05:00
Anuken
efe93d0117 Added tile selection view 2018-11-17 14:45:29 -05:00
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
Sonnicon
1251680a1c Fixed BlocksFragment categories row limit (#340) 2018-11-17 12:56:59 -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
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
6a5bf08d55 Implemented local server configs 2018-11-16 22:28:27 -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
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
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
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
Anuken
9f97ed331b Various bugfixes / Updated uCore 2018-11-14 09:55:54 -05:00
Anuken
ee043e67a4 Probable crash fix 2018-11-13 22:43:10 -05:00
Anuken
6c3b449f74 Merge remote-tracking branch 'origin/master' 2018-11-13 18:51:38 -05:00
Anuken
536c6a7b2c Various bugfixes 2018-11-13 18:51:34 -05:00
Baramos666
e90e0fc615 update descriptions (#325) 2018-11-13 18:15:20 -05:00
VizardAlpha
b704121dcb Minor Update bundle_fr_BE.properties (#326) 2018-11-13 18:14:31 -05:00
Anuken
5e0886d744 Compile fix 2018-11-13 15:53:01 -05:00
Anuken
f819e4829b Writing of player nick bytes 2018-11-13 15:27:50 -05:00
Anuken
8873948e9e String encoding fix 2018-11-13 15:18:50 -05:00
Anuken
a25ea14436 Removed ancient comment 2018-11-13 14:49:58 -05:00
Anuken
1a922f05c1 Fixed sectors carrying over to multiplayer 2018-11-13 12:54:33 -05:00
elmenda452
e8268b1dab Update bundle_es.properties (#327) 
There wasn't much to translate, this is just a second check.
 2018-11-13 11:07:32 -05:00
Anuken
7a516930b1 Bugfixes of various kinds 2018-11-13 09:13:53 -05:00
Anuken
92b68bdb8f Merge branch 'remove-multithreading' of https://github.com/Anuken/Mindustry 2018-11-12 11:00:09 -05:00
Timmeey86
c9777af91c Added Unlocks menu button to Escape menu on desktop (#324) 2018-11-11 13:03:15 -05:00
Anuken
2d1a97e042 Removed unnecessary synchronized() blocks 2018-11-11 11:12:54 -05:00
Anuken
ece3f96867 Fixed net errors not being displayed properly 2018-11-11 10:50:33 -05:00
Anuken
65a48b324d Removed multithreading 2018-11-11 10:32:00 -05:00
Anuken
53bf622065 Merge remote-tracking branch 'origin/master' 2018-11-10 21:26:17 -05:00
Anuken
075be18123 Fixed wave button layout 2018-11-10 21:26:11 -05:00
Timmeey86
044390b4b4 Sector -2 0 fix (#322) 
* Added a battle mission to Sector (-2,0) as otherwise no core would be spawned

* Fixed a crash which occurred during test execution...

... and could maybe occur during any startup with bad timing

* Added a new class for sector tests ...

... and added a test which makes sure that any predefined sector defines
a spawn point

* Added fix after applying test driven bugfixing
 2018-11-10 21:19:27 -05:00
Anuken
51a51833d4 iOS build fix 2018-11-09 10:18:53 -05:00
Anuken
a8cfc1ef7a Mobile input tweak 2018-11-09 08:49:23 -05:00
Anuken
1d238c8315 Crash fix 2018-11-09 08:33:43 -05:00
Anuken
4f96744ff2 Shield shader simplification 2018-11-08 23:50:03 -05:00
Anuken
e9783ecccc Possible minimap fix 2018-11-08 23:19:47 -05:00
Anuken
6342cc41ac Better lake generation 2018-11-08 22:18:34 -05:00
Anuken
4d8bbe3023 ita -> it 2018-11-08 17:40:50 -05:00
Anuken
969076f1ef Fixed sector data carry-over 2018-11-08 17:38:51 -05:00
Anuken
20032def7e Fixed player turning white before drowning on multiplayer 2018-11-08 16:30:56 -05:00
Anuken
94706460c0 Merge remote-tracking branch 'origin/master' 2018-11-08 14:53:43 -05:00
Anuken
b7506229f8 Minor bugfixes 2018-11-08 14:53:18 -05:00