Commit Graph

7617 Commits

Author SHA1 Message Date
Felix Corvus
69dae20275 ru translation respawn line fix 2020-07-20 05:16:57 +03:00
Felix Corvus
f0acfb3cf3 бесконечные правки 2020-07-18 17:43:20 +03:00
Felix Corvus
22ff8e2b9b hmm 2020-07-16 17:44:24 +03:00
Felix Corvus
df7285a1f5 Update bundle_ru.properties 2020-07-16 15:10:36 +03:00
Felix Corvus
6d55285b62 Update bundle_ru.properties 2020-07-16 14:23:34 +03:00
Felix Corvus
83d334582b Update bundle_ru.properties
Changes from https://github.com/Anuken/Mindustry/pull/2225
2020-07-14 07:24:40 +03:00
Prosta4okua
24071ed23b Merge branch 'master' into master 2020-06-28 19:41:37 +03:00
Prosta4okua
e1e9b28bf1 Ненужная большая буква + обновление с master.
1. Вы -> вы
2. Ваш -> ваш
«Вы» используется только в деловом общении.
2020-06-28 19:34:12 +03:00
Anuken
6386cae19a Launching dialog bugfixes & requirement display 2020-06-28 11:40:03 -04:00
Anuken
bd274f804a Loadout selection + custom loadout schematics 2020-06-27 23:04:38 -04:00
Anuken
63356e96ec Merge remote-tracking branch 'origin/master' 2020-06-27 19:16:47 -04:00
Anuken
80332e37d5 Upgradeable cores 2020-06-27 19:16:39 -04:00
Summet
63717bdf51 Small Colored Shields Improvement. (#2193)
When a player places a force projector, the color of its edges will be the color of the player.
2020-06-27 11:06:13 -04:00
Anuken
313cadb763 Minor cleanup / Trail experiment 2020-06-27 09:20:52 -04:00
Anuken
0847b20401 Cleanup 2020-06-26 18:50:30 -04:00
Anuken
7401c16ded Team-colored shields 2020-06-26 18:42:29 -04:00
Anuken
0df4e26736 Cleanup 2020-06-26 15:59:54 -04:00
Anuken
fdf7c88083 argh 2020-06-26 14:27:26 -04:00
Anuken
eabc5c15c7 Codegen for an inheritance tree 2020-06-26 11:58:35 -04:00
Anuken
96f41b0cf3 Cleanup 2020-06-25 22:34:38 -04:00
Anuken
c12865eabc Removed reload, forced mandatory mod restart 2020-06-25 22:31:47 -04:00
Anuken
ecfac00c30 Arc 2020-06-25 12:54:55 -04:00
Anuken
d90807b29c Bugfixes 2020-06-25 12:51:30 -04:00
Anuken
19cb144cdb Minor GL fixes 2020-06-24 20:37:49 -04:00
Anuken
b204074690 More multiplayer fixes 2020-06-24 10:07:05 -04:00
Anuken
d5c758c18a arc 2020-06-23 22:47:40 -04:00
Anuken
843be42568 More multiplayer bugfixes 2020-06-23 22:46:28 -04:00
Anuken
db2f61ec29 less instant disconnect, more broken multiplayer 2020-06-23 21:07:20 -04:00
Anuken
d095008e7c Some initial multiplayer bugfixes 2020-06-23 20:01:55 -04:00
Anuken
fc8e1d5b6d Bugfixes 2020-06-23 16:27:32 -04:00
Anuken
ba78eab30a Proper player icons 2020-06-23 15:40:24 -04:00
Anuken
7b7e803011 Cleanup 2020-06-22 23:08:59 -04:00
Anuken
7dfd20d020 Core launch cost 2020-06-22 21:02:53 -04:00
Anuken
58d8e22b40 Added smooth camera option 2020-06-22 13:40:04 -04:00
Anuken
47b06d0eac Added sandstorm weather 2020-06-22 11:10:12 -04:00
Anuken
42c323365a Removed CoreLauncher 2020-06-21 20:22:20 -04:00
Anuken
9c69e3a1a0 Bugfixes / Sector preset cleanup 2020-06-21 16:00:26 -04:00
Anuken
4a8be42258 Lowercase enums 2020-06-21 12:38:59 -04:00
Anuken
6f1a64db78 Updated atlas with correct enum names 2020-06-21 12:25:11 -04:00
Anuken
934db24d3b Renamed Texture enums with correct case 2020-06-21 12:20:02 -04:00
Anuken
93ae73abb6 Sprite cleanup 2020-06-21 10:38:13 -04:00
Anuken
71ea9b3bd9 (IntelliJ refuses to add new files after refresh) 2020-06-21 10:34:00 -04:00
Anuken
6517eaf62f Implemented #2177 2020-06-21 10:33:08 -04:00
Anuken
a0f0640729 Testing liquids/items in tech tree 2020-06-20 22:21:43 -04:00
Anuken
2082976783 Merge remote-tracking branch 'origin/master' 2020-06-20 12:28:31 -04:00
Anuken
25338ff1cf Removed CampaignData.java/GlobalData.java 2020-06-20 12:28:24 -04:00
Patrick 'Quezler' Mounier
e41d2d66c5 Make room for a space (#2179) 2020-06-20 11:35:26 -04:00
Anuken
ec4a5880b7 Fixed #2178 2020-06-20 09:07:35 -04:00
Anuken
f419de0fad Fixed some tech tree layout issues 2020-06-19 23:36:21 -04:00
Anuken
6bcc103cf7 Research system progress 2020-06-19 19:31:14 -04:00