Commit Graph

12766 Commits

Author SHA1 Message Date
Anuken
66f56d9e98 Merge remote-tracking branch 'origin/master' 2021-09-18 14:33:03 -04:00
Anuken
3f996cf294 Better bullet range calc 2021-09-18 14:32:57 -04:00
JrTRinny
47dc9c7b31 add playerControllable for turrets (#6019) 2021-09-18 09:52:31 -04:00
Kowkodivka
e4e1bac2aa [RU] Multiplayer translate (#6014)
Перевел строчку "servers.local.steam = Open Games & Local Servers".
2021-09-17 21:39:49 -04:00
Anuken
61fa72dcd3 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features
 Conflicts:
	core/src/mindustry/graphics/g3d/PlanetRenderer.java
2021-09-17 21:33:01 -04:00
Anuken
5d5d1f8953 0 scroll support 2021-09-17 21:32:43 -04:00
Anuken
cdb12a381d Custom background renderer support for mods 2021-09-17 21:20:16 -04:00
Anuken
01771c5288 Merge remote-tracking branch 'origin/master' 2021-09-17 11:46:58 -04:00
Anuken
58a21c3cc7 Arc compatibility 2021-09-17 11:46:52 -04:00
Anuken
263850624a Cleanup 2021-09-17 11:36:57 -04:00
Kowkodivka
effd226c3e [RU] Settings translate (#6013)
Перевел 2 строчки в настройках графики.
2021-09-17 11:33:46 -04:00
Anuken
e08e51b939 Planet background system 2021-09-17 11:23:32 -04:00
Kowkodivka
8ccca23a24 Update bundle_ru.properties (#6012)
Translated "status.overdrive.name"
2021-09-17 10:16:03 -04:00
Anuken
84935e1bb0 Fixed #6008 2021-09-16 21:25:31 -04:00
Anuken
32baf06c97 Experimental alternate Serpulo generation / Spawn margin decrease 2021-09-16 18:10:38 -04:00
Anuken
76b0ca53c5 Fixed wall assignment 2021-09-16 15:48:08 -04:00
Anuken
18d34c5854 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 14:18:24 -04:00
Anuken
ed911d87a3 Planet rendering refactoring 2021-09-16 14:18:17 -04:00
Anuken
0756da0dd1 Fixed shader warnings 2021-09-16 12:41:45 -04:00
Anuken
c9fa7356c2 Asteroid background improvements 2021-09-16 12:40:35 -04:00
Anuken
ad425f322c Proper asteroid albedo 2021-09-16 10:33:15 -04:00
Anuken
a8fd047cd6 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-16 10:23:31 -04:00
Anuken
845b64945e "Realistic" specular planet lighting 2021-09-16 10:20:32 -04:00
Anuken
7b623e964c gitignore fixes 2021-09-15 22:34:15 -04:00
Anuken
e3cceea1af Re-trying JITPack 2021-09-15 22:30:53 -04:00
Anuken
e86171e3c7 Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-15 20:51:57 -04:00
Anuken
c4fe53955b Moved Scripts loaders to Vars.tree.loadSound/Music 2021-09-15 11:24:39 -04:00
Anuken
0068952ba6 Content parser listener 2021-09-15 10:49:22 -04:00
Anuken
a3b3745d01 Merge remote-tracking branch 'origin/master' 2021-09-14 21:28:39 -04:00
Anuken
95c3476144 Fixed #6001 2021-09-14 21:28:34 -04:00
Matthew Peng
4cb3bef1a7 Parentize Vela and Corvus shoot effects (#5997) 2021-09-14 14:24:19 -04:00
Darkness#3729
248f59131b [RU] Translation of all latest bundles (#5985)
* [RU] Translation of all latest bundles

* Also this line

* Update bundle_ru.properties

* Fix
2021-09-14 12:52:19 -04:00
Anuken
72841afd96 too soon, apparently 2021-09-14 12:29:29 -04:00
Anuken
eb9c3c8033 Use JDK 17 for tests 2021-09-14 12:25:09 -04:00
Anuken
e23837a4ba Updated RoboVM / Switched to hard-coded SDK platform jar 2021-09-14 12:21:07 -04:00
Anuken
625f2640d8 Merge remote-tracking branch 'origin/master' 2021-09-14 09:55:40 -04:00
Anuken
01c67b77cb Fixed #5995 2021-09-14 09:55:35 -04:00
JrTRinny
63b39cdb72 there is no cliffs (#5991) 2021-09-14 09:32:08 -04:00
Rex
be0397355f br (#5990) 2021-09-13 21:08:42 -04:00
TNT331PRD
689b5af2fb Minty (#5987)
Additional server
2021-09-13 20:54:43 -04:00
Anuken
ba0892fdcb Merge branch 'master' of https://github.com/Anuken/Mindustry into 7.0-features 2021-09-13 20:52:41 -04:00
Rex
d36a00a6fe update bundle_es.properties (#5989)
* Update bundle_es.properties

* Update bundle_es.properties

* 131

* support units

* fixed
2021-09-13 20:08:40 -04:00
RebornTrack970
8dfa349484 V6 2r2t (#5986) 2021-09-13 18:42:34 -04:00
Darkness6030
2906c61d06 Prevent players to kick themselves (#5988) 2021-09-13 13:39:23 -04:00
Anuken
e1ba9f16f6 Merge remote-tracking branch 'origin/master' 2021-09-13 09:04:01 -04:00
Anuken
826ddf4aad strip message newlines 2021-09-13 09:03:56 -04:00
kituta
d20048fe11 Update bundle_ja.properties (#5849)
* Update bundle_ja.properties

Addition. //追加
Changed wording of the toolmode. //toolmodeの文言を変更
Small fixes. //小さな修正

* Update bundle_ja.properties

Change of wording //文言の変更

* Update bundle_ja.properties

Addition. //追加

* Update bundle_ja.properties

Addition. //追加
366 editor.cliffs = Walls To Cliffs は「建築不能領域を表す断崖の壁を描く機能」だと思いますが、把握できていないため未翻訳で置いておきます。
「断崖を描く」

* Update bundle_ja.properties

Add

* Update bundle_ja.properties

fix //句点を忘れていました

* Update bundle_ja.properties

Small fixes. //小さな修正
2021-09-13 08:44:13 -04:00
Anuken
edbe795aa5 Merge remote-tracking branch 'origin/master' v131 2021-09-12 20:21:59 -04:00
Anuken
087cd2c55a Cleanup 2021-09-12 20:21:55 -04:00
fuzzbuck
ca62deaaa9 Change io event server (#5981)
(offline at this time) will used for events & seasonal modes
2021-09-12 15:09:52 -04:00