Commit Graph

277 Commits

Author SHA1 Message Date
Joonas Rikkonen 3ef9374314 (2464ca95d) Implement random factor (0-100%) for the cooldowns. Add some randomness to the attacks of all new characters. 2019-03-28 18:09:32 +02:00
Joonas Rikkonen 44a8bfce08 (808e7257d) Attempt to fix the issue where bots are not avoiding walls properly while wandering around. 2019-03-28 18:09:05 +02:00
Joonas Rikkonen 72e7cb6e99 (b0feecc1f) Use the code that includes wall avoidance for wandering also in AIObjectiveFindSafety and AIObjectiveGetItem when the target is unreachable. 2019-03-28 12:35:01 +02:00
Joonas Rikkonen 05f12a144b (afed4e8fa) Check that the container is in the same hull than the character before allowing to contain items. Might solve the floating diving suit mentioned in #1362. 2019-03-28 12:34:47 +02:00
Joonas Rikkonen e09740d31e (371088346) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev 2019-03-28 12:34:18 +02:00
Joonas Rikkonen ef7b0f0ccf (edc1704a5) Added: A checkmark and small delay before removal for completed objectives 2019-03-28 12:34:04 +02:00
Joonas Rikkonen e6c3d6d537 (6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 21:00:33 +02:00
Joonas Rikkonen 0ab2f2ac69 (29faa9c06) Reinstate charybdis monster events. 2019-03-27 20:57:50 +02:00
Joonas Rikkonen 98224c6ec9 (cc0f963d6) Fixed nullref exception when loading campaign character inventories in single player. 2019-03-27 20:57:36 +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 eada5e222a (4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 13:52:38 +02:00
Joonas Rikkonen 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
Joonas Rikkonen 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
Joonas Rikkonen 93f2dfb185 (628aa768f) Fix characters always being created in the default folder (#1330). 2019-03-26 17:09:35 +02:00