0ecfc426ff
(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-03 16:22:12 +03:00
0dd1823eb1
(44a496915) Added: Template for using a video with the Welcome text in the tutorial if needed. Removed: Old spritesheets. Fixed: Bug in fetching crew with certain jobs
2019-04-03 16:21:57 +03:00
e4eb6c131c
(c225b9831) Fixed crashing if none of the selected content packages contain location portraits suitable for the main menu.
2019-04-03 16:20:52 +03:00
4009a2f2b7
(5ef33c5cd) Revert "Set preview image size a bit larger to commodate larger resolutions and to get a clear image". Loading the preview image caused the game to hang.
2019-04-02 12:41:46 +03:00
95fb792cd6
(06f76e063) Set preview image size a bit larger to commodate larger resolutions and to get a clear image
2019-04-02 12:40:22 +03:00
1aad8b2038
(007519ad5) Higher-res submarine preview images
2019-04-02 12:40:08 +03:00
34ee220bc9
(bb5ebaee3) Minor layout improvements to New Game and Game Settings
2019-04-02 12:39:42 +03:00
cae366e807
(4d924cc86) Fixes to New Game and Game Settings layouts
...
+ merge fix
2019-04-01 22:55:04 +03:00
6332a6e077
(c896c51fb) Display submarine preview in the "new game" menu, layout tweaks
2019-04-01 22:52:31 +03:00
26210da6a6
(7076afabd) Reimplemented the "new game" menu changes in b378675 using layout groups
2019-04-01 22:52:04 +03:00
a3eabfabac
(2400ab447) Revert "Improved New Game panel" (easier to do the columns with layoutgroups than by setting the contents to half the width)
2019-04-01 22:51:50 +03:00
508bd960be
(b378675eb) Improved New Game panel
2019-04-01 22:51:21 +03:00
2eaf22683d
(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)
2019-04-01 22:47:22 +03:00
ec7e23061b
(38b5d9aad) Experimental changes to syncing ragdolled (unconscious/dead) characters: - Higher error tolerance when syncing the positions. It's often hard to get the main limb exactly to the same position as the collider, because the positions of the limbs aren't synced and the pose of the ragdoll may differ between the server and clients. Increasing the tolerance makes it less likely for dead/unconscious characters to "twitch" when the game attempts to force the main limb to the position of the collider. - If the position of the ragdoll differs from the position of the collider so much that CheckDistFromCollider disables limb collisions, apply an additional force to all limbs to force the ragdoll to the correct position. Otherwise the ragdoll can occasionally start "hanging" midair, clipping through solid objects, because the main limb's pull joint doesn't necessarily have enough force to pull the entire ragdoll up to the collider.
2019-04-01 22:47:03 +03:00
0ca4a8db06
(169dbd4fd) Increased submarine masses to make it less easy for characters to push them around.
2019-04-01 14:26:29 +03:00
7e67c20ccd
(b99c0ef39) Fix the enemies not selecting another attack if they cannot reach the target.
2019-04-01 14:26:01 +03:00
7971d8d3a7
(f0911ad58) Scale settings menu according to screen resolution, repositioned main menu tabs so that they don't overlap with the menu buttons
2019-04-01 14:25:46 +03:00
848b069ab2
(fc5127152) Fixed inability to select a submarine in the multiplayer campaign setup UI due to the PAX checks
2019-03-31 19:12:52 +03:00
fa2a338d73
(b8f75ee96) Fixed level inequality errors caused by 866621c. Accessing the level start/end location properties during level generation caused the seed of RandSync.Server to be changed. Now generating a new random location uses a new MTRandom instance and doesn't touch RandSync.Server.
2019-03-31 19:12:27 +03:00
0b098efbf6
(92a838f87) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-29 21:50:58 +02:00
6f919a4de0
(f8907b59f) Added: Proper scaling based on resolution for VideoPlayer. Modified: IsFlooding check of contextual tutorial to require water volume
2019-03-29 21:50:44 +02:00
45e33bca28
(3f574078d) Fixed items emitting light from inside containers in the sub editor. Closes #1365
2019-03-29 17:27:08 +02:00
ddfd7274e9
(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-29 17:24:17 +02:00
ca08b803dc
(891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions
2019-03-29 17:24:02 +02:00
4c1726ed63
(ad2b7c007) Disable editing the vanilla subs in release builds (The subs can still be saved with another name -> can create copies). Change and and add some texts.
2019-03-29 17:22:07 +02:00
e6c3d6d537
(6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 21:00:33 +02:00
7c8f19ee14
(875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 20:56:29 +02:00
3b786d7ded
(e311dc982) Continue working on Charybdis. Add some deformations. Tweak the joints. Redefine the limb types. Tune the animations.
2019-03-27 20:56:14 +02:00
86d1102f56
(88961a6ea) Fix wrong spelling: Blatter -> Bladder.
2019-03-27 20:56:01 +02:00
9c5b43bf72
(02c733ec8) Added: Notion of how to rewatch the tutorial instructions
2019-03-27 20:55:06 +02:00
81833e7920
(65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 20:54:53 +02:00
6ca760ceda
(93f4e5d57) Allow repair tools to hit structures even if the barrel is inside the structure. Possibly closes #1306
2019-03-27 20:54:40 +02:00
ac60c9477e
(d8c40ca6c) Merge branch 'dev' into tutorial-rework
2019-03-27 20:54:27 +02:00
86ded4b1d5
(2f573ba39) Fix Hammerhead spritesheet orientation.
2019-03-27 20:54:13 +02:00
4cb3469c4f
(8f9250974) Fix spritesheet orientation offestting the joint widgets in the wrong direction, which made it a bit difficult to use.
2019-03-27 20:54:00 +02:00
080ac78ded
(5c35a640e) Update tutorial-rework with dev
2019-03-27 20:52:47 +02:00
b66bdb6da4
(a7d754a40) Fixed: ContextualTutorial not resetting properly when quitting a single player campaign session and starting a new game after. Added: Forced on for contextual tutorial when the selected sub is 'PAX'
2019-03-27 20:52:16 +02:00
3f82c9a2cb
(f417b026f) Fetched: Changes for playing video tutorial from local branch
2019-03-27 20:45:14 +02:00
eada5e222a
(4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 13:52:38 +02:00
8d42f777db
(3525199b1) First iteration of the new Charybdis (incomplete). TODO: tweak joints and animations, add deformations, attacks, ai, and sounds.
2019-03-27 13:52:22 +02:00
fd56875e95
(98a962701) Close the save/load dialogs when leaving the sub editor. Otherwise they'll still be visible when re-entering the editor, and saving at that point will overwrite the previously loaded sub with an empty one. Closes #1357
2019-03-27 11:31:30 +02:00
6fd4d14497
(8b8693dbf) Allow editing selected wires in wiring mode, made connection panels a little less transparent. Closes #1329
2019-03-26 17:34:35 +02:00
237f164123
(afe15e7b2) Fixed server sending campaign saves and campaign character data to clients after the game mode has been switched to something else. Closes #1346
2019-03-26 17:12:45 +02:00
6c4649fe3f
(4b1fa5c86) Fixed client-side console errors during campaign setup because the client tried to load save files that only exist server-side. Now the server sends the information needed for the campaign setup window in the CAMPAIGN_SETUP_INFO message.
2019-03-26 17:10:20 +02:00
93f2dfb185
(628aa768f) Fix characters always being created in the default folder ( #1330 ).
2019-03-26 17:09:35 +02:00
705d05a308
(652745ae0) Fix a crash due to invalid physics when scaling the Mudraptor. If the ragdoll still has invalid settings after trying to reset it, just freeze it to prevent crashing. Return boolean and make CheckValidity public so that we can check and react to the invalid ragdoll state elsewhere.
2019-03-26 17:08:53 +02:00
4b3e78b566
(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai
2019-03-26 14:07:11 +02:00
14832e2040
(aea5053bf) Fix wall target position not updated when the submarine moves. Fix latchontoai attach positions and distance checks. Detaching should also work both when the characters can get in and when the submarine velocity is enough to detach the characters. Still not synced, but re-enabled for testing.
2019-03-26 14:06:55 +02:00
d98f0efd66
(0cd6089c2) Disable campaign start button if a round is already running when joining.
2019-03-25 19:51:54 +02:00
cc9ae260a3
58005a8...01f115d
...
commit 01f115d32d768c76d01bc5fad5cfe2e3f88333cc
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Thu Mar 21 13:09:32 2019 +0200
MidRoundSyncing changes (could potentially fix #1281 and #1323 ):
- Don't mark events as "sent to all" if there's a midround syncing client who'll need those events once the midround sync is done.
- Don't keep updating midround syncing clients' unreceived event count as new unique events are created during midround sync, but instead just send the clients the unique events they were missing at the time of joining. Because the new events created during the midround syncing aren't removed anymore, the joining client will be able to receive them when they switch to normal sync. The old behaviour might've lead to cases where the client can't "catch up" with the new events while midround syncing, causing them to time out.
commit 915aeb4e322ad04968556484aea74cf8b0070c3e
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Thu Mar 21 12:16:57 2019 +0200
Fixed end round vote count overlapping with the server log button, display the votes as votes/max instead of y/n.
commit 62e3b272bb0235553562578493bf638a047235ab
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 23:36:03 2019 +0200
Updated handheld sonar UI graphics & moved it to the bottom left corner of the screen
commit b93c7312c6bf4b560c8259e79650dbf1444072c9
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 23:10:08 2019 +0200
Hide the start button from the campaign UI if the client doesn't have the permission to manage the campaign or rounds.
2019-03-21 14:52:00 +02:00
Joonas Rikkonen