Commit Graph

3947 Commits

Author SHA1 Message Date
Anuken
e4cdf515c9 More workshop implementation 2019-09-10 20:53:31 -04:00
Anuken
7aa71a7201 Steam workshop publishing 2019-09-10 14:25:34 -04:00
Anuken
6fe55661ed Bugfixes / Fixed #639 2019-09-09 19:06:11 -04:00
Anuken
af89efcfc4 Update links to match Steam policy 2019-09-09 17:05:36 -04:00
Anuken
82493c596d Merge remote-tracking branch 'origin/master' 2019-09-09 16:22:40 -04:00
Anuken
5a3fbf33df Made all color names lowercase for consistent style 2019-09-09 16:22:29 -04:00
Anuken
5bed0f3bcc
Update LoadDialog.java 2019-09-09 00:03:55 -04:00
Anuken
b867cdb8b9 Map fix 2019-09-08 23:33:21 -04:00
Anuken
3bac32e04a Dialog fix 2019-09-08 23:30:15 -04:00
Anuken
c4c0f45228 cleaning up what remains 2019-09-08 22:55:36 -04:00
Anuken
d981bb95b9 it is gone 2019-09-08 22:32:47 -04:00
Anuken
c9f0a59339 time for a crusade against dialogs 2019-09-08 15:08:55 -04:00
Anuken
ec58e868fd
Update bundle.properties 2019-09-08 11:35:38 -04:00
Ulysses2
aa5152ac70 Update Router.java (#643) 2019-09-08 09:31:49 -04:00
Anuken
2cc627e7d0 Merged net module 2019-09-07 16:55:09 -04:00
Anuken
8653e7bbb1 Cleanup 2019-09-07 16:03:20 -04:00
Anuken
4fb7430fb7 More cleanup, removed connection IDs 2019-09-07 15:23:13 -04:00
Anuken
e90c8c4d3e Extensive network refactor 2019-09-07 14:11:50 -04:00
Anuken
06e6deae42 More cleanup 2019-09-07 12:10:26 -04:00
Anuken
05ab62f038 merge 2019-09-06 22:51:35 -04:00
Anuken
168011586b More file chooser fixes 2019-09-06 22:09:54 -04:00
Anuken
b5f1e566b2 New Android file chooser implementation 2019-09-06 21:21:30 -04:00
Anuken
ff54629550 Merge 2019-09-06 13:58:32 -04:00
Anuken
b492c7ae27 Bugfixes 2019-09-05 21:44:49 -04:00
Anuken
5651d1b023 Support for built-in servers 2019-09-05 19:23:17 -04:00
Anuken
3cbb02f9fb Merge remote-tracking branch 'origin/master' 2019-09-04 23:16:33 -04:00
Anuken
0f79298c28 Many various fixes 2019-09-04 23:16:26 -04:00
Anuken
8f4bd09635
Update Blocks.java 2019-09-04 10:00:16 -04:00
Anuken
0a9cad2ea6 net fix 2019-09-03 22:59:10 -04:00
Anuken
dc21adfda5 Better spawn animations 2019-09-03 22:55:46 -04:00
Anuken
a7bfe18f4a Player limit / Server mode display / Crash fixes / More save info 2019-09-03 19:14:33 -04:00
Anuken
9cc76a148b Utility methods 2019-09-03 08:36:59 -04:00
Anuken
1d95a255bc Bugfixes 2019-09-03 08:21:23 -04:00
Anuken
b2c35d45c3 merge 2 2019-09-02 21:07:40 -04:00
Anuken
35ab90e445 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	core/src/io/anuke/mindustry/core/NetServer.java
2019-09-02 21:07:15 -04:00
Anuken
316f4d471f Fixed iOS crash 2019-09-02 20:58:15 -04:00
J-VdS
ef0b56eb22 Extra events (#630)
* eventype player join

* playerjoin event

* player leave

* player leave event

* typo

* remove

* leave fix
2019-09-02 19:37:38 -04:00
Anuken
2c0d2c5e22
Update NetServer.java 2019-09-02 12:37:25 -04:00
Anuken
9eed39c2ae
Update NetServer.java 2019-09-02 12:34:15 -04:00
Anuken
e8d89b6c43 Bugfixes 2019-09-01 15:52:07 -04:00
Anuken
494c3ffbc4 💥 2019-09-01 13:34:20 -04:00
Anuken
40d27c787c Fixed drones not finding blocked ores 2019-09-01 13:21:20 -04:00
Anuken
2fe5b44698 Java 8+ plugin load fix 2019-09-01 11:01:04 -04:00
Anuken
5cc32b9001 Fixed map loading bugs 2019-09-01 10:46:44 -04:00
Anuken
d481af43c7 Fixed "disconnected" bug / Updated menu music 2019-09-01 10:19:13 -04:00
Anuken
1cd43f938f Bugfixes 2019-09-01 00:45:54 -04:00
Anuken
528f5295c2 Slightly more informative D/C messages 2019-09-01 00:39:08 -04:00
Anuken
c684c32abe Merge branch 'master' of https://github.com/Anuken/Mindustry into steam 2019-08-31 17:04:23 -04:00
DeltaRays
a2772d09f3 Update bundle_it.properties (#626) 2019-08-31 13:59:52 -04:00
Anuken
a0016f001c Updated bundles 2019-08-31 13:08:06 -04:00
Prosta4okua
ca532f271f [WIP] Ukr&Rus Translation (#607)
* Fixes

* Капіталізація це зло.

* Update bundle_ru.properties

* Update bundle_uk_UA.properties

* .-.

* Gm

Description

* Oof

* ЈҮУКЕНГШҺЗХҸЖДЛОРПАВЫӘЧСМИТҒБӨ

* dada

* Translate new descriptions

* й

* Ukrainian finished. Fixed some errors.

* Translated everything. Maybe.

* /

* 1

* Added tutorial. Thank to Slava0135 and ymomfe.

* 1

* 1

* WATER

WATER

* [[]]

* 1

* gmmm

/-/-/-/

* idk what i changed

* Обновление и корректировка строк с 1 по 90

* router

* Обновление и корректировка строк с 87 по 252

Обновление и корректировка строк с 87 по 252, а так же правка предыдущих.
- 35 строку лучше привести в соответствии с оригинальным текстом, без дополнений и пояснений.
- 103 строка не переводится в соответствии с https://semver.org/lang/ru/ , хотя это не жёсткое правило, поскольку не влияет непосредственно на алгоритм работы с версиями.
- 187 Предлагаю эту строку перевести как 'Настройки карты', не смотря на оригинальный текст (соответственно и 230, 231).

* router

* Обновление и корректировка строк с 253 по 321 - "WorldEditor Update"

Обновление и корректировка строк с 253 по 321, а так же предыдущих.
- Разобраться с 297 строкой ("filter.option.percentile").
- Разобраться с местами применения 322 строки.

* озарение в переводе ;D

* Fixed "В"

* Unfinished Ukrainian language.

* Small fixes.

* Обновление и корректировка строк с 322 по 377 - "Campaign Update"

Обновление и корректировка строк с 322 по 377, а так же предыдущих.
- По прежнему нужно разобраться с 297 строкой ("filter.option.percentile"). Добавил метку для отличия функционала. Проверю и уберу к следующей сборке.

* Мелкие правки

* From additional improvements.
2019-08-31 13:07:02 -04:00
Anuken
89402fd097 removeCommand() 2019-08-31 13:00:34 -04:00
ichthyosaurus
75451743aa Update bundle_de.properties (#620) 2019-08-31 12:12:07 -04:00
AmateurPotion
b4d9a6a507 Update bundle_ko.properties (#618)
* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties

* Update bundle_ko.properties
2019-08-31 12:11:01 -04:00
VizardAlpha
335afa56a1 bundle_fr_BE.properties (#617)
* bundle_fr_BE.properties

* Small fix

https://fr.m.wikipedia.org/wiki/Flou_lumineux
2019-08-31 12:10:54 -04:00
laohuaji233
485592bdac Update bundle_zh_CN.properties (#612)
* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties

* Update bundle_zh_CN.properties
2019-08-31 12:05:49 -04:00
FranLamark
ee9289fc24 Update bundle_es.propierties (Spanish trasnlation to the game) (#611)
* Update bundle_es.propierties

Translated mostly (i hope every) stuff in english, and edit some spanish stuff too. Gaven specially to some ores more descriptive names, and bring specially translation in spanish to newer things like draugs factories, information about this one, and related newer things.

* Update bundle_es.properties
2019-08-31 12:05:42 -04:00
Spico (Spirit Guy)
a0c281a0a9 Update to Turkish Translation (#610)
Updated lines between 1 to 100.
Some tutorial messages are missing, going to translate them later on.
2019-08-31 12:05:08 -04:00
Dominik
ad0b0858f6 Update bundle_pl.properties (#608)
* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties

* Update bundle_pl.properties
2019-08-31 12:05:00 -04:00
itskatt
c2191872ac [READY TO MERGE] French translation (#594)
* first step

* More progress

* Translate zones

* More translating

* Remove redundant part

* Translate ~100 lines

* Update bundle_fr.properties

* Update bundle_fr.properties

* More translating

* Translate over 1k lines, start translating the tutorial

* Rearange the french bundle like the original one

* Translate more lines from the tutorial

* Finish translating the tutorial + few adjustments

* Start translating the item descriptions

* More item description translating

* few parts that i've missed

* sync files + few changes

* not much

* Apply suggestions from AzariasB's code review

Co-Authored-By: Azarias Boutin <AzariasB@users.noreply.github.com>

* Few changes + add AzariasB to the contributors

* Translate new additions

* small fixes

* More small fixes
2019-08-31 12:04:52 -04:00
Anuken
5f361413bb /sync command 2019-08-31 10:14:26 -04:00
Anuken
3414026828 Crash fix 2019-08-31 09:50:05 -04:00
Anuken
7089fae0d5 Map fixes 2019-08-31 09:45:27 -04:00
Anuken
80bdf1e19c Bugfix 2019-08-31 08:47:53 -04:00
Anuken
e0c1f2a31a Minor save fixes 2019-08-30 23:39:29 -04:00
Anuken
92cfa2b033 1x deconstruction speed 2019-08-30 22:16:18 -04:00
Anuken
877cd5968c Tweaks 2019-08-30 21:37:10 -04:00
Anuken
b39464a7d1 Merged save previews 2019-08-30 20:13:03 -04:00
Anuken
52332e5821 Bugfixes 2019-08-30 20:11:48 -04:00
Anuken
7f2c7685b4 Lobby prefs 2019-08-30 19:49:36 -04:00
Anuken
44544020ec Platform cleanup 2019-08-30 17:35:26 -04:00
Anuken
3b9d3fd233 Platform cleanup 2019-08-30 17:32:49 -04:00
Anuken
4e2d2ee378 Steam cleanup 2019-08-30 17:25:37 -04:00
Anuken
7aafa8b150 Merge 2019-08-30 16:39:40 -04:00
Anuken
6d9a59c60b More cleanup 2019-08-30 16:37:04 -04:00
Anuken
39e0977231 Entity cleanup 2019-08-30 16:00:09 -04:00
Anuken
f8f140090f Fixed #623 2019-08-30 15:52:55 -04:00
Anuken
f063f7b2d3 Minor tweaks 2019-08-30 15:17:05 -04:00
Anuken
60306f146f Campaign slot preview 2019-08-30 15:08:43 -04:00
Anuken
3b873b7cb2 Merge branches 'master' and 'save-preview' of https://github.com/Anuken/Mindustry into save-preview 2019-08-30 15:01:48 -04:00
Anuken
26d44ea030 Save slot previews 2019-08-30 15:01:38 -04:00
Anuken
b369751a75 Bugfixes 2019-08-30 13:56:33 -04:00
Anuken
6e2cd81c9f Save previews 2019-08-30 13:53:19 -04:00
Anuken
233ae99d3f Added teamchat 2019-08-29 23:22:47 -04:00
Anuken
ddca5ef25a Data export/import 2019-08-29 22:04:01 -04:00
Anuken
25af0c4302 Added bleeding edge info 2019-08-29 19:07:00 -04:00
Anuken
ae4e3e2d33 Updated travis.yml 2019-08-29 17:07:58 -04:00
Anuken
641937f952 Automatic custom game saves 2019-08-29 08:53:41 -04:00
Anuken
b5ed309405 Page fix 2019-08-28 22:44:19 -04:00
Anuken
57924afa3f Moved plugin files 2019-08-28 22:12:25 -04:00
Anuken
b095840dc8 Votekick 2019-08-28 21:57:09 -04:00
Anuken
5f9370da9a Server plugins + clientside commands 2019-08-28 20:38:12 -04:00
Anuken
3ce870fb19 Building fix 2019-08-28 16:17:04 -04:00
Anuken
05c0fd2f40 Bugfixes 2019-08-28 13:18:27 -04:00
Anuken
3d69e9c763 Fixed incorrect asset loading 2019-08-27 22:53:24 -04:00
Anuken
9f5a0ca4e9 Fixed crash on load 2019-08-27 21:11:39 -04:00
Anuken
43245681fe Merge branches 'asset-manager' and 'master' of https://github.com/Anuken/Mindustry 2019-08-27 19:40:13 -04:00
Anuken
5134aca723 Put zone previews into atlas 2019-08-27 19:33:41 -04:00
Anuken
40405332ec Additional improvements 2019-08-27 18:34:38 -04:00
Anuken
8d61f3b479 Fixed some crashes 2019-08-27 18:25:38 -04:00