mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-22 20:48:33 +07:00
Code Issues Packages Projects Releases Wiki Activity
2,777 Commits 4 Branches 160 Tags 2.3 GiB
f474d2c834
Commit Graph

2407 Commits

Author SHA1 Message Date
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
elmenda452
58c6df3537 Update bundle_es.properties (#317) 
Translated the description of nearly everything which wasn't translated and made some changes. I don't really mind if someday these get reset.
 2018-11-08 14:46:39 -05:00
Timmeey86
235a1f36ec Prepared/Fixed translation files for crash reported in #translations (#318) 2018-11-08 14:46:12 -05:00
키에르
b53821976e Update bundle_ko.properties (#316) 
* Update bundle_ko.properties

* Fix typo
 2018-11-08 10:20:30 -05:00
Anuken
4355881fb2 Fixed save files not working 2018-11-08 09:03:42 -05:00
Anuken
cf50d558ba Fixed many various things 2018-11-07 22:37:34 -05:00
Anuken
7488dc3ebb Fixed access violation crash 2018-11-07 21:49:26 -05:00
Anuken
b449847ad1 Reverted to power system that wasn't broken 2018-11-07 20:30:02 -05:00
Anuken
9785745384 Fixed many multiplayer bugs 2018-11-07 20:24:38 -05:00
Anuken
56ffa7905e Fixed instant-win wave missions / Fixed units clipping off screen 2018-11-07 19:58:53 -05:00
Anuken
216433aa2d New alpha drone mechanics 2018-11-07 19:34:31 -05:00
Anuken
122fbbed22 Added a 'tutorial' / Bugfixes 2018-11-07 19:23:40 -05:00
Anuken
042c671bd4 Difficulty balance / Better map display / UI fixes 2018-11-07 18:51:27 -05:00
Timmeey86
38fdc11917 Adjustable core position (#307) 
* Made starting core position configurable and fixed tutorial sector core position

* Refactored classes to use a public int interface and a GridPoint2 as internal storage

* Battle missions now spawn the core at 50, 50 again

* Default player cores are now created at the first spawnpoint

* Manually fixed formatting which was not caught by auto formatter
 2018-11-07 18:14:01 -05:00
Timmeey86
2f4730a9c6 Fixed unit/second translations since (#315) 2018-11-07 18:12:01 -05:00
Anuken
3759d32c89 Improved map previews 2018-11-07 16:56:47 -05:00
Timmeey86
93c2ca8df1 Reworked and extended german translation (#314) 
* Reworked existing german translation

* Translated all block descriptions

* Replaced orange by accent highlighting
 2018-11-07 16:45:57 -05:00
Anuken
3c70681537 Merge remote-tracking branch 'origin/master' 2018-11-07 15:30:58 -05:00
Anuken
0ce08319e7 Removed desktop top menu / Rebound pause back to space 2018-11-07 15:30:42 -05:00
Timmeey86
17e0489164 Improved descriptions of Container, Vault and Mend Projector (#312) 2018-11-07 14:09:26 -05:00
Anuken
7953cc416b Fixed item bridge input / Fixed sandbox map name/desc 2018-11-07 13:50:39 -05:00
Valentin Sonin
a670ac0aea upd bundle_ru.properties (#310) 
add lines 768, 769,770
 2018-11-07 12:41:30 -05:00
elmenda452
ef30018008 Update bundle_es.properties (#311) 
Translated the entire tutorial, and a few more things.
 2018-11-07 12:41:19 -05:00
elmenda452
66810c8b75 Update bundle_es.properties (#309) 
Just translating a few things.
 2018-11-07 00:11:53 -05:00
Anuken
2bba55ebd5 Clearer nuclear reactor output 2018-11-07 00:07:41 -05:00
Anuken
b977ae4d3b Updated bundles / Unbroke wave table 2018-11-06 23:56:11 -05:00
Anuken
d4f5e854c5 Misc. cleanup of UI / Removed 'font scale' var / Removed [orange] 2018-11-06 23:47:23 -05:00
Anuken
837f621633 Merge branch 'freetype' of https://github.com/Anuken/Mindustry 2018-11-06 21:01:21 -05:00
Anuken
a73a75a7f8 Cyrillic, chinese, korean fonts 2018-11-06 20:55:18 -05:00
Anuken
17d1db913f Removed extra fonts in preparation for ttf conversion 2018-11-06 15:52:31 -05:00
Anuken
a924509e92 New font file 2018-11-06 13:09:39 -05:00
Anuken
04b4321ea1 New font 2018-11-06 12:55:13 -05:00
키에르
1f9ebc7295 Update bundle_ko.properties (#308) 2018-11-06 11:11:56 -05:00
Anuken
6d88111dfc Unbroke pathfinding 2018-11-05 21:43:26 -05:00
Anuken
184e52b4ec Removed waterlogged sectors 2018-11-05 21:04:04 -05:00
Anuken
2a3cc3d88c Fixed units moving faster at high FPS 2018-11-05 16:56:35 -05:00
Anuken
ffa1aae27c Removed shadow/world padding 2018-11-05 13:49:31 -05:00
Anuken
7cd842df19 Disabled tutorial until further notice 2018-11-05 13:09:04 -05:00
Anuken
e399e4960c Broke tutorial 2018-11-05 10:28:18 -05:00
Anuken
5c193a47eb Item image fix / Overflow/router reload fix 2018-11-05 09:02:45 -05:00
Anuken
b63c02cb10 New UI palette 2018-11-04 19:42:18 -05:00
Anuken
09418f1a5d Lakes / Fixed water placement 2018-11-04 18:52:51 -05:00
Anuken
fa4491340a More avoidance 2018-11-04 17:10:09 -05:00
Anuken
192814650d less (less) terrible physics 2018-11-04 15:49:23 -05:00
Anuken
9ffc8c6800 Merge remote-tracking branch 'origin/master' 2018-11-04 09:32:47 -05:00
Anuken
64cd8084ea Fixed some sector bugs 2018-11-04 09:32:43 -05:00
키에르
2e6c9d408c Update (#304) 
* Update bundle_ko.properties

* remove text.unit.none
 2018-11-04 09:25:10 -05:00
키에르
f3bea49f61 'Unkown' (#302) 2018-11-04 09:22:39 -05:00
Timmeey86
48fdae754e Fixed a bug where sector buttons would not be updated after abandoning it (#301) 2018-11-04 09:22:15 -05:00
Anuken
64f2ee67b2 New sector dialog done 2018-11-04 00:09:25 -04:00
Anuken
19d34779a0 New sector dialog done 2018-11-04 00:08:06 -04:00
Anuken
76a6a0cf75 Fixed crash when trying to open non-existent map 2018-11-03 09:39:59 -04:00
Anuken
da47d97cd0 Removed unused descriptions / Re-ordered all files 2018-11-03 09:28:47 -04:00
Anuken
f59441005e New sorted update script 2018-11-03 09:17:03 -04:00
Anuken
e30347a11f Fixed world data not loading on mobile servers 2018-11-03 09:00:21 -04:00
Anuken
8ac079fb72 Fixed local servers sometimes not showing up 2018-11-03 08:53:59 -04:00
Anuken
4295f08a84 Fixed linked tiles sometimes being null 2018-11-02 21:40:19 -04:00
Anuken
bd8eb97d46 Merge remote-tracking branch 'origin/master' 2018-11-02 20:57:17 -04:00
Anuken
329f656c40 Input fix 2018-11-02 20:57:13 -04:00
Anuken
f2c7a26ce0 Sector edges 2018-11-02 20:53:28 -04:00
Anuken
930e25e64a Sector edges 2018-11-02 20:53:08 -04:00
Timmeey86
963269a685 Added descriptions for all unlockables which didn't have them (#297) 
* Added english descriptions for walls and doors

* Added english descriptions for walls and doors

* Added descriptions for projectors, mine and turrets

* Added descriptions for transport blocks and two smelters

* Added descriptions for crafters

* Added descriptions for power-related items and containers

* Added descriptions for drills and extractors

* Added descriptions for ship/mech pads

* Added/updated unit/factory descriptions

* Added english descriptions for walls and doors

* Added descriptions for projectors, mine and turrets

* Added descriptions for transport blocks and two smelters

* Added descriptions for crafters

* Added descriptions for power-related items and containers

* Added descriptions for drills and extractors

* Added descriptions for ship/mech pads

* Added/updated unit/factory descriptions

* Added descriptions for liquids and related blocks.

* Updated descriptions based on discord discussion.

* Updated descriptions as requested by Anuken

* Updated shock mine description
 2018-11-02 19:49:56 -04:00
Anuken
de23ef5d35 Fixed crash 2018-11-02 19:46:56 -04:00
Anuken
208ae6183c Merge 2018-11-02 19:45:31 -04:00
Anuken
761ae4b816 Mission icons 2018-11-02 19:38:08 -04:00
Anuken
ff308641e1 Command center label style cleanup 2018-11-02 17:50:58 -04:00
Sonnicon
a2094ddf75 Command Center mode label. (#296) 2018-11-02 17:47:42 -04:00
Anuken
0391ed3e63 Icons of missions 2018-11-02 10:35:29 -04:00
Timmeey86
b6b3997498 Fixed false friend translation (#295) 2018-11-02 10:30:59 -04:00
Anuken
9f77c0c9b7 Added Graphics.begin/endClip() 2018-11-02 09:19:51 -04:00
키에르
dc4812a86e Update bundle_ko.properties (#294) 2018-11-02 08:46:43 -04:00
Baramos666
fc83b0d95b Update bundle_fr.properties (#293) 2018-11-01 20:12:41 -04:00
Sonnicon
8e70568e32 Made placement of pumps consistent across different placements. (#292) 2018-11-01 19:49:05 -04:00
Anuken
f0e3a3a30c Crash fix 2018-11-01 19:47:40 -04:00
Anuken
cf44efa02e Global drone repair / Fixed item bridge 2018-11-01 19:45:13 -04:00
Anuken
ddc59dfb97 Merge remote-tracking branch 'origin/master' 2018-11-01 17:56:47 -04:00
Anuken
ef0a3396d7 Automatic consume fragment view 2018-11-01 17:56:42 -04:00
Anuken
8bf68aa020 Cleanup 2018-11-01 09:09:12 -04:00
Timmeey86
02a90856ff Info Pages will now display tool tips for any item icons (#289) 
* All block info dialogs will now display tool tips for the liquids and items which are required

* Reverted accidental dependency addition

* Drills will now display tool tips as well (except cultivator)
 2018-10-31 21:29:15 -04:00
Timmeey86
8716695d4e Fixed a crash which could occur when unconstructing environment (#290) 2018-10-31 21:13:51 -04:00
Anuken
9a1bb69cd8 Cleaned up pause menu mess / Added sector links 2018-10-31 17:10:00 -04:00
Anuken
6809b38821 Possible empty sectors 2018-10-31 10:31:07 -04:00
LQ
7f9a3efa24 powergraph update with battery (#276) 2018-10-31 09:36:59 -04:00
Anuken
8ecea9792b Slightly more fleshed out sector selection 2018-10-30 23:05:35 -04:00
Anuken
7c85a03b42 Merge branch 'master' of https://github.com/Anuken/Mindustry into new-sectors 2018-10-30 22:18:07 -04:00
Anuken
d4d71b90eb Thread cleanup / Puddle fix 2018-10-30 22:13:01 -04:00
Anuken
fbf614a8df Removed html module 2018-10-30 19:15:12 -04:00
Anuken
c02329e4b1 Integrated thread implementation / Crash fix 2018-10-30 12:58:25 -04:00
Anuken
5aba065413 Bugfixes 2018-10-30 09:24:43 -04:00
Anuken
6e65096bb4 Improved power grid sprites / Bugfixes 2018-10-29 20:43:30 -04:00
Anuken
b39f25ed51 Fixed build error 2018-10-29 16:02:09 -04:00
Anuken
3925d5ec27 Removed useless power modules methods 2018-10-29 15:41:13 -04:00
Anuken
381b59acd4 Fixed irregularly scaled maps causing various bugs 2018-10-29 10:03:41 -04:00
Anuken
5b01d923d3 Full error localization 2018-10-28 23:50:30 -04:00
Anuken
108e5a2f5e Non-blocking connect / Localized connect error messages 2018-10-28 23:47:28 -04:00
Anuken
d4ea8c56c3 Added TileEntity.read/writeConfig() 2018-10-28 22:29:23 -04:00
Anuken
ac918c1a81 Warning fix 2018-10-28 18:34:18 -04:00
Anuken
eb20ec1556 Removed useless content logging, > 2018-10-28 18:17:46 -04:00
Anuken
557b86a7a9 Comment fix 2018-10-28 16:31:57 -04:00
Anuken
f144dda8b5 Fixed errors 2018-10-28 16:30:15 -04:00
Anuken
80aed31135 Broke and cleaned up server commands 2018-10-28 14:26:58 -04:00
Anuken
2a21e7c2cb Merge remote-tracking branch 'origin/master' 2018-10-28 00:31:32 -04:00
Anuken
d281277797 Balancing, bugfixes 2018-10-28 00:31:28 -04:00
키에르
fb807bcde4 Update bundle_ko.properties (#278) 2018-10-27 21:26:32 -04:00
Anuken
ebf6f6782f Merge remote-tracking branch 'origin/master' 2018-10-26 22:53:23 -04:00
Anuken
008df649f0 Configurable string charset 2018-10-26 22:53:19 -04:00
Anuken
a810e704ad Renamed ""oil"" / Increased phase fabric boost 2018-10-26 16:06:47 -04:00
Anuken
d0b3167956 Merge remote-tracking branch 'origin/master' 2018-10-26 15:30:58 -04:00
Anuken
a726ecbdd8 Fixed invalid map state not being reset 2018-10-26 15:30:08 -04:00
MMG
da6a8f806d Adds a few translations (#273) 2018-10-26 10:55:15 -04:00
키에르
b47f44cacd Add texts in font (#275) 
* Add texts in font

* Update bundle_ko.properties

POEditor is break word spacing..
 2018-10-26 10:54:42 -04:00
Anuken
0cc59adad7 Fixed crash / Made power nodes no longer link when adjacent 2018-10-26 09:54:55 -04:00
Anuken
6c076863db "silcion" 2018-10-26 00:11:58 -04:00
Anuken
ddb6e74955 Fixed revenant never shooting 2018-10-26 00:09:09 -04:00
Anuken
2094bc3d80 Renamed phase matter to reduce conflicts / Item balancing 2018-10-26 00:00:25 -04:00