Commit Graph

  • ef7b0f0ccf (edc1704a5) Added: A checkmark and small delay before removal for completed objectives Joonas Rikkonen 2019-03-28 12:34:04 +02:00
  • aee0290202 (74f1d04ea) Added interact texts to all items (Interact [E], Pick Up [E], etc), reset messages in all subs. TODO: Saving the subs causes the messages to be converted from text tags ("ItemMsgPressSelect" etc) into the actual texts, preventing the messages from being translated. We could probably just make the property non-editable and use the prefab values, or at least prevent the values from changing in sub files. Joonas Rikkonen 2019-03-28 12:33:49 +02:00
  • e6c3d6d537 (6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-03-27 20:58:04 +02:00
  • 0ab2f2ac69 (29faa9c06) Reinstate charybdis monster events. Joonas Rikkonen 2019-03-27 20:57:50 +02:00
  • 98224c6ec9 (cc0f963d6) Fixed nullref exception when loading campaign character inventories in single player. Joonas Rikkonen 2019-03-27 20:57:36 +02:00
  • 776f71647d (3c77ed62a) Add attack, particles (copied from legacy), ai (copied from legacy), and sounds (legacy) to charybdis. Tweak the ragdoll and the animations a bit. Joonas Rikkonen 2019-03-27 20:57:23 +02:00
  • 8a22dbfebd (92723d062) Increase Hammerhead head attack dmg to characters. Joonas Rikkonen 2019-03-27 20:57:10 +02:00
  • 7a5f589639 (99336eacb) Modified: Reduced video's textframe alpha Joonas Rikkonen 2019-03-27 20:56:55 +02:00
  • 4215e97720 (724e27ce7) Made damaged junction boxes less sensitive to overvoltage. Nearly broken junction boxes were barely able to handle any overvoltage, leading to chain reaction where one junction box breaking causes the grid to be overloaded, and the rest of the boxes start taking damage at an increasing speed. Related to #1361 Joonas Rikkonen 2019-03-27 20:56:42 +02:00
  • 7c8f19ee14 (875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 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. Joonas Rikkonen 2019-03-27 20:56:14 +02:00
  • 86d1102f56 (88961a6ea) Fix wrong spelling: Blatter -> Bladder. Joonas Rikkonen 2019-03-27 20:56:01 +02:00
  • 963657cd9c (f5d1ca382) Video title padding Joonas Rikkonen 2019-03-27 20:55:48 +02:00
  • 567fb99864 (c3950a782) Tweaks to video title size & placement, wording Joonas Rikkonen 2019-03-27 20:55:35 +02:00
  • 55cb2b84d7 (6934499e1) Removed: Duplicates from EnglishVanilla Joonas Rikkonen 2019-03-27 20:55:22 +02:00
  • 9c5b43bf72 (02c733ec8) Added: Notion of how to rewatch the tutorial instructions Joonas Rikkonen 2019-03-27 20:55:06 +02:00
  • 81833e7920 (65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 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 Joonas Rikkonen 2019-03-27 20:54:40 +02:00
  • ac60c9477e (d8c40ca6c) Merge branch 'dev' into tutorial-rework Joonas Rikkonen 2019-03-27 20:54:27 +02:00
  • 86ded4b1d5 (2f573ba39) Fix Hammerhead spritesheet orientation. Joonas Rikkonen 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. Joonas Rikkonen 2019-03-27 20:54:00 +02:00
  • ad1a726e91 (8d8ed7727) Fixed: Invalid title font & color in tutorial infobo. Added: Some rudimentary scaling based on screen resolution for VideoPlayer Joonas Rikkonen 2019-03-27 20:53:46 +02:00
  • 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 Joonas Rikkonen 2019-03-27 20:53:30 +02:00
  • ec481eba45 (e54f169fe) Better quality videos for tutorial, removed sound Joonas Rikkonen 2019-03-27 20:53:17 +02:00
  • 0c8772f6a1 (4589e2b8d) Minor changes to tutorial text Joonas Rikkonen 2019-03-27 20:53:00 +02:00
  • 080ac78ded (5c35a640e) Update tutorial-rework with dev Joonas Rikkonen 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 Joonas Rikkonen 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' Joonas Rikkonen 2019-03-27 20:52:16 +02:00
  • 018fcb0fa0 (65082ada7) Changed some tutorial text titles Joonas Rikkonen 2019-03-27 20:52:01 +02:00
  • c0192ad19b (fd98de428) Merge branch 'tutorial-rework' of github.com:Regalis11/Barotrauma-development into tutorial-rework Joonas Rikkonen 2019-03-27 20:51:47 +02:00
  • 5a620ec60d (771621c77) Added: Delays for medical & flooding tutorials, resetting of injuredmember when starting again Joonas Rikkonen 2019-03-27 20:51:33 +02:00
  • 723df67f6f (f68ad6ccc) Minor changes to tutorial texts Joonas Rikkonen 2019-03-27 20:51:17 +02:00
  • 0f405512b2 (69e52eea2) Fixed: Tutorial not resetting properly on retry Joonas Rikkonen 2019-03-27 20:51:03 +02:00
  • 8b5e18c348 (edf82e6ca) Modified: VideoPlayer video position, medical objective completion, saving segment when objective is completed Joonas Rikkonen 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 Joonas Rikkonen 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. Joonas Rikkonen 2019-03-27 20:50:21 +02:00
  • 3b8aeb27c5 (aefc763e9) Changed tutorial navconsole text and fixed tag Joonas Rikkonen 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 ;) Joonas Rikkonen 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. Joonas Rikkonen 2019-03-27 20:49:38 +02:00
  • 632dce88c0 (cba4939e3) Formatting Joonas Rikkonen 2019-03-27 20:49:24 +02:00
  • 2cdc7ce5f3 (57c934c4b) Added: Padding for video text, missing xml elements for titles, instructions. Joonas Rikkonen 2019-03-27 20:49:10 +02:00
  • 179b17e9aa (093cf0b49) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework Joonas Rikkonen 2019-03-27 20:48:56 +02:00
  • 68aa95a5df (351e4f8b8) Added: hiding of objectives via button Joonas Rikkonen 2019-03-27 20:48:42 +02:00
  • a90ce22107 (8be88da45) Included videos in project, added them to xml Joonas Rikkonen 2019-03-27 20:48:29 +02:00
  • 27efec90c9 (ef6d724ea) Fixed: Invalid pathname when triggering a video for the first time Joonas Rikkonen 2019-03-27 20:48:13 +02:00
  • 7140151882 (c9b5d70ff) Removed: Hardcoded video path Joonas Rikkonen 2019-03-27 20:47:58 +02:00
  • 12f963d2a5 (094e3b371) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework Joonas Rikkonen 2019-03-27 20:47:44 +02:00
  • 37f44b87fa (43425b834) Added: Video looping, replaying, pre-video text Joonas Rikkonen 2019-03-27 20:47:30 +02:00
  • cf49c179dc (34c324230) New tutorial videos Joonas Rikkonen 2019-03-27 20:47:15 +02:00
  • e65b688edd (44ca39e16) Added: Escaping the video player via enter, multiple objective tracking & removing Joonas Rikkonen 2019-03-27 20:46:58 +02:00
  • 474099732b (f8525130a) Added: Objective tracking, UI changes. Joonas Rikkonen 2019-03-27 20:46:44 +02:00
  • a939cdef91 (a58bf1e5d) Added: Fonts, layouting to video with objective Joonas Rikkonen 2019-03-27 20:46:27 +02:00
  • bbfb472122 (ed863473d) Added: New tutorial content & UI Joonas Rikkonen 2019-03-27 20:46:13 +02:00
  • 7ea3e1b20c (9801d8289) Added: Handling of error cases when video is not found Joonas Rikkonen 2019-03-27 20:45:58 +02:00
  • 556d86ed4f (bce1100e8) ClientCode.projitems update Joonas Rikkonen 2019-03-27 20:45:45 +02:00
  • ff4ecd15b3 (c7ebe3cdb) Fixed: Old TextManager.Get call Joonas Rikkonen 2019-03-27 20:45:30 +02:00
  • 3f82c9a2cb (f417b026f) Fetched: Changes for playing video tutorial from local branch Joonas Rikkonen 2019-03-27 20:45:14 +02:00
  • e65c669eaa (2aa0ff8d3) Do not copy Muikku to output directory Joonas Rikkonen 2019-03-27 13:53:07 +02:00
  • b3a4efdd6f (c368a04c8) Added a longer version of Muikku, renamed to Selkie Joonas Rikkonen 2019-03-27 13:52:53 +02:00
  • eada5e222a (4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 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. Joonas Rikkonen 2019-03-27 13:52:22 +02:00
  • 66af3464a9 (4d472a71c) Removing an item after it's been combined doesn't trigger the OnBroken StatusEffects (e.g. combining two half-full flash powder jars doesn't cause them to explode), made all crafting materials disappear after they've been fully used. Closes #1303 Joonas Rikkonen 2019-03-27 13:52:04 +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 Joonas Rikkonen 2019-03-27 12:10:35 +02:00
  • b6f6fd64a3 (9f2fea0dd) Fixed divide by zero exception in Mission.LoadRandom if no missions can be received from the location. Joonas Rikkonen 2019-03-27 12:10:21 +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 Joonas Rikkonen 2019-03-27 11:31:30 +02:00
  • 26a3f866ee (a3947cb13) Batteries output charge values as ints. Closes #1358 Joonas Rikkonen 2019-03-27 11:31:16 +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 Joonas Rikkonen 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. Joonas Rikkonen 2019-03-27 11:30:33 +02:00
  • 6fd4d14497 (8b8693dbf) Allow editing selected wires in wiring mode, made connection panels a little less transparent. Closes #1329 Joonas Rikkonen 2019-03-26 17:34:35 +02:00
  • d60696f895 (a0e195312) Don't allow steering with WASD when a textbox is selected. Closes #1353 Joonas Rikkonen 2019-03-26 17:34:21 +02:00
  • 20e258f88e (26025de59) Allow panning the campaign map with WASD. Closes #1352 Joonas Rikkonen 2019-03-26 17:34:07 +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 Joonas Rikkonen 2019-03-26 17:10:35 +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. Joonas Rikkonen 2019-03-26 17:10:20 +02:00
  • 555d91a3d5 (c590657d2) Don't retry decompressing save files or loading sub files if the file doesn't exist Joonas Rikkonen 2019-03-26 17:10:06 +02:00
  • 93f2dfb185 (628aa768f) Fix characters always being created in the default folder (#1330). Joonas Rikkonen 2019-03-26 17:09:35 +02:00
  • 8537234b75 (df56e74f1) Rename Charybdis as Legacycharybdis. Temporarily disable charybdis events. Joonas Rikkonen 2019-03-26 17:09:21 +02:00
  • a1ef2732c9 (0d12b23e4) Fix the crash due to NaN value in torso or head angle (#1349). Joonas Rikkonen 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. Joonas Rikkonen 2019-03-26 17:08:53 +02:00
  • 56d1f5a054 (0df804de8) Add a null check for the character info reference. Joonas Rikkonen 2019-03-26 17:08:39 +02:00
  • c94064c5f6 (ef9221ae5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev Joonas Rikkonen 2019-03-26 14:08:05 +02:00
  • d51c9a2028 (31ba1cb37) Fixed batteries being able to draw power through relay components that are connected directly to a power source, even if the relay isn't on. Closes #1069 Joonas Rikkonen 2019-03-26 14:07:51 +02:00
  • f4b85b32d0 (482b2c640) Fixes relay component logic: previously the load was clamped to zero when traversing out from the power_in connection of a relay to check how much power is coming in (devices connected to power_in don't increase the load), but now the same is also done for the incoming power when traversing out from power_out. Fixes #329, #805 and #1350 Joonas Rikkonen 2019-03-26 14:07:37 +02:00
  • 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. Joonas Rikkonen 2019-03-26 14:07:24 +02:00
  • 4b3e78b566 (913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai Joonas Rikkonen 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. Joonas Rikkonen 2019-03-26 14:06:55 +02:00
  • 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. Joonas Rikkonen 2019-03-26 14:06:40 +02:00
  • ca279d40a3 (dbaa7326b) Use the SpriteColor of the item when drawing the moving parts of turrets and doors, made InventoryIconColor and ContainerColor saveable. Closes #1326 Joonas Rikkonen 2019-03-26 14:06:26 +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. Joonas Rikkonen 2019-03-25 19:52:08 +02:00
  • d98f0efd66 (0cd6089c2) Disable campaign start button if a round is already running when joining. Joonas Rikkonen 2019-03-25 19:51:54 +02:00
  • 86c4b6a3ae (9d3dd6da9) Reattempt decompressing saves files and initiating file transfers a few times before throwing an error. Running multiple instances of the game from the same install (or hosting a server as a client) occasionally causes IOExceptions because the instances try to access the same files. Joonas Rikkonen 2019-03-25 19:51:39 +02:00
  • 006d53ccf1 (5a10ddbee) Server ends the round if the owner of the server reports an error. Joonas Rikkonen 2019-03-25 19:51:25 +02:00
  • 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. Joonas Rikkonen 2019-03-25 19:51:11 +02:00
  • 965a378f0e (5d67aa3f5) Merge remote-tracking branch 'origin/dev' into enemy-ai Joonas Rikkonen 2019-03-25 19:50:58 +02:00
  • 1fa94dd2b9 (b6e2dda8d) Adjust Crawler and Mudraptor targeting priorities. Joonas Rikkonen 2019-03-25 19:50:44 +02:00
  • 291623abb8 (59bf3d346) Double the Mudraptor attack speed. Joonas Rikkonen 2019-03-25 19:50:30 +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. Joonas Rikkonen 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. Joonas Rikkonen 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 Joonas Rikkonen 2019-03-25 19:49:48 +02:00
  • 26594e2c6c (4b33eda28) Merge branch 'dev' into enemy-ai Joonas Rikkonen 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. Joonas Rikkonen 2019-03-25 19:49:20 +02:00