Commit Graph

273 Commits

Author SHA1 Message Date
Joonas Rikkonen 7cf82573d0 (12ed5d203) Disable background music & ambience in the character editor. Closes #1420 2019-04-15 12:04:26 +03:00
Joonas Rikkonen b705b1579c (c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 12:00:49 +03:00
Joonas Rikkonen b4ec36f5bb (2fc72545e) new texts regarding missions and beacons. 2019-04-15 12:00:35 +03:00
Joonas Rikkonen 455fbb013f (158a62970) Don't allow to replace an existing character. TODO: should make this possible later on, but requires additional logic. Fixes #1375. 2019-04-15 12:00:21 +03:00
Joonas Rikkonen 359b8280d3 (25fc82c5f) Fix collider params being written as floats instead of ints. 2019-04-15 12:00:07 +03:00
Joonas Rikkonen 629993f38d (4b2369616) Don't register hotkeys, character controls or other input when the character creation interface is open. 2019-04-15 11:59:53 +03:00
Joonas Rikkonen d6acb8bf09 (9e9c1672d) The wizard now creates box colliders by default. 2019-04-15 11:59:38 +03:00
Joonas Rikkonen a48064d392 (8b7236862) Reset the character editor on exit (if not switching between the game screen). Handle crash when no character file is found (e.g. when an invalid path is defined in the content package). 2019-04-15 11:59:23 +03:00
Joonas Rikkonen b2ec092461 (2f1a4259b) Increase the collider sizes when adjusting them automatically in the editor. 2019-04-15 11:58:54 +03:00
Joonas Rikkonen 2370ca91b6 (52202ffdf) Don't create walk and run animations if the character cannot enter a submarine. 2019-04-15 11:57:56 +03:00
Joonas Rikkonen c3a248e527 (6f8f26a84) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-15 11:57:43 +03:00
Joonas Rikkonen 4675f969f1 (73da2532a) Only repairable items are indestructible in outposts (oxygen tanks, ammo boxes, etc can still deteriorate normally). 2019-04-15 11:57:28 +03:00
Joonas Rikkonen d2756ed948 (d4c4937a6) Change the default path for new characters in the character wizard. Use "Mods" folder instead of "Content". 2019-04-15 11:56:59 +03:00
Joonas Rikkonen 04efb3d471 (6ccb9e6a7) Fix a compile error. 2019-04-15 11:56:04 +03:00
Joonas Rikkonen fcdfee6328 (333e0a646) Added automatic hull & item repair option to the campaign. TODO: adjust costs, now both options cost a fixed 500 credits. Closes #1314 2019-04-15 11:55:49 +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 74c0b22b77 (c13450762) Added All tab to the sub editor screen entity list 2019-04-11 18:22:19 +03:00
Joonas Rikkonen bf953177b9 (7ef195de5) Added server preview to be cleared on server list refresh 2019-04-10 15:14:00 +03:00
Joonas Rikkonen e94228d346 (b948206e8) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-10 13:35:03 +03:00
Joonas Rikkonen 9a54b89bf3 (0eb0c36ec) Fixed door background sprites being drawn in front of characters (TODO: update sprite depths in the subs) 2019-04-10 13:30:25 +03:00
Joonas Rikkonen af260565ad (5fbd1cdee) Reload sprite and reset the depth when reset to prefab method is called. 2019-04-10 13:30:08 +03:00
Joonas Rikkonen 06ac9a04ba (84bc4cdae) Display another message when trying to directly open a door that doesn't have buttons on it (wired to remote buttons/controllers). 2019-04-10 13:29:50 +03:00
Joonas Rikkonen 85acb21069 (22af8c988) Don't crash them game if playing the splash screen fails 2019-04-10 13:29:33 +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
Joonas Rikkonen 40d0a49958 (0946322ab) Fixed file transfer progress bars not being visible in NetLobbyScreen. Closes #1412 2019-04-10 13:25:10 +03:00
Joonas Rikkonen 3877c18d0c (c15419d90) Changelog additions + merge fix 2019-04-08 19:20:05 +03:00
Joonas Rikkonen 71d546ff7f (f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-08 19:17:50 +03:00
Joonas Rikkonen 9a829206af (2c264b075) Improve readability (no functional changes). 2019-04-08 19:17:06 +03:00
Joonas Rikkonen 5d5979c58b (a69e7b9c1) Moved delete button to the top of submarine list in submarine editor load window, to minimize accidental clicks 2019-04-08 19:15:54 +03:00
Joonas Rikkonen 33b8c37933 (3cb6209cf) Show the "starting a round" popup to all clients when the server initiates a new round. Closes #1396 2019-04-08 13:37:27 +03:00
Joonas Rikkonen 24794932dc (b1ed113e0) Randomize map seed when opening the "new game" tab. Closes #1399 2019-04-08 13:37:12 +03:00
Joonas Rikkonen 9594ea67a7 (bf037f9b0) Don't allow deleting vanilla subs or subs that are a part of some content package 2019-04-08 13:36:58 +03:00
Joonas Rikkonen c3ab4b6899 (8825d662c) Small adjustments to workshop layout and created custom buttons for steam links. 2019-04-08 11:45:03 +03:00
Joonas Rikkonen 904a1dabb0 (d5da14437) Fixed all tags not being visible in SteamWorkshopScreen and description box not showing the full description, minor layout tweaks 2019-04-08 11:44:33 +03:00
Joonas Rikkonen 532e8bf122 (2f2a6df6a) Fixed crashing when attempting to publish a sub with a preview image larger than 1MB on the Steam Workshop. Closes #1400 2019-04-08 11:44:20 +03:00
Joonas Rikkonen d16c470df6 (de584e63e) Improved MP campaign setup UI 2019-04-07 21:44:28 +03:00
Joonas Rikkonen d15a88c619 (3e8bdbb0a) v0.8.9.9 + merge fix 2019-04-06 17:54:39 +03:00
Joonas Rikkonen f043ac26f4 (5754c8b91) Fixed incorrectly placed gap in Typhon's cargo room 2019-04-06 17:52:36 +03:00
Joonas Rikkonen dc8b49b5b6 (e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512) 2019-04-06 17:52:23 +03:00
Joonas Rikkonen f80e9a29a7 (301f0a344) Option to set a custom preview image for subs 2019-04-06 17:50:53 +03:00
Joonas Rikkonen 7b3ccde624 (46f58eedd) Set submarine preview image resolution back to 256x128. For some reason, higher resolutions seem to cause hangs for when loading the image. I suspected it was because of encoding the image as a Base64 string into the xml, but that doesn't seem to case: I tried saving the image as a separate file instead, and it still causes the same problem (see #19 in the private repo). 2019-04-06 17:50:27 +03:00
Joonas Rikkonen 8d8478432f (00783cc63) Don't premultiply submarine preview image alpha, fixed background texture not covering the whole preview image when using an image resolution larger than the size of the texture 2019-04-06 17:50:13 +03:00
Joonas Rikkonen 14d0daf16d (ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-06 17:49:31 +03:00
Joonas Rikkonen 45c1ed499a (e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used 2019-04-06 17:49:18 +03:00
Joonas Rikkonen ea463acc60 (e7176c489) Tweaks to the workshop screen 2019-04-06 17:49:05 +03:00
Joonas Rikkonen e086af2c6f (bebc37619) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:20:27 +03:00
Joonas Rikkonen 25768d8845 (4b54fb4bf) Refactor AIObjectiveCombat and the reactions to the damage. Fixes bots not reacting to any damage done with repair tools. Now they should flee (but not retaliate). 2019-04-05 16:20:11 +03:00
Joonas Rikkonen 501a114000 (4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-05 16:19:55 +03:00
Joonas Rikkonen d7364171fb (e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub 2019-04-05 16:19:40 +03:00