mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-05 16:37:38 +07:00
Code Issues Packages Projects Releases Wiki Activity
5,069 Commits 4 Branches 160 Tags 2.3 GiB
b083f5d8f9
Commit Graph

5069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anuken
758670eb51
Update InputHandler.java 2019-09-30 10:57:48 -04:00
Anuken
c8b12837a4
Update MenuFragment.java 2019-09-30 10:25:49 -04:00
Anuken
f7f854f0d3
Update MenuFragment.java 2019-09-30 10:17:08 -04:00
Anuken
8c27108b0a
Update CrashSender.java 2019-09-30 10:15:27 -04:00
Anuken
7cd220fe8c Display more launch info / Store mod list in saves 2019-09-29 23:40:23 -04:00
Anuken
7fccd18910 Server mod checking 2019-09-29 22:59:23 -04:00
Anuken
73e9f55e55 More tutorial info 2019-09-29 21:51:45 -04:00
Anuken
002a052371 Fixed #748 / Better mod loading 2019-09-29 21:41:32 -04:00
Anuken
0049a0004e Block rotation / Mod loading improvements 2019-09-29 19:54:52 -04:00
Anuken
b0503d9930 Merge branches 'master' and 'mods' of https://github.com/Anuken/Mindustry 
# Conflicts:
#	core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
#	gradle.properties
 2019-09-29 17:03:28 -04:00
Anuken
429bb6ac13 plugins -> mods 2019-09-29 16:52:17 -04:00
Anuken
f1b0ba039c plugins -> mods 2019-09-29 16:26:13 -04:00
Anuken
33416aadef Parsing fixes / Moved annotations to Arc 2019-09-29 16:09:43 -04:00
Anuken
f17e46015a JSON block, item loading 2019-09-29 15:21:50 -04:00
Prosta4okua
2b8878e724 Ukrainian language (#715) 
* 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

* Create description.txt

* Update description.txt

* Create short-description.txt

* Create achievements.vdf

* Update achievements.vdf

* Update bundle_uk_UA.properties

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* Update achievements.vdf

* 000b23d703
^
 2019-09-29 12:53:52 -04:00
Anuken
63744c0a3a 'belts' 2019-09-29 12:39:59 -04:00
Anuken
9c175ac893 Type parsing work 2019-09-29 12:36:01 -04:00
Anuken
c6bc398950 Texture packing 2019-09-29 11:26:25 -04:00
Anuken
4210070d07 Fixed server map shuffling 2019-09-29 10:06:17 -04:00
Anuken
c05fb7ebf1 oh no 2019-09-29 10:05:54 -04:00
Anuken
d35fbb8383 bugfixes 2019-09-29 08:59:53 -04:00
laohuaji233
d9abee3adf
Create description.txt 2019-09-29 13:13:22 +08:00
Anuken
fe3f75f141 Starting work on json content parsing 2019-09-28 23:58:30 -04:00
Anuken
79554bf8e9 Mod import/export dialog, restarting 2019-09-28 23:26:55 -04:00
Anuken
4f9ed73a59 Added mod file tree, bundle loading 2019-09-28 21:13:44 -04:00
Felix Corvus
3d1b6e9fc5 RU translation changes from Vanguard (#9) 
* 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

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties

* Update bundle_ru.properties
 2019-09-29 02:07:30 +03:00
Anuken
2019196f65 Sort Steam server lists, ignore version when unimportant 2019-09-28 18:01:55 -04:00
Anuken
a815763833 Upped lower FPS cap to 15 2019-09-28 16:40:12 -04:00
Anuken
92a3f150bb Thruster fix / Removed info on Steam to prevent confusion 2019-09-28 15:40:31 -04:00
Anuken
000b23d703 Workshop crash fix / Mine balancing 2019-09-28 15:14:29 -04:00
Anuken
438b3d9752 Workshop map updates, removal detection 2019-09-28 13:13:23 -04:00
Anuken
a9edee1550 Made wave events fire on clients 2019-09-28 11:32:34 -04:00
Anuken
b63de8b7d6 iOS cleanup 2019-09-28 11:03:15 -04:00
Anuken
5e0e3f4522 iOS map imports 2019-09-28 10:47:40 -04:00
Anuken
a74722aea5 Bugfixes 2019-09-28 10:34:50 -04:00
Anuken
4e55cbbfe8 Merge remote-tracking branch 'origin/master' 2019-09-28 10:14:48 -04:00
Anuken
5f8b9f301a Added summary.txt 2019-09-28 10:14:27 -04:00
Tunacan427
c387817157 i realised there is squash so no need to care about commits 2019-09-28 16:17:40 +03:00
Anuken
b3666ed2a8 More mod setup 2019-09-27 22:20:16 -04:00
Maxwelllondon92
3b8fd10f70 Create description.txt (#728) 2019-09-27 22:18:19 -04:00
Maxwelllondon92
7c0106e62f Create short-description.txt (#729) 2019-09-27 22:18:13 -04:00
Anuken
8609400d76 Ask players if they want to make games public 2019-09-27 20:39:30 -04:00
Anuken
0b0aa36aab More diagnostic info + crash fix 2019-09-27 20:23:02 -04:00
Anuken
70ab102d8c Mods branch 2019-09-27 19:51:46 -04:00
Tunacan427
1f24d936d8 why do i do so many commits 2019-09-27 23:12:23 +03:00
Anuken
f925ec8cbe Basic kill tracking 2019-09-27 16:04:34 -04:00
Felix Corvus
b603481cf6
🤔 
( ͡° ͜ʖ ͡°)
 2019-09-27 19:29:18 +03:00
Felix Corvus
7dbce6037a
Правки от Vanguard 
Правки от @XEN0PHIL
 2019-09-27 19:02:45 +03:00
Felix Corvus
b7f6ed4a74 Merge branch 'Anuken-master' 2019-09-27 18:42:07 +03:00
Felix Corvus
67bea7ab55 Merge branch 'master' of https://github.com/Anuken/Mindustry into Anuken-master 2019-09-27 18:41:38 +03:00