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
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
e5fd660479
(c83fafea0) Fixed items in the characters inventory always starting at 100% condition client-side even if they had deteriorated during the previous round. Closes #1359
2019-03-27 12:10:35 +02:00
93f2dfb185
(628aa768f) Fix characters always being created in the default folder ( #1330 ).
2019-03-26 17:09:35 +02:00
8537234b75
(df56e74f1) Rename Charybdis as Legacycharybdis. Temporarily disable charybdis events.
2019-03-26 17:09:21 +02:00
a1ef2732c9
(0d12b23e4) Fix the crash due to NaN value in torso or head angle ( #1349 ).
2019-03-26 17:09:08 +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
56d1f5a054
(0df804de8) Add a null check for the character info reference.
2019-03-26 17:08:39 +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
e06d4b777f
(e8b93e8d7) Increase the door ai target ranges. The values are halved for most monsters, because they currently have the sight of 0.5.
2019-03-25 19:50:16 +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
7d74b5bd52
(2c717d761) Enable wall targets also inside the sub, so that enemies can get through multiple layers of walls. Don't target walls (intentionally), when the character is already inside the sub. Fix attack world position being calculated wrong when the character is targeting walls inside the sub. Take the sub position into account when assigning the wall target position. Makes things a bit simpler.
2019-03-25 19:49:20 +02:00
5ec6a7fba9
(325184804) Fix distance based attacks not registering if they hit a submarine.
2019-03-25 19:49:05 +02:00
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