Commit Graph

127 Commits

Author SHA1 Message Date
Joonas Rikkonen
86ded4b1d5 (2f573ba39) Fix Hammerhead spritesheet orientation. 2019-03-27 20:54:13 +02:00
Joonas Rikkonen
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
Joonas Rikkonen
ad1a726e91 (8d8ed7727) Fixed: Invalid title font & color in tutorial infobo. Added: Some rudimentary scaling based on screen resolution for VideoPlayer 2019-03-27 20:53:46 +02:00
Joonas Rikkonen
8808edcd21 (025652eb8) Fixed: Holding an item preventing interaction with tutorial elements, medical overlay appearing on top of video / info, reactor command tutorial not completing when powered up by the player 2019-03-27 20:53:30 +02:00
Joonas Rikkonen
ec481eba45 (e54f169fe) Better quality videos for tutorial, removed sound 2019-03-27 20:53:17 +02:00
Joonas Rikkonen
0c8772f6a1 (4589e2b8d) Minor changes to tutorial text 2019-03-27 20:53:00 +02:00
Joonas Rikkonen
080ac78ded (5c35a640e) Update tutorial-rework with dev 2019-03-27 20:52:47 +02:00
Joonas Rikkonen
47b16f4f9e (9f4948c63) Fixed: Welcome text size. Added: Using enter / escape to close both videoplayer and infobox to prevent errors when quitting while these are active 2019-03-27 20:52:30 +02:00
Joonas Rikkonen
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
Joonas Rikkonen
018fcb0fa0 (65082ada7) Changed some tutorial text titles 2019-03-27 20:52:01 +02:00
Joonas Rikkonen
c0192ad19b (fd98de428) Merge branch 'tutorial-rework' of github.com:Regalis11/Barotrauma-development into tutorial-rework 2019-03-27 20:51:47 +02:00
Joonas Rikkonen
5a620ec60d (771621c77) Added: Delays for medical & flooding tutorials, resetting of injuredmember when starting again 2019-03-27 20:51:33 +02:00
Joonas Rikkonen
723df67f6f (f68ad6ccc) Minor changes to tutorial texts 2019-03-27 20:51:17 +02:00
Joonas Rikkonen
0f405512b2 (69e52eea2) Fixed: Tutorial not resetting properly on retry 2019-03-27 20:51:03 +02:00
Joonas Rikkonen
8b5e18c348 (edf82e6ca) Modified: VideoPlayer video position, medical objective completion, saving segment when objective is completed 2019-03-27 20:50:50 +02:00
Joonas Rikkonen
91e87e8b74 (f9949667c) Modified: Default video resolutio multiplied by 1.5, default text width for video set to 450 2019-03-27 20:50:35 +02:00
Joonas Rikkonen
ff20f7f374 (936119c69) Fixed: Aligning problems when an objective is removed, crashing when EnemyOnSonar is triggered, dead monsters still counting for EnemyOnSonar, ReactorCommand objective to complete when the order is given. 2019-03-27 20:50:21 +02:00
Joonas Rikkonen
3b8aeb27c5 (aefc763e9) Changed tutorial navconsole text and fixed tag 2019-03-27 20:50:07 +02:00
Joonas Rikkonen
69852a141e (6840c9114) Set the objective frame to be drawn behind other gui elements. TODO: test and complain if doesn't work ;) 2019-03-27 20:49:53 +02:00
Joonas Rikkonen
5c324a6de9 (4ad359147) Fix an index out of array exception when trying to set the update order (draw order) while the updateList contains no elements. 2019-03-27 20:49:38 +02:00
Joonas Rikkonen
632dce88c0 (cba4939e3) Formatting 2019-03-27 20:49:24 +02:00
Joonas Rikkonen
2cdc7ce5f3 (57c934c4b) Added: Padding for video text, missing xml elements for titles, instructions. 2019-03-27 20:49:10 +02:00
Joonas Rikkonen
179b17e9aa (093cf0b49) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework 2019-03-27 20:48:56 +02:00
Joonas Rikkonen
68aa95a5df (351e4f8b8) Added: hiding of objectives via button 2019-03-27 20:48:42 +02:00
Joonas Rikkonen
a90ce22107 (8be88da45) Included videos in project, added them to xml 2019-03-27 20:48:29 +02:00
Joonas Rikkonen
27efec90c9 (ef6d724ea) Fixed: Invalid pathname when triggering a video for the first time 2019-03-27 20:48:13 +02:00
Joonas Rikkonen
7140151882 (c9b5d70ff) Removed: Hardcoded video path 2019-03-27 20:47:58 +02:00
Joonas Rikkonen
12f963d2a5 (094e3b371) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework 2019-03-27 20:47:44 +02:00
Joonas Rikkonen
37f44b87fa (43425b834) Added: Video looping, replaying, pre-video text 2019-03-27 20:47:30 +02:00
Joonas Rikkonen
cf49c179dc (34c324230) New tutorial videos 2019-03-27 20:47:15 +02:00
Joonas Rikkonen
e65b688edd (44ca39e16) Added: Escaping the video player via enter, multiple objective tracking & removing 2019-03-27 20:46:58 +02:00
Joonas Rikkonen
474099732b (f8525130a) Added: Objective tracking, UI changes. 2019-03-27 20:46:44 +02:00
Joonas Rikkonen
a939cdef91 (a58bf1e5d) Added: Fonts, layouting to video with objective 2019-03-27 20:46:27 +02:00
Joonas Rikkonen
bbfb472122 (ed863473d) Added: New tutorial content & UI 2019-03-27 20:46:13 +02:00
Joonas Rikkonen
7ea3e1b20c (9801d8289) Added: Handling of error cases when video is not found 2019-03-27 20:45:58 +02:00
Joonas Rikkonen
556d86ed4f (bce1100e8) ClientCode.projitems update 2019-03-27 20:45:45 +02:00
Joonas Rikkonen
ff4ecd15b3 (c7ebe3cdb) Fixed: Old TextManager.Get call 2019-03-27 20:45:30 +02:00
Joonas Rikkonen
3f82c9a2cb (f417b026f) Fetched: Changes for playing video tutorial from local branch 2019-03-27 20:45:14 +02:00
Joonas Rikkonen
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
Joonas Rikkonen
fe10fdeeeb (621dbfdd2) Humpback: Modified bilge to make it easier for ai to fix. Added ballast space to make use of extra space. Dugong: Added ballast space to make use of extra space. 2019-03-26 14:07:24 +02:00
Joonas Rikkonen
4b3e78b566 (913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai 2019-03-26 14:07:11 +02:00
Joonas Rikkonen
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
Joonas Rikkonen
ccd496b769 (99836db69) Fixed clients being unable to end campaign rounds at all if the sub isn't at the start/end outpost (regardless if they have the permission to end the round or not), added a verification prompt when trying to end the round when the sub isn't at either outpost. 2019-03-26 14:06:40 +02:00
Joonas Rikkonen
eda3d9a533 (4f62d9b8f) Clients stop reading a network message if EventManager reports an error to the server. Otherwise the reading will fail with an "unknown object header" error, causing the client to disconnect themselves before receiving the more descriptive error message from the server. 2019-03-25 19:51:11 +02:00
Joonas Rikkonen
26594e2c6c (4b33eda28) Merge branch 'dev' into enemy-ai 2019-03-25 19:49:34 +02:00
Joonas Rikkonen
5ec6a7fba9 (325184804) Fix distance based attacks not registering if they hit a submarine. 2019-03-25 19:49:05 +02:00
Joonas Rikkonen
c2e8263927 f9e8100...ccacceb
commit ccacceb16a184f00ecd384eede64ca9c4fab08a0
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 14:05:59 2019 +0200

    NetEntityEventManager checks the length of the event data (and logs an error if it's too long) before checking if there's still room to keep writing events in the packet. Checking the available room first could lead to situations where an excessively large event can't fit to any packet, "soft-locking" the EventManager without any error messages.

commit 5ac8259372aa900adc724aa4da1fd81af41ca195
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:41:52 2019 +0200

    Don't display disabled limbs on sonar (i.e. severed limbs that have "faded out")

commit 5f84df73ad86be96f3678c450351b3905e7317a4
Merge: b981f1635 dc429d6c4
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:41:16 2019 +0200

    Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev

commit b981f163575b2bfc9a83b9925c94eca19b9d4554
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:36:19 2019 +0200

    Multiplayer campaign fixes:
    - Server uses a different temp folder to decompress save/sub files into than the clients. Should fix files occasionally getting corrupted and exceptions when trying to read the files when hosting a server from the main executable.
    - Some additional debug logging.
    - Use the base names of the adjacent locations as level seeds (i.e. "Vorta" instead of "Vorta Outpost"). The levels should not change when the type (and full name) of the location changes.

commit 42c5d18df77fc7acd5873d8e25f20bdd31b1ed76
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:31:06 2019 +0200

    Don't transfer files through the network when sending them to the owner of the server (i.e. a client hosting directly from the main executable), but simply tell the client where the file is located.

commit dc429d6c450f4893fe29c51d3c830527e587a871
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com>
Date:   Mon Mar 25 13:30:26 2019 +0200

    Added labels next to periscopes in Humpback and Dugong

commit 789f02a87a2917dd2ae378f136cbe8dd3236c60d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 13:29:29 2019 +0200

    If loading a submarine fails, wait a bit and retry up to 4 times. Fixes loading occasionally failing when running multiple instances of the game from the same directory.

commit be9ea3a58832992b6226917117247e1bf1efeff9
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 11:03:36 2019 +0200

    Fixed a bunch of disconnection messages being in an incorrect format & DisconnectUnauthClient not getting the messages from the xml

commit c6f744b4d6b3520720010f5cd4f22a25b42bfc8b
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Mon Mar 25 10:43:10 2019 +0200

    Log entity event errors into server logs when verbose logging is enabled
2019-03-25 14:30:00 +02:00
Joonas Rikkonen
c3b5c414cb 4e002dc...f9e8100
commit f9e8100140d99d30db551c16523f04cf042fb107
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sun Mar 24 20:37:23 2019 +0200

    Automatically grab adjacent ladders when the top/bottom of the current ladder is reached. Makes moving through docking ports a little less confusing. Closes #1337

commit 7ad697036299c3dae0145f89dc7e1f4fec22953d
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Sun Mar 24 20:11:57 2019 +0200

    Fixed windows clients being unable to start a campaign in servers running on Linux. Caused by submarine paths not matching because the clients would use backslash in the filepath while Linux uses a slash. The submarine selection logic also had an additional issue: the clients would assume the submarine is in the default Submarines folder, even though the server may actually store them somewhere else. Now the client communicates the selected sub to the server by sending the name and MD5 hash instead of the path, so mismatching paths shouldn't cause problems anymore. Closes #1332
2019-03-24 20:38:12 +02:00
Joonas Rikkonen
77a07a95af 1473f77...ece6ead
commit ece6ead54c021d084f406f4f99daa5a0a7ef4b19
Author: Regalis11 <poe.regalis@gmail.com>
Date:   Fri Mar 22 21:52:56 2019 +0200

    v0.8.9.7

commit c10dd821ca1a89b4ae62046cf8e558589ff8e6af
Author: Regalis11 <poe.regalis@gmail.com>
Date:   Fri Mar 22 21:00:02 2019 +0200

    Fixed release builds crashing due to simulatedlatency etc commands not existing in release builds

commit dee0dded80cbbf30d484232b6706dd705a577eb7
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Fri Mar 22 15:24:44 2019 +0200

    Fixed nullref exception if a client disconnects while netstats is enabled

commit c45d5bf0c5a4a68200c9eca461cd04090a5de23a
Author: Joonas Rikkonen <poe.regalis@gmail.com>
Date:   Fri Mar 22 15:24:26 2019 +0200

    Togglehud, toggleupperhud and togglecharacternames don't require a permission to use, made simulatedlatency, simulatedloss and simulatedduplicateschange usable to clients

commit cec1ac6bccac058bc12ddf18c8e060a7a47c9301
Merge: 411cd9726 1473f77ba
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Fri Mar 22 14:01:58 2019 +0200

    Merge branch 'dev' into enemy-ai

commit 411cd9726979668764eea782b515c7510ec4f5a8
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Fri Mar 22 14:01:09 2019 +0200

    If the target has changed, re-evaluate the attacking limb. Fixes Hammerhead getting stuck next to the sub, because it treats the claw as the attacking limb when targeting characters inside the sub. It should use the head, because it has a wall target.

commit 2522bec262f9cb1dea9df75e1d2c22307be5254c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Fri Mar 22 13:58:18 2019 +0200

    Enemy ai/steering fixes:
    - Store both sim and world positions. Offset the simposition with the subposition and use it for steering. Fixes enemy indoorsteering, which was broken.
    - Use head or torso for steering instead of always using the main limb. Fixes characters like Mudraptor overshooting their targets badly.

commit c667ff9e4edf8af8f95278fbad42e0c8dd37d84c
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Fri Mar 22 13:54:21 2019 +0200

    Improve the ai debug graphics.

commit 4c6c13e07e43a4e3ce2a11dfc4064961c442044a
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 21 17:11:17 2019 +0200

    Refactor, fix and adjust the enemy targeting logic:
    - Change the logic for fading the memories
    - When attacking a wall target, set it as the currently selected ai target so that we adjust the right memory
    - Significantly reduce the value of character targets that are not in the same submarine
    - In aggressive boarding, double the priority of walls when outside. Set the priority to 0 when inside. Reduce the attractiveness of  doors, but still keep the values high.
    - Redefine priorities for Mudraptor and Crawler (wip)

commit b085a95cff6bcf5e3f13e90dd1b71ac15e5ec1ab
Author: itchyOwl <lauri.harkanen@gmail.com>
Date:   Thu Mar 21 13:16:22 2019 +0200

    Allow enemies to target walls by decision (not only when they happen to be on their way). TODO: target only outer walls and only when outside of the sub.
2019-03-23 19:22:13 +02:00
Joonas Rikkonen
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