713dbccf74
Bugfixes
2020-04-16 11:30:42 -04:00
a8f4df8030
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/src/mindustry/ui/fragments/PlayerListFragment.java
2020-04-16 10:14:13 -04:00
256f805754
Payload fixes
2020-04-16 09:55:57 -04:00
ea0358d570
Merge remote-tracking branch 'origin/6.0' into 6.0
2020-04-16 09:44:36 -04:00
42f227195c
Better payload framework
2020-04-16 09:44:31 -04:00
7d6e8fdcd1
Update bundle_zh_TW.properties ( #1876 )
...
* Update bundle_zh_TW.properties
* Update bundle_zh_TW.properties
2020-04-16 09:14:36 -04:00
7254204ae5
[6.0] fix build requirement check for sandbox ( #1873 )
...
* Fix not being able to start building in 6.0 sandbox
* Make 〃 more logical
2020-04-16 09:11:23 -04:00
8a01b87c99
Cleanup
2020-04-15 23:12:18 -04:00
79c8548171
Better conveyor animations
2020-04-15 19:05:18 -04:00
a234949b8c
Visual tweaks
2020-04-15 13:03:37 -04:00
0eaf9bc9c6
Various prototypes
2020-04-15 12:44:53 -04:00
305632c002
Update bundle_uk_UA.properties ( #1871 )
2020-04-15 10:36:38 -04:00
51226d6c88
Arc compat
2020-04-14 20:29:59 -04:00
18e92f5abf
RU updates ( #1866 )
...
* Update bundle_ru.properties
* Felix alive (phantom description)
* RU bundle Phantom description fix
* 2 lines changed
wave.enemies
wave.enemy
* 6 lines changed
editor.overwrite.confirm
confirmban
confirmkick
confirmvotekick
confirmadmin
confirmunadmin
Co-authored-by: Prosta4okua <31485341+Prosta4okua@users.noreply.github.com >
Co-authored-by: Felix Corvus <remint32@yandex.ru >
2020-04-14 10:04:29 -04:00
a10235d6b0
I18n es tiny fix ( #1865 )
...
* Update some translations into spanish.
* Need a white space between #wave_number and wave word (in spanish).
* Added translation for 'search'.
* Fix translate of 'bleeding edge' is https://www.urbandictionary.com/define.php?term=Bleeding%20edge . It is not a name.
* Fixed some spanish strings about schematic.
* Fixed some translations in spanish.
2020-04-14 10:04:13 -04:00
95d603a035
Separate the use of map name and player name ( #1863 )
...
* change use 'name'
* remove schematic.name
2020-04-14 10:04:05 -04:00
25bc6ebaf0
Minor changes ( #1858 )
2020-04-13 21:22:49 -04:00
9a0292268e
Minor changes in bundle_es.properties ( #1861 )
...
Added some clarifications in the tutorial and corrected multiple spelling and grammar errors.
2020-04-13 21:21:20 -04:00
91f9ce3098
update ( #1862 )
2020-04-13 21:21:10 -04:00
c717084cb9
Cleanup
2020-04-13 18:07:00 -04:00
2af12a632a
Added basic multi-unit factories
2020-04-13 16:56:33 -04:00
474ddcf989
Update bundle_uk_UA.properties ( #1811 )
2020-04-12 18:06:09 -04:00
8093f69b6a
Update bundle_pt_BR.properties ( #1839 )
...
* Update bundle_pt_BR.properties
* Update bundle_pt_BR.properties
* Update bundle_pt_BR.properties
* Update bundle_pt_BR.properties
2020-04-12 17:43:51 -04:00
a240c00ebf
Set cleanup
2020-04-12 17:42:09 -04:00
bc20967262
Update bundle_ja.properties ( #1848 )
...
* update
* update
* update
2020-04-12 13:36:01 -04:00
501253d13a
added name of player to ban/kick/vote-kick/un-admin/admin confirmation dialog ( #1846 )
...
* added name of player to baning/kicking/vote-kicking/admining
* slight tweaks
* fixed redundant things
2020-04-12 10:52:05 -04:00
603d8b16d0
Various tweaks
2020-04-12 10:26:18 -04:00
9e811be477
Name which map name has a conflict when importing ( #1844 )
2020-04-12 09:56:36 -04:00
f163601262
Better unit control effects
2020-04-11 11:34:51 -04:00
b1f32d241b
Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0
...
# Conflicts:
# core/assets/bundles/bundle_uk_UA.properties
# core/src/mindustry/core/NetClient.java
# core/src/mindustry/ui/fragments/PlayerListFragment.java
# core/src/mindustry/world/blocks/power/ImpactReactor.java
# gradle.properties
2020-04-11 10:37:52 -04:00
3bb2b646db
Networked unit control / Mimic AI prototype
2020-04-11 10:03:47 -04:00
7dca6b2a30
Other tweaks
2020-04-10 19:17:40 -04:00
758ace353e
Laser turret behavior changes
2020-04-10 19:15:14 -04:00
9c1730685c
Czech translation - up to date ( #1836 )
2020-04-10 18:45:01 -04:00
67a084a5e7
Cleanup
2020-04-10 13:49:36 -04:00
2395bc9308
Bugfixes / Testing reaper sprite
2020-04-10 12:55:58 -04:00
aedd047c6f
Slightly improved mod dialog
2020-04-10 11:49:22 -04:00
4ec85ae72b
Update bundle_pt_BR.properties ( #1833 )
...
Some changes on turrets description.
2020-04-10 08:34:17 -04:00
5ac8ae2a00
I18n es tiny fix ( #1835 )
...
* Update some translations into spanish.
* Need a white space between #wave_number and wave word (in spanish).
2020-04-10 08:34:09 -04:00
b4739e6036
Simpler sun shader
2020-04-09 21:15:42 -04:00
dedb63e9b6
tweaks
2020-04-09 21:03:16 -04:00
803538d5be
Better detail
2020-04-09 20:55:59 -04:00
1efbd9dcf2
Faster shaders (?)
2020-04-09 20:50:11 -04:00
0a2ff97eb0
Update bundle_pt_BR.properties ( #1830 )
2020-04-09 09:59:03 -04:00
2c3e473b0f
Updated translation for bundle_in_ID.properties ( #1824 )
...
* New translation added for Bahasa
I will add more translation and also review it soon again.
* Update bundle_in_ID.properties
* Update bundle_in_ID.properties
Updated ID translation for the description in campaign mode.
* Update bundle_in_ID.properties
More update for the Indonesian language including :
▪Even more translation (of course)
▪Fixed captialization and spelling
▪Fixed already existing translation
(almost finished)
* Finished translation for Bahasa
• Fixed few missed spellings
• Added new translation
• Finished translation (I'm not sure for the items)
This the last commit for this pull request :)
2020-04-09 09:37:34 -04:00
2a74bb742b
Added landing sound
2020-04-08 22:06:43 -04:00
a241d6f5bb
Minor cleanup
2020-04-08 10:54:45 -04:00
7b25b09c18
Bugfixes
2020-04-07 14:08:42 -04:00
5fbe925429
Revert "Moved launch button"
...
This reverts commit 83bc3e4e
2020-04-07 11:29:23 -04:00
18aa9fc15e
Update bundle_ru.properties ( #1827 )
2020-04-07 09:13:38 -04:00
