Commit Graph

219 Commits

Author SHA1 Message Date
Joonas Rikkonen
cb83984e80 (4ca668169) Fixed: Conflict 2019-05-16 05:58:48 +03:00
Joonas Rikkonen
257889b9cc (42b18ccca) Allow to return to the initial combat mode after retreating. Implement reloading (disabled because only reloads one ammunition) -> TODO: only load ammunition when found in the inventory. Implement a generic method for removing subobjectives and resetting the reference. Refuel the repair tool. 2019-05-16 05:58:15 +03:00
Joonas Rikkonen
412d46169e (1621785a9) Size variants of labels, also reverts 995d492 2019-05-16 05:57:39 +03:00
Joonas Rikkonen
f8ca1444fd (7765c6989) Only show a bunch of pathfinder errors and warnings in debug builds. 2019-05-16 05:57:22 +03:00
Joonas Rikkonen
1ae482a84d (8c8a15639) Implemented new wall textures 2019-05-16 05:56:49 +03:00
Joonas Rikkonen
fe5f386358 (61f67c194) Fix the raycast and angle checks. use the weapon position instead of the character position. 2019-05-16 05:56:16 +03:00
Joonas Rikkonen
0bb541bce8 (2c8e14bca) Added edge variants for new environment base textures 2019-05-16 05:54:50 +03:00
Joonas Rikkonen
e9664d3639 (084340338) Add an aim timer before the weapon can be used. Fix a null reference exception. 2019-05-16 05:54:33 +03:00
Joonas Rikkonen
57302f7bb8 (4ff749939) Added new environment assets for implementation 2019-05-16 05:51:28 +03:00
Joonas Rikkonen
049d3ba795 (e7bd8839d) Remove unused parameters. 2019-05-16 05:51:12 +03:00
Joonas Rikkonen
ef374ada71 (990e36132) Merge branch 'human-ai' into dev 2019-05-16 05:50:20 +03:00
Joonas Rikkonen
068089ae5c (d622ac851) Fix double updates of current orders. 2019-05-16 05:47:36 +03:00
Joonas Rikkonen
306cb77167 (6facb21fe) Reminder to self: save before committing 2019-05-16 05:46:29 +03:00
Joonas Rikkonen
e367f900b8 (2a4bd39c2) Merge branch 'dev' into human-ai 2019-05-16 05:33:13 +03:00
Joonas Rikkonen
3d7a113d75 (048b753e6) Merge branch 'dev' into human-ai 2019-05-16 05:20:29 +03:00
Joonas Rikkonen
108e42edb0 (b5250291f) Merge branch 'dev' into human-ai 2019-05-16 05:15:16 +03:00
Joonas Rikkonen
454dda56c7 (1762f02b3) Merge branch 'dev' into human-ai 2019-05-16 05:08:22 +03:00
Joonas Rikkonen
039d07f693 (a2943d8b7) Merge branch 'dev' into human-ai 2019-05-16 05:04:10 +03:00
Joonas Rikkonen
60f52375e6 (7788ec72a) Test issuing orders automatically. 2019-05-16 05:03:49 +03:00
Joonas Rikkonen
029f5fccda (8df97f638) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-05-06 11:35:46 +03:00
Joonas Rikkonen
26eaf244ed (b17b66c5f) updated remora and drone 2019-05-06 11:35:29 +03:00
Joonas Rikkonen
f42a7c1ec6 (69d450d58) Initialize SteamManager before creating the GameMain instance 2019-05-06 11:34:36 +03:00
Joonas Rikkonen
fb21005258 (6f4bea467) Updated doors 2019-05-03 13:43:47 +03:00
Joonas Rikkonen
b551ae7999 (c1468d39d) Overhauled docking interface (WIP) 2019-05-03 13:39:54 +03:00
Joonas Rikkonen
aa48f19801 (902225da6) More automatic text scaling in places where texts are likely to overflow 2019-04-29 21:13:51 +03:00
Joonas Rikkonen
8737a0e0dd (26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit. 2019-04-29 21:12:47 +03:00
Joonas Rikkonen
e21b4e5efc (529c58f9a) Added a couple of missing texts to EnglishVanilla. Because it may take a while until these can be added, a hard-coded text is used if these lines can't be found. 2019-04-29 21:12:31 +03:00
Joonas Rikkonen
9930a3081c (e082ed22d) Fixed AllowRagdollButton settings not being synced with clients. Might be related to #1297 2019-04-29 21:11:24 +03:00
Joonas Rikkonen
2ffb8d922d (acf0cb343) Fixes to EnableWorkShopItem: - Don't allow enabling if the item is not compatible with the user's version of Barotrauma or if it's a core package that's missing some required files. - Don't allow enabling if the item external files referenced in the content package are not found (e.g. if a mod uses vanilla files but the vanilla files aren't found). 2019-04-29 21:10:51 +03:00
Joonas Rikkonen
d3ef770243 (9122340aa) Fixed inability to enable content packages if some of the files included in the package are already in the game folder (which may happen, for example, if enabling a content package fails) 2019-04-29 21:10:20 +03:00
Joonas Rikkonen
5f3e23f75f (1bd090dc7) Show the audio icon next to characters that are speaking in the single player crew menu 2019-04-23 15:50:00 +03:00
Joonas Rikkonen
b02df8dc87 (2a9ef1568) Fixed missing spaces in a bunch of server settings texts (caused by the proofreading) 2019-04-23 11:19:08 +03:00
Joonas Rikkonen
b6d854fc94 (8b6b6ed4c) Added indication to server preview window if server has VOIP enabled 2019-04-23 11:17:55 +03:00
Joonas Rikkonen
da87fdb1da (65ebd97e5) Disable multiplayer buttons ("server log", "end round", etc) when using a controller (e.g. when operating a railgun) 2019-04-18 12:03:53 +03:00
Joonas Rikkonen
8b4c5b8cd7 (a5643136e) Removed the separate "my character panel" from the top right corner of the screen in MP (not needed anymore because the job preferences etc can be edited in the info menu), removed the radio button below the chatbox (looks bad and not necessary now that we have a dedicated chat hotkey) 2019-04-18 12:03:37 +03:00
Joonas Rikkonen
6262b3ea54 (ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-16 17:12:09 +03:00
Joonas Rikkonen
bd07acf26d (052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0 2019-04-16 17:11:49 +03:00
Joonas Rikkonen
66de47f041 (a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml 2019-04-15 12:06:58 +03:00
Joonas Rikkonen
d59efcc2c0 (58da95a91) Add a todo note. 2019-04-15 11:56:31 +03:00
Joonas Rikkonen
f4275de1ac (845cfe372) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-11 18:26:56 +03:00
Joonas Rikkonen
a57b7184fb (f6c34b377) Fix crawlers not reacting to any targets if properly latched on walls. 2019-04-11 18:26:42 +03:00
Joonas Rikkonen
9b0e0ab278 (ec990ac7c) Save chatbox & crew menu toggle state between rounds 2019-04-11 18:26:26 +03:00
Joonas Rikkonen
e7e858c05b (db7e4d6d5) Fix "crawler balling" caused by crawlers taking damage when targeting the sub and not yet latched on it. 2019-04-11 18:25:58 +03:00
Joonas Rikkonen
16cc5c8bc2 (7960f5b50) Fixed nullref exception when attempting to start a mission round with mission type set to None 2019-04-11 18:25:44 +03:00
Joonas Rikkonen
50317e3626 (1edd7c0b9) Created methods for getting lists of favourite servers and servers you've been to (history) from the GetServers method, changes might be needed 2019-04-11 18:25:15 +03:00
Joonas Rikkonen
c9cdbcc7ed (aa49312e0) Fixed bots failing to do almost anything in multiplayer due to the submarine's team ID not matching theirs 2019-04-11 18:23:47 +03:00
Joonas Rikkonen
2af78d096e (8b3cd3de5) Fixed clients never removing network events the server has already received (!), don't create a new client event if there's already an identical event waiting to be sent 2019-04-11 18:23:17 +03:00
Joonas Rikkonen
5f4797bb1a (c6972d8ed) Fixed ServerInfo not fetching some of the texts from the text xml 2019-04-11 18:22:34 +03:00
Joonas Rikkonen
aa883064c6 (a87395f64) Moved content packages at the bottom of the list in server info panel 2019-04-10 13:29:15 +03:00
Joonas Rikkonen
18f49a3fd4 (1d26e9d80) Improved Server List screen layout 2019-04-10 13:28:58 +03:00