0c8772f6a1
(4589e2b8d) Minor changes to tutorial text
2019-03-27 20:53:00 +02:00
080ac78ded
(5c35a640e) Update tutorial-rework with dev
2019-03-27 20:52:47 +02:00
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
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
018fcb0fa0
(65082ada7) Changed some tutorial text titles
2019-03-27 20:52:01 +02:00
c0192ad19b
(fd98de428) Merge branch 'tutorial-rework' of github.com:Regalis11/Barotrauma-development into tutorial-rework
2019-03-27 20:51:47 +02:00
5a620ec60d
(771621c77) Added: Delays for medical & flooding tutorials, resetting of injuredmember when starting again
2019-03-27 20:51:33 +02:00
723df67f6f
(f68ad6ccc) Minor changes to tutorial texts
2019-03-27 20:51:17 +02:00
0f405512b2
(69e52eea2) Fixed: Tutorial not resetting properly on retry
2019-03-27 20:51:03 +02:00
8b5e18c348
(edf82e6ca) Modified: VideoPlayer video position, medical objective completion, saving segment when objective is completed
2019-03-27 20:50:50 +02:00
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
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
3b8aeb27c5
(aefc763e9) Changed tutorial navconsole text and fixed tag
2019-03-27 20:50:07 +02:00
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
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
632dce88c0
(cba4939e3) Formatting
2019-03-27 20:49:24 +02:00
2cdc7ce5f3
(57c934c4b) Added: Padding for video text, missing xml elements for titles, instructions.
2019-03-27 20:49:10 +02:00
179b17e9aa
(093cf0b49) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework
2019-03-27 20:48:56 +02:00
68aa95a5df
(351e4f8b8) Added: hiding of objectives via button
2019-03-27 20:48:42 +02:00
a90ce22107
(8be88da45) Included videos in project, added them to xml
2019-03-27 20:48:29 +02:00
27efec90c9
(ef6d724ea) Fixed: Invalid pathname when triggering a video for the first time
2019-03-27 20:48:13 +02:00
7140151882
(c9b5d70ff) Removed: Hardcoded video path
2019-03-27 20:47:58 +02:00
12f963d2a5
(094e3b371) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework
2019-03-27 20:47:44 +02:00
37f44b87fa
(43425b834) Added: Video looping, replaying, pre-video text
2019-03-27 20:47:30 +02:00
cf49c179dc
(34c324230) New tutorial videos
2019-03-27 20:47:15 +02:00
e65b688edd
(44ca39e16) Added: Escaping the video player via enter, multiple objective tracking & removing
2019-03-27 20:46:58 +02:00
474099732b
(f8525130a) Added: Objective tracking, UI changes.
2019-03-27 20:46:44 +02:00
a939cdef91
(a58bf1e5d) Added: Fonts, layouting to video with objective
2019-03-27 20:46:27 +02:00
bbfb472122
(ed863473d) Added: New tutorial content & UI
2019-03-27 20:46:13 +02:00
7ea3e1b20c
(9801d8289) Added: Handling of error cases when video is not found
2019-03-27 20:45:58 +02:00
556d86ed4f
(bce1100e8) ClientCode.projitems update
2019-03-27 20:45:45 +02:00
ff4ecd15b3
(c7ebe3cdb) Fixed: Old TextManager.Get call
2019-03-27 20:45:30 +02:00
3f82c9a2cb
(f417b026f) Fetched: Changes for playing video tutorial from local branch
2019-03-27 20:45:14 +02:00
065173f3f7
(c417b7693) Decreased structure damage done by frag grenades (they weren't very practical for defending against intruders because they tended to blow up half the sub) and made them disappear after they've exploded. Closes #1317
2019-03-27 11:30:47 +02:00
bb17463aae
(f5be65240) Optimized explosions a bit, toned down wall damage effect when the wall has a small amount of damage.
2019-03-27 11:30:33 +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
555d91a3d5
(c590657d2) Don't retry decompressing save files or loading sub files if the file doesn't exist
2019-03-26 17:10:06 +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
7c9d0aac03
(ef1d7a5a2) Campaign fix: clear missions from locations that change their type, and all adjacent locations. Caused missions to still be available when they logically shouldn't be (e.g. a transport mission from an uninhabited location to another) and syncing issues in multiplayer.
2019-03-25 19:55:38 +02:00
965a378f0e
(5d67aa3f5) Merge remote-tracking branch 'origin/dev' into enemy-ai
2019-03-25 19:50:58 +02:00
fd5d2b86af
(a97ef2847) AI improvements: - Fix steering issues when attacking (yet again): We still have to offset the sim positions. - Fix the steering vector when escaping from the enemy that is inside the sub. - Enemies can now navigate out from the sub, when escaping. - Fix door tag not being used when targeting items. Change the priority boosts considering doors. Should now entirely ignore the outer doors when inside and inner doors when outside. - Change the way enemies react to characters that are not in the same sub. Halve the priority when the character is not in the same hull. Add some boost to the priority when escaping.
2019-03-25 19:50:02 +02:00
19d5ed5d66
(14f26adfa) Take the position of a sub's docking port into account when determining where to place outposts. Humpback's docking port for example is 600 units to the right from the sub's centerpoint, which prevented it from docking in some levels because the left side of the sub hit the wall at the left side of the outpost. Closes #1028
2019-03-25 19:49:48 +02:00
26594e2c6c
(4b33eda28) Merge branch 'dev' into enemy-ai
2019-03-25 19:49:34 +02:00
5ec6a7fba9
(325184804) Fix distance based attacks not registering if they hit a submarine.
2019-03-25 19:49:05 +02:00
13fcf6f166
(27eca7ad9) Some network optimization: - Don't create network events for hulls that are very far from all clients (e.g. ruin hulls). - Don't create network events for triggers that are set to limit the triggerer's velocity when there are no triggerers.
2019-03-25 10:58:07 -03:00
733271ea2e
(fd1ee0c02) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-25 10:57:44 -03:00
991639709c
(2da6c898b) Added 'pretty' merge script
2019-03-25 10:57:38 -03:00
94c1b29beb
(9a13b4418) Hull syncing fixes: - Don't let clients decrease the size of FireSources below zero. May happen because clients are allowed to predict changes in the size (correcting the values when receiving updates from the server), but not remove the fires if their size is too small. - When using the fire/water command, the clients used to simply discard hull updates from the server if fire/water had been edited within 0.5 seconds (to prevent the state from reverting back to previous one when receiving an update). This occasionally caused the fires/water to get out of sync if the server didn't send additional updates after the 0.5 delay. Now the clients will simply correct the hull to the last known server state after the 0.5 second delay.
2019-03-25 10:57:18 -03:00
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
juanjp600