Commit Graph

7596 Commits

Author SHA1 Message Date
WinterUnderTheSnow
b12d3ae0ba Corrected some translations
4,5 Noticed that using discord in China need some unusual ways.
19 ‘Gameover’ not ‘Your core has been destroyed!’
105 Mod guide is actually guiding you how to make a mod 
116 ‘dependences’refers to ‘mods needed’,not ‘condition needed’
126 ‘import mod from GitHub’sounds better than’import github mod’
151 I think ‘Your are not invited to play on this server’ sounds better than ‘You are not in the whitelist’.This will stop noobs spamming everywhere.
155 ‘Server admin’ but not ‘Room owner’
156,193,203,206 ‘ban’ is better than ‘blacklist’
195 added one this server’
1000 phantom?Why not Phenom(Yes that CPU) XD (In fact ‘神魂修理机’ is a joke too)
2020-06-28 21:40:17 +08: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
Anuken
08ac91359b Sprite cleanup 2020-06-19 12:26:58 -04:00
Anuken
63eee99aba Merge remote-tracking branch 'origin/master' 2020-06-19 12:26:48 -04:00
Anuken
2280ed6071 Research block tweaks / Merged in #1927 2020-06-19 12:26:41 -04:00
Albert Cerfeda
2ee518c9fc Uppercase initial of 'Trello' (#2174) 2020-06-19 08:06:31 -04:00
Anuken
15623fbe5c Support for local server discovery on Steam 2020-06-18 19:23:42 -04:00
Anuken
daefe6bc1f Cleanup 2020-06-18 18:47:50 -04:00
Anuken
31708b9af7 Exception parsing cleanup 2020-06-18 18:47:34 -04:00
Anuken
fa2df57021 Sector preset shadow fixes 2020-06-18 14:43:53 -04:00