Compare commits

..

333 Commits
v57 ... v61

Author SHA1 Message Date
Anuken
c321402414 Various bugfixes 2018-11-24 20:04:20 -05:00
Anuken
ec80fc9f3f Android build update 2018-11-24 19:39:35 -05:00
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
30b5dd63e4 Build tag fix 2018-11-23 10:21:47 -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
942eed402a uCore update 2018-11-22 23:38:59 -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
7795a690ed Fixed fillitems command 2018-11-21 21:17:45 -05:00
Anuken
d498ac89f2 Mining bugfix 2018-11-21 21:13:30 -05:00
Anuken
2842018c2f Ignored robovm.properties 2018-11-21 11:01:16 -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
46035e76cc Build increment 2018-11-21 09:59:56 -05:00
Anuken
7c073f76ae Added automatic build incrementing 2018-11-20 19:28:26 -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
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
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
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
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
Anuken
a86bb9f6e6 Merge branch 'master' of https://github.com/Anuken/Mindustry 2018-11-12 10:59:19 -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
37d03aaebe iOS build update 2018-11-09 13:12:04 -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
c554390de5 Crash fix 2018-11-08 18:48:19 -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
a781b4a387 Updated uCore 2018-11-06 21:00:51 -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
5f1addc54d Local crash saving 2018-11-04 09:57:12 -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
6caad0daf6 Merge remote-tracking branch 'origin/master' 2018-10-31 13:53:22 -04:00
Anuken
6508f1541b Added server logs / Kick messages / Ban messages 2018-10-31 13:51:45 -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
e21d17a482 Merge remote-tracking branch 'origin/master' 2018-10-28 22:29:29 -04:00
Anuken
d4ea8c56c3 Added TileEntity.read/writeConfig() 2018-10-28 22:29:23 -04:00
Skybbles // L5474
783ad64353 Updated README (#284)
Proper formatting (md:h4)
Syntactic update, '.bat' no longer needs to come after 'gradlew' for Windows building
Server build instructions
2018-10-28 20:05:20 -04:00
Anuken
ac918c1a81 Warning fix 2018-10-28 18:34:18 -04:00
Anuken
0f00074f77 Consistent yellow text 2018-10-28 18:22:14 -04:00
Anuken
eb20ec1556 Removed useless content logging, > 2018-10-28 18:17:46 -04:00
Anuken
32f9da0724 Merge remote-tracking branch 'origin/master' 2018-10-28 18:04:15 -04:00
Anuken
968be8eb8f Fixed server run error 2018-10-28 18:04:07 -04:00
Skybbles // L5474
d7e05cde42 Added timestamps and output type labels (#283)
* Added timestamps and output type labels

* Corrected initial 'build version, client checking' warning, which is why warn exists in the first place.
2018-10-28 18:01:51 -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
Anuken
c922007d21 Removed unnecessary manual font specification 2018-10-25 23:22:37 -04:00
Anuken
b1435c1264 Merge remote-tracking branch 'origin/master' 2018-10-25 23:21:31 -04:00
Anuken
be5e1648e0 Removed font line height tweak 2018-10-25 23:21:27 -04:00
Anuken
a270feb1eb Removed extra sector border 2018-10-25 23:08:19 -04:00
VizardAlpha
103b8cd13a Rename bundle_fr_be.properties to bundle_fr_BE.properties (#271)
Update Bundle
2018-10-25 12:16:04 -04:00
Anuken
e6dd36283d Misc. bugfixes 2018-10-24 20:21:48 -04:00
Anuken
aae2d0a5dc Broke sector dialog 2018-10-24 19:32:07 -04:00
Anuken
fda1d4cc2b Merge remote-tracking branch 'origin/master' 2018-10-24 18:53:09 -04:00
Anuken
5be92460c1 Fixed crash 2018-10-24 18:53:05 -04:00
xgamezs
15ce31ea3a Adding a new string (#270)
* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Create bundle_fr_be.properties

* Delete bundle_fr_be.properties

* Create bundle_fr_be.properties

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Create bundle_tr.properties

* Update bundle_tr.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_uk_UA.properties

* Update bundle_ru.properties

* Update bundle.properties

* Update bundle_uk_UA.properties (POEditor.com)
2018-10-24 18:38:51 -04:00
Anuken
35e5a669a0 Fixed mobile mining/targeting conflict 2018-10-24 14:03:48 -04:00
Anuken
8b8c74cf93 Added filename entry (again) 2018-10-24 13:26:32 -04:00
xgamezs
cc43524b4c Update and standardize translations (POEditor.com) (#258)
* Update bundle_ru.properties (POEditor.com)

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Create bundle_fr_be.properties

* Delete bundle_fr_be.properties

* Create bundle_fr_be.properties

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Create bundle_tr.properties

* Update bundle_tr.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_zh_CN.properties (POEditor.com)

* Update bundle_zh_TW.properties (POEditor.com)

* Update bundle.properties (POEditor.com)

* Update bundle_fr.properties (POEditor.com)

* Update bundle_fr_be.properties (POEditor.com)

* Update bundle_de.properties (POEditor.com)

* Update bundle_in_ID.properties (POEditor.com)

* Update bundle_ita.properties (POEditor.com)

* Update bundle_ko.properties (POEditor.com)

* Update bundle_pl.properties (POEditor.com)

* Update bundle_pt_BR.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)

* Update bundle_es.properties (POEditor.com)

* Update bundle_tk.properties (POEditor.com)

* Update bundle_tr.properties (POEditor.com)

* Update bundle_uk_UA.properties (POEditor.com)

* Update bundle_ru.properties (POEditor.com)
2018-10-24 13:22:18 -04:00
Anuken
f87d297155 Added filename entry 2018-10-24 13:09:42 -04:00
Anuken
605d50166a Made android module load only when SDK defined 2018-10-24 13:07:51 -04:00
Anuken
de6681d00a Added special case for unit.none 2018-10-24 10:31:23 -04:00
Anuken
7632e33975 Merge remote-tracking branch 'origin/master' 2018-10-23 22:45:41 -04:00
Anuken
5993a596e8 Made bundle generator add spaces between = 2018-10-23 22:45:36 -04:00
키에르
2294b6babb Add more texts with Cyrillic (#262) 2018-10-23 09:23:19 -04:00
VizardAlpha
c38f866363 Updates bundle_fr_be.properties (#260)
Replacing the new translations. Translation finish
2018-10-23 09:01:46 -04:00
CinExPL
511b112ac7 Update bundle_pl.properties (#257) 2018-10-23 09:01:04 -04:00
Anuken
8cd0618e85 Fixed crash 2018-10-23 08:41:52 -04:00
Anuken
b4b589bfc2 Removed unnecessary synchronization 2018-10-22 22:48:15 -04:00
Baltazár Radics
cb69eb7c0f Simplified power logic (#261)
* Simplified power logic

* Made the requested changes
2018-10-22 22:47:44 -04:00
Anuken
7d83cd89f2 Fixed breaking with multiblock being offseted 2018-10-22 22:21:22 -04:00
Anuken
b2dca0a34f Merge branch 'optimizations' of https://github.com/Anuken/Mindustry 2018-10-21 21:50:14 -04:00
Anuken
3bd73961d7 Merged inventory saving/loading, item-based capacity 2018-10-21 21:46:12 -04:00
Anuken
67f574b5d8 Storage graph inventory sharing 2018-10-21 19:49:32 -04:00
Anuken
f9b70a37aa Correct storage graphs 2018-10-21 17:20:08 -04:00
Anuken
d4047e1413 Fixed crash 2018-10-21 17:03:51 -04:00
Anuken
80f5b4c3b7 Crashy storage graph implementation 2018-10-21 17:02:37 -04:00
Anuken
4668a6d8c0 Implemented sector state network sync 2018-10-20 18:41:05 -04:00
Anuken
e6f076306f Merge branch 'rework-sectors' of https://github.com/Anuken/Mindustry 2018-10-20 17:36:56 -04:00
Anuken
b73dc127a3 Fixed enemy base generation 2018-10-20 17:36:07 -04:00
Anuken
8c8a2311d6 Fixed sector clear not resetting 0,0 2018-10-20 16:04:13 -04:00
Anuken
0555fb22ca Fixed pump crash 2018-10-20 14:09:00 -04:00
Anuken
85cde62039 Fixed phase weaver blink / Fixed item image offset (again) 2018-10-20 13:53:25 -04:00
Anuken
46a2648d15 Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:50:30 -04:00
Anuken
e55f6ecd6b Fixes to power system 2018-10-20 13:49:58 -04:00
Anuken
c71fee3fed Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 13:21:05 -04:00
Anuken
4d6c25c9d3 Fixed flying units blocking construction 2018-10-20 13:20:35 -04:00
Anuken
6ed4e2d946 Improved random recipe selection 2018-10-20 13:19:47 -04:00
Anuken
6b4242478f Merge branch 'master' of https://github.com/Anuken/Mindustry into rework-sectors 2018-10-20 11:52:02 -04:00
Anuken
ef5478279b Fixed 2 crashes 2018-10-20 11:48:59 -04:00
Anuken
62bb8bce1c Added missing imports 2018-10-20 11:44:19 -04:00
Anuken
83a5c3af8a Updated uCore with new threading changes 2018-10-20 11:41:10 -04:00
Anuken
f78abd61d4 Merge remote-tracking branch 'origin/master' 2018-10-20 11:39:05 -04:00
Anuken
209c6fa1c1 Merged in better multithreading 2018-10-20 11:39:00 -04:00
Anuken
6e3c600a49 Crash fix 2018-10-20 11:36:05 -04:00
Anuken
b1cda57174 Massively improved thread safety 2018-10-20 11:25:58 -04:00
키에르
412d92e782 Update bundle_ko.properties (#255) 2018-10-20 09:33:43 -04:00
Niko
c0703a6a5e Add german translations (#256)
* Replace some English Text with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some English Text about Units and Fluids with german translations in bundle_de

* Replace some English Text with german translations in bundle_de, renamed map to karte

* Replace some mech and drone definitions with german translations in bundle_de

* Replace almost all definitions with german translations in bundle_de

* Merge branch 'master' into add_german_translations

# Conflicts:
#	core/assets/bundles/bundle_de.properties

* fix some typos in bundle_de
2018-10-20 09:33:35 -04:00
Anuken
64bd306c6d Fixed crash 2018-10-20 09:02:29 -04:00
Anuken
6be49f898c Removed onFirstBegin() 2018-10-19 23:20:04 -04:00
Anuken
59bc73656f Save file refactor / Changed sector size 2018-10-19 22:46:53 -04:00
Anuken
bed22f51b4 Updated sector unlocking 2018-10-19 16:23:01 -04:00
Anuken
c1362a02f3 Removed all references to size 2018-10-19 13:48:08 -04:00
Anuken
859a3cbe6e Fixed Java 10-related crash 2018-10-19 12:58:53 -04:00
Anuken
a6d82f44b3 Initial (broken) commit 2018-10-19 12:57:24 -04:00
키에르
e66e17a41a Fix font height (#253) 2018-10-19 10:01:09 -04:00
Anuken
cfa6d7080c Fixed font 2018-10-19 09:56:50 -04:00
Anuken
01ceedccd5 Updated bundles / Decreased water extractor power usage 2018-10-19 09:32:23 -04:00
Anuken
ed28af7c73 Changed 'max power' to 'base power', re-scaled display stats of fuel 2018-10-19 09:31:33 -04:00
Anuken
74cf91f99e Fixed increased router storage / Fixed instant building after reload 2018-10-19 08:47:19 -04:00
Anuken
44479930df Fixed mobile mechs configuration / Block selection / Crash 2018-10-19 08:30:37 -04:00
Anuken
cb1f54aac4 Removed wiki link 2018-10-18 23:00:18 -04:00
Anuken
d68d2e9f30 Moved paused text details into bundle 2018-10-18 22:33:11 -04:00
Anuken
948c48ea23 Merge remote-tracking branch 'origin/master' 2018-10-18 21:57:19 -04:00
Anuken
a9ccf6ca42 Updated travis config / Fixed flying mech land effect 2018-10-18 21:57:13 -04:00
Baramos666
fd7b829e70 Update bundle_fr.properties (#249) 2018-10-18 21:56:44 -04:00
LQ
87a7cc6289 add liquid out speed display (#250) 2018-10-18 21:56:35 -04:00
VizardAlpha
2f8b5e53bb Updates bundle_fr_be.properties (#251)
Recast of the French translation (Belgium)
2018-10-18 21:56:09 -04:00
Prosta4okua
8b7fa3b646 [WIP]Update bundle_ru.properties (#243)
* Update bundle_ru.properties

* Update bundle_ru.properties
2018-10-18 21:56:00 -04:00
Anuken
dd2c71fe61 Removed sandbox from shuffle list / duplicate maps / mobile mech pickup 2018-10-18 18:20:07 -04:00
Anuken
3b58d57e5c Fixed unlocks not clearing / Fixed map editor not updating 2018-10-18 16:58:57 -04:00
Anuken
cecf32e52e Fixed RTG generator not using items 2018-10-18 16:33:39 -04:00
Anuken
91a2dfab36 Fixed build block repair / Sectors in random maps / Editor unlocks 2018-10-18 16:31:15 -04:00
Anuken
5e5838a8c1 let me make this PAINFULLY CLEAR 2018-10-18 16:04:40 -04:00
Skybbles // L5474
0fffbc06dd Spelling correction (#252)
*maybe you mean CLI board.*
2018-10-18 14:35:33 -04:00
Anuken
4d360bfb73 Bugfixes 2018-10-18 09:19:29 -04:00
Anuken
e3001b614e Fixed pathfinding through liquids / Switched overlay render layer 2018-10-18 00:02:12 -04:00
Anuken
6ecdef02ab Block break visual cleanup 2018-10-17 22:10:56 -04:00
Anuken
36903eb749 Fixed mission onBegin() being called many times 2018-10-17 17:35:33 -04:00
Anuken
f530c9514f Changed placement controls / Fixed complete sectors not resetting 2018-10-17 17:28:24 -04:00
Anuken
fdffa77bc5 Fixed mobile targeting / Removed 'transfer speed' / Buffed large nodes 2018-10-17 17:09:26 -04:00
Anuken
245dd39a60 Potentially fixed targeting issues 2018-10-17 14:01:18 -04:00
Anuken
4614aacc02 Fixed chat not clearing 2018-10-17 13:54:34 -04:00
Anuken
64ccdab90c Removed extra trace info (for now) 2018-10-17 13:41:25 -04:00
Anuken
02286b0c4e Fixed player build indicators, power void 2018-10-17 10:31:59 -04:00
Anuken
8e952a550b Fixed: map mirror / crashes / mech pads / player list / mobile placement 2018-10-17 10:20:58 -04:00
Anuken
a29f95194d Various fixes / Placement visual improvements 2018-10-17 00:36:43 -04:00
Anuken
0e5db49b93 Fixed missing blocks causing invalid map data error 2018-10-16 20:03:35 -04:00
Anuken
a2c29c0937 Removed tutorial ore post-generation / Updated uCore 2018-10-16 19:31:06 -04:00
Anuken
22328772ca "Fixed" some bugs 2018-10-11 10:01:19 -04:00
Anuken
52bd079c0a Multithreading cleanup 2018-10-10 23:43:48 -04:00
386 changed files with 18994 additions and 33396 deletions

3
.gitignore vendored
View File

@@ -1,5 +1,6 @@
##Packr, build stuff
logs/
/core/assets/mindustry-saves/
/core/assets/mindustry-maps/
/core/assets/bundles/output/
@@ -25,6 +26,8 @@
/core/assets/version.properties
/core/assets/locales
/ios/src/io/anuke/mindustry/gen/
/core/src/io/anuke/mindustry/gen/
ios/robovm.properties
*.gif
version.properties

View File

@@ -1,26 +1,20 @@
language: android
jdk:
- openjdk8
android:
components:
- android-28
# Additional components
- extra-google-google_play_services
- extra-google-m2repository
- extra-android-m2repository
- addon-google_apis-google-28
- build-tools-28.0.3
- openjdk8
script:
- ./gradlew test
- ./gradlew desktop:dist
- ./gradlew server:dist
after_success:
- chmod +x upload-build.sh
- chmod +x cleanup_builds.sh
- ./upload-build.sh
- "./gradlew test"
- "./gradlew desktop:dist -Pbuildversion=${TRAVIS_TAG:1}"
- "./gradlew server:dist -Pbuildversion=${TRAVIS_TAG:1}"
deploy:
provider: releases
skip_cleanup: true
draft: false
api_key:
secure: Cv5wFtWt62/A24EvSEQvMow7gKPbZ3oATEFPuSghhB2TQz1dA40Zee3Qvk4LFlpLrhYo4K0ZSczCZRGpR+hCd8+Dpww52bheYEvWuh3ZQfvu/fXtEx2j5PwP1qMpmIgSxETV/gkD7l9FImdh0VzktYiAvQfmi0bEocG9/D4QwjFpNat7iwBdcMiw1MvAygpdIWRsjiw0RKlB2mWarmoHhQ7Gu7qlU3j50uaEvcrtmU0pBUPggNQwQRv32i9NPvNFxrqqlUjDLIS8JFea99zCkp8BwYqbEvBIMzd+Qip1/stLJJA3+cDUClbsDtg8rAVetzpOrdLEEBmqShFe5MDl2yEHcsgpN9CFsyTaUfvB3P3rVjizvycMm42IsUkXQiarm5xTQ/TIA8Rd8AHiSKuweNCg1Fd5SFaRtKy8JVLXuxyfUccmyje6hhz2L4lS2Wfj3mAG7sqZUCXhWP79EKdGkiPOjKv4CwXEKmuH3BMVqPlNUZJr9Eg3sV1FG0h2l+MVOOnR635qdUbb49sYojYxVruMLX0BH1c4ZCu230m8CUoWA1Em1QNI75ya7+9Y5T6AsgWDVpBvdUo9fWNbdp+VQ0GskFQsJD5wtnxbcbHeFiERAgGBm7z6qt9u9LrQpBH+dsW52ADvYsu3L4nQEa+sdMHwTTwmGY+iUvsxu0DqxGg=
file:
- "desktop/build/libs/desktop-release.jar"
- "server/build/libs/server-release.jar"
on:
repo: Anuken/Mindustry
tags: true

View File

@@ -11,27 +11,29 @@ _[Discord](https://discord.gg/r8BkXNd)_
### Building
Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://github.com/Anuken/Mindustry/wiki).
Bleeding-edge live builds are generated automatically for every commit. You can see them [here](https://jenkins.hellomouse.net/job/mindustry/).
If you'd rather compile on your own, follow these instructions.
First, make sure you have Java 8 and JDK 8 installed. Open a terminal in the root directory, and run the following commands:
#### Windows
**_Windows_**
_Running:_ `gradlew desktop:run`
_Building:_ `gradlew desktop:dist`
_Running:_ `gradlew.bat desktop:run`
_Building:_ `gradlew.bat desktop:dist`
**_Linux_**
#### Linux
_Running:_ `./gradlew desktop:run`
_Building:_ `./gradlew desktop:dist`
#### For Server Builds...
Server builds are bundled with each released build (in Releases). If you'd rather compile on your own, replace 'desktop' with 'server' i.e. `gradlew server:dist`.
---
Gradle may take up to several minutes to download files. Be patient. <br>
After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar.`
After building, the output .JAR file should be in `/desktop/build/libs/desktop-release.jar` for desktop builds, and in `/server/build/libs/server-release.jar` for server builds.
### Downloads

View File

@@ -20,7 +20,7 @@
<activity
android:name="io.anuke.mindustry.AndroidLauncher"
android:label="@string/app_name"
android:screenOrientation="user"
android:screenOrientation="sensor"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize|screenLayout">
<intent-filter>

View File

@@ -1,3 +1,16 @@
buildscript {
repositories {
mavenLocal()
mavenCentral()
google()
maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.2.1'
}
}
apply plugin: "com.android.application"
@@ -14,9 +27,9 @@ repositories {
dependencies {
implementation project(":core")
implementation project(":kryonet")
implementation 'com.android.support:support-v4:25.3.1'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'org.sufficientlysecure:donations:2.5'
implementation 'com.google.android.gms:play-services-auth:11.8.0'
implementation 'com.google.android.gms:play-services-auth:16.0.1'
implementation "com.badlogicgames.gdx:gdx-backend-android:$gdxVersion"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-armeabi"
@@ -24,6 +37,12 @@ dependencies {
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-armeabi-v7a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-arm64-v8a"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86"
natives "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-x86_64"
implementation "com.badlogicgames.gdx:gdx-controllers-android:$gdxVersion"
}
@@ -74,7 +93,7 @@ android {
applicationId "io.anuke.mindustry"
minSdkVersion 14
targetSdkVersion 27
targetSdkVersion 28
versionCode code
versionName versionNameResult
}

View File

@@ -1,21 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layout_root"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:padding="10dp" >
<EditText
android:id="@+id/gdxDialogsEditTextInput"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text"
android:maxLines="1"
>
<requestFocus />
</EditText>
</LinearLayout>

View File

@@ -19,17 +19,14 @@ import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
import com.google.android.gms.common.GooglePlayServicesRepairableException;
import com.google.android.gms.security.ProviderInstaller;
import io.anuke.kryonet.DefaultThreadImpl;
import io.anuke.kryonet.KryoClient;
import io.anuke.kryonet.KryoServer;
import io.anuke.mindustry.core.Platform;
import io.anuke.mindustry.core.ThreadHandler.ThreadProvider;
import io.anuke.mindustry.game.Saves.SaveSlot;
import io.anuke.mindustry.io.SaveIO;
import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.ui.dialogs.FileChooser;
import io.anuke.ucore.function.Consumer;
import io.anuke.ucore.scene.ui.TextField;
import io.anuke.ucore.scene.ui.layout.Unit;
import io.anuke.ucore.util.Bundles;
import io.anuke.ucore.util.Strings;
@@ -38,12 +35,7 @@ import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.text.DateFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
import java.util.Locale;
import static io.anuke.mindustry.Vars.*;
@@ -58,43 +50,16 @@ public class AndroidLauncher extends PatchedAndroidApplication{
AndroidApplicationConfiguration config = new AndroidApplicationConfiguration();
config.useImmersiveMode = true;
Platform.instance = new Platform(){
DateFormat format = SimpleDateFormat.getDateTimeInstance();
@Override
public String format(Date date){
return format.format(date);
}
@Override
public String format(int number){
return NumberFormat.getIntegerInstance().format(number);
}
@Override
public void addDialog(TextField field, int length){
TextFieldDialogListener.add(field, 0, length);
}
@Override
public String getLocaleName(Locale locale){
return locale.getDisplayName(locale);
}
@Override
public void openDonations(){
showDonations();
}
@Override
public ThreadProvider getThreadProvider(){
return new DefaultThreadImpl();
}
@Override
public String getUUID(){
try{
String s = Secure.getString(getContext().getContentResolver(),
Secure.ANDROID_ID);
String s = Secure.getString(getContext().getContentResolver(), Secure.ANDROID_ID);
int len = s.length();
byte[] data = new byte[len / 2];
for(int i = 0; i < len; i += 2){
@@ -147,6 +112,7 @@ public class AndroidLauncher extends PatchedAndroidApplication{
return true;
}
};
try{
ProviderInstaller.installIfNeeded(this);
}catch(GooglePlayServicesRepairableException e){

View File

@@ -1,119 +0,0 @@
package io.anuke.mindustry;
import android.app.Activity;
import android.app.AlertDialog;
import android.text.InputFilter;
import android.view.LayoutInflater;
import android.view.View;
import android.view.WindowManager.LayoutParams;
import android.widget.EditText;
import com.badlogic.gdx.Gdx;
public class AndroidTextFieldDialog{
private Activity activity;
private EditText userInput;
private AlertDialog.Builder builder;
private TextPromptListener listener;
private boolean isBuild;
public AndroidTextFieldDialog(){
this.activity = (Activity) Gdx.app;
load();
}
public AndroidTextFieldDialog show(){
activity.runOnUiThread(() -> {
AlertDialog dialog = builder.create();
dialog.getWindow().setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_VISIBLE);
dialog.show();
});
return this;
}
private AndroidTextFieldDialog load(){
activity.runOnUiThread(() -> {
AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(activity);
LayoutInflater li = LayoutInflater.from(activity);
View promptsView = li.inflate(getResourceId("gdxdialogs_inputtext", "layout"), null);
alertDialogBuilder.setView(promptsView);
userInput = promptsView.findViewById(getResourceId("gdxDialogsEditTextInput", "id"));
alertDialogBuilder.setCancelable(false);
builder = alertDialogBuilder;
isBuild = true;
});
// Wait till TextPrompt is built.
while(!isBuild){
try{
Thread.sleep(10);
}catch(InterruptedException ignored){
}
}
return this;
}
public int getResourceId(String pVariableName, String pVariableType){
try{
return activity.getResources().getIdentifier(pVariableName, pVariableType, activity.getPackageName());
}catch(Exception e){
Gdx.app.error("Android Dialogs", "Cannot find resouce with name: " + pVariableName
+ " Did you copy the layouts to /res/layouts and /res/layouts_v14 ?");
e.printStackTrace();
return -1;
}
}
public AndroidTextFieldDialog setText(CharSequence value){
userInput.append(value);
return this;
}
public AndroidTextFieldDialog setCancelButtonLabel(CharSequence label){
builder.setNegativeButton(label, (dialog, id) -> dialog.cancel());
return this;
}
public AndroidTextFieldDialog setConfirmButtonLabel(CharSequence label){
builder.setPositiveButton(label, (dialog, id) -> {
if(listener != null && !userInput.getText().toString().isEmpty()){
listener.confirm(userInput.getText().toString());
}
});
return this;
}
public AndroidTextFieldDialog setTextPromptListener(TextPromptListener listener){
this.listener = listener;
return this;
}
public AndroidTextFieldDialog setInputType(int type){
userInput.setInputType(type);
return this;
}
public AndroidTextFieldDialog setMaxLength(int length){
userInput.setFilters(new InputFilter[]{new InputFilter.LengthFilter(length)});
return this;
}
public interface TextPromptListener{
void confirm(String text);
}
}

View File

@@ -68,7 +68,6 @@ public class DonationsActivity extends FragmentActivity{
Fragment fragment = fragmentManager.findFragmentByTag("donationsFragment");
if(fragment != null){
fragment.onActivityResult(requestCode, resultCode, data);
//TODO donation event, set settings?
}
}
}

View File

@@ -1,67 +0,0 @@
package io.anuke.mindustry;
import android.text.InputType;
import com.badlogic.gdx.Application.ApplicationType;
import com.badlogic.gdx.Gdx;
import io.anuke.ucore.scene.event.ChangeListener;
import io.anuke.ucore.scene.event.ClickListener;
import io.anuke.ucore.scene.event.InputEvent;
import io.anuke.ucore.scene.event.InputListener;
import io.anuke.ucore.scene.ui.TextField;
public class TextFieldDialogListener extends ClickListener{
private TextField field;
private int type;
private int max;
//type - 0 is text, 1 is numbers, 2 is decimals
public TextFieldDialogListener(TextField field, int type, int max){
this.field = field;
this.type = type;
this.max = max;
}
public static void add(TextField field, int type, int max){
field.addListener(new TextFieldDialogListener(field, type, max));
field.addListener(new InputListener(){
public boolean touchDown(InputEvent event, float x, float y, int pointer, int button){
Gdx.input.setOnscreenKeyboardVisible(false);
return false;
}
});
}
public static void add(TextField field){
add(field, 0, 16);
}
public void clicked(final InputEvent event, float x, float y){
if(Gdx.app.getType() == ApplicationType.Desktop) return;
AndroidTextFieldDialog dialog = new AndroidTextFieldDialog();
dialog.setTextPromptListener(text -> {
field.clearText();
field.appendText(text);
field.fire(new ChangeListener.ChangeEvent());
Gdx.graphics.requestRendering();
});
if(type == 0){
dialog.setInputType(InputType.TYPE_CLASS_TEXT);
}else if(type == 1){
dialog.setInputType(InputType.TYPE_CLASS_NUMBER);
}else if(type == 2){
dialog.setInputType(InputType.TYPE_NUMBER_FLAG_DECIMAL);
}
dialog.setConfirmButtonLabel("OK").setText(field.getText());
dialog.setCancelButtonLabel("Cancel");
dialog.setMaxLength(max);
dialog.show();
event.cancel();
}
}

View File

@@ -1,4 +1,6 @@
apply plugin: "java"
sourceCompatibility = 1.8
sourceSets.main.java.srcDirs = [ "src/" ]
sourceSets.main.java.srcDirs = [ "src/main/java/" ]
sourceSets.main.resources.srcDirs = [ "src/main/resources/" ]

View File

@@ -1,5 +1,7 @@
package io.anuke.annotations;
import io.anuke.annotations.MethodEntry;
import java.util.ArrayList;
/** Represents a class witha list method entries to include in it. */

View File

@@ -2,6 +2,8 @@ package io.anuke.annotations;
import com.squareup.javapoet.*;
import io.anuke.annotations.IOFinder.ClassSerializer;
import io.anuke.annotations.MethodEntry;
import io.anuke.annotations.Utils;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;

View File

@@ -52,7 +52,7 @@ public class SerializeAnnotationProcessor extends AbstractProcessor{
TypeSpec.Builder serializer = TypeSpec.anonymousClassBuilder("")
.addSuperinterface(ParameterizedTypeName.get(
ClassName.get(Class.forName("io.anuke.ucore.io.TypeSerializer")), type));
ClassName.bestGuess("io.anuke.ucore.io.TypeSerializer"), type));
MethodSpec.Builder writeMethod = MethodSpec.methodBuilder("write")
.returns(void.class)

View File

@@ -0,0 +1,2 @@
io.anuke.annotations.RemoteMethodAnnotationProcessor
io.anuke.annotations.SerializeAnnotationProcessor

View File

@@ -8,8 +8,6 @@ buildscript {
}
dependencies {
classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.0'
classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
classpath 'com.android.tools.build:gradle:3.2.1'
classpath "com.badlogicgames.gdx:gdx-tools:1.9.8"
}
}
@@ -21,17 +19,17 @@ allprojects {
version = 'release'
ext {
versionNumber = '4.0'
versionNumber = '4'
versionModifier = 'alpha'
versionType = 'official'
appName = 'Mindustry'
gdxVersion = '1.9.8'
gdxVersion = '1.9.9'
roboVMVersion = '2.3.0'
uCoreVersion = 'd5f892dcf1773b0f6d47d2190d139cc6342ac75f'
uCoreVersion = '09e13f973a0769d971316d1d4f4a1eef3570926f'
getVersionString = {
String buildVersion = getBuildVersion()
return "$versionNumber-$versionType-$buildVersion"
return "$versionNumber-$versionModifier-$buildVersion"
}
getBuildVersion = {
@@ -97,28 +95,11 @@ project(":desktop") {
compile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"
compile "com.badlogicgames.gdx:gdx-controllers-lwjgl3:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-desktop"
compile 'com.github.MinnDevelopment:java-discord-rpc:v2.0.0'
}
}
project(":html") {
apply plugin: "gwt"
apply plugin: "war"
dependencies {
compile project(":core")
compileOnly project(":annotations")
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion"
compile "com.badlogicgames.gdx:gdx:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-backend-gwt:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion:sources"
compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-controllers-gwt:$gdxVersion:sources"
}
}
project(":ios") {
apply plugin: "java"
apply plugin: "robovm"
@@ -129,16 +110,34 @@ project(":ios") {
include "**/*.java"
}
into "ios/src/io/anuke/mindustry/gen"
into "core/src/io/anuke/mindustry/gen"
}
doFirst{
delete{
delete "ios/src/io/anuke/mindustry/gen/"
delete "core/src/io/anuke/mindustry/gen/"
}
}
}
task incrementConfig{
def vfile = file('robovm.properties')
def props = new Properties()
if(vfile.exists()){
props.load(new FileInputStream(vfile))
}
props['app.id'] = 'io.anuke.mindustry'
props['app.version'] = '4.0'
props['app.mainclass'] = 'io.anuke.mindustry.IOSLauncher'
props['app.executable'] = 'IOSLauncher'
props['app.name'] = 'Mindustry'
props['app.build'] = (!props.hasProperty("app.build") ? 40 : props['app.build'].toInteger() + 1)+""
props.store(vfile.newWriter(), null)
}
build.dependsOn(incrementConfig)
build.dependsOn(copyGen)
dependencies {
@@ -149,6 +148,8 @@ project(":ios") {
compile "com.mobidevelop.robovm:robovm-cocoatouch:$roboVMVersion"
compile "com.badlogicgames.gdx:gdx-backend-robovm:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-ios"
compile "com.badlogicgames.gdx:gdx-freetype-platform:$gdxVersion:natives-ios"
compileOnly project(":annotations")
}
}
@@ -160,7 +161,6 @@ project(":core") {
}
dependencies {
compileOnly project(":annotations")
build.finalizedBy(finish)
def comp = System.properties["release"] == null || System.properties["release"] == "false"
@@ -178,11 +178,11 @@ project(":core") {
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
compile "com.badlogicgames.gdx:gdx-controllers:$gdxVersion"
}
compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
compileJava.options.compilerArgs = [
"-processor", "io.anuke.annotations.RemoteMethodAnnotationProcessor,io.anuke.annotations.SerializeAnnotationProcessor"
]
compileOnly project(":annotations")
annotationProcessor project(":annotations")
}
}
project(":server") {
@@ -195,7 +195,6 @@ project(":server") {
}
dependencies {
compileOnly project(":annotations")
compile project(":core")
compile project(":kryonet")

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 782 B

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 88 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 B

After

Width:  |  Height:  |  Size: 78 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 199 B

After

Width:  |  Height:  |  Size: 120 B

View File

Before

Width:  |  Height:  |  Size: 75 B

After

Width:  |  Height:  |  Size: 75 B

View File

Before

Width:  |  Height:  |  Size: 119 B

After

Width:  |  Height:  |  Size: 119 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 B

After

Width:  |  Height:  |  Size: 118 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 83 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 91 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 81 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 B

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 201 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 157 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 374 B

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 B

After

Width:  |  Height:  |  Size: 111 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 241 B

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 207 B

After

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 228 B

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

After

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 92 B

After

Width:  |  Height:  |  Size: 94 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 126 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 137 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 132 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 B

After

Width:  |  Height:  |  Size: 112 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 B

After

Width:  |  Height:  |  Size: 136 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 141 B

After

Width:  |  Height:  |  Size: 141 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 124 B

After

Width:  |  Height:  |  Size: 124 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 225 B

After

Width:  |  Height:  |  Size: 373 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 230 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 204 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 268 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 231 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 246 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 238 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 252 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 104 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

View File

Before

Width:  |  Height:  |  Size: 110 B

After

Width:  |  Height:  |  Size: 110 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 95 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 103 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 B

View File

Before

Width:  |  Height:  |  Size: 98 B

After

Width:  |  Height:  |  Size: 98 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 97 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 116 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 219 B

After

Width:  |  Height:  |  Size: 359 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

After

Width:  |  Height:  |  Size: 142 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 395 B

After

Width:  |  Height:  |  Size: 392 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 125 B

After

Width:  |  Height:  |  Size: 211 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 123 B

After

Width:  |  Height:  |  Size: 123 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 551 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 551 B

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

Some files were not shown because too many files have changed in this diff Show More