Commit Graph

4640 Commits

Author SHA1 Message Date
Joonas Rikkonen
68a601722c (34987308f) Fixed reactor warning lights being clickable 2019-03-28 18:10:27 +02:00
Joonas Rikkonen
4ce2316cb2 (8339ae744) Don't allow autointeracting with contained items (e.g. picking up an ammunition box from a loader) if another item is currently selected. Makes it less likely for players to accidentally pick up items from containers when they deselect another item. 2019-03-28 18:10:13 +02:00
Joonas Rikkonen
b9556280fa (1f3241833) Fixed chatmessage "popups" overlapping with the report buttons when the chatbox is hidden, color the name of the speaker according to their job 2019-03-28 18:09:59 +02:00
Joonas Rikkonen
c468b4f6f1 (ccaa0d2e9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:09:45 +02:00
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
9618c9b7e9 (db8417634) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-28 18:09:19 +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
0c15748429 (8bea0a96b) Removed minimum conditions from battery deconstruction output (= deconstructing an empty battery still gives the materials used to craft the battery). Closes #1356 2019-03-28 12:41:06 +02:00
Joonas Rikkonen
bcd779fe78 (519124ad1) Fixed items with no sprite crashing the game. Closes #1153 2019-03-28 12:40:08 +02:00
Joonas Rikkonen
a8222e429f (edb24c37f) Fixed ItemComponents overwriting the Msg-tags ("ItemMsgPressSelect" etc) with the text fetched from the text xml, preventing the texts from being translated after the sub has been saved. 2019-03-28 12:36:11 +02:00
Joonas Rikkonen
d7526934e6 (f7209b813) Draw the sprites of the entities that are being dragged in the sub editor (instead of just a red rectangle). 2019-03-28 12:35:57 +02:00
Joonas Rikkonen
13870a31c4 (962c58b6d) Hide very small resolution options from the settings menu. Addresses (but doesn't fully fix) #1253 2019-03-28 12:35:43 +02:00
Joonas Rikkonen
9849e76f76 (5d39bdb07) Disabled reactors cooling down when underwater. If we want to include this, we need to explain to the player that they may need extra fuel to keep the reactor running when the reactor room is flooded. 2019-03-28 12:35:15 +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
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. 2019-03-28 12:33:49 +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
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. 2019-03-27 20:57:23 +02:00
Joonas Rikkonen
8a22dbfebd (92723d062) Increase Hammerhead head attack dmg to characters. 2019-03-27 20:57:10 +02:00
Joonas Rikkonen
7a5f589639 (99336eacb) Modified: Reduced video's textframe alpha 2019-03-27 20:56:55 +02:00
Joonas Rikkonen
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 2019-03-27 20:56:42 +02:00
Joonas Rikkonen
7c8f19ee14 (875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 20:56:29 +02:00
Joonas Rikkonen
3b786d7ded (e311dc982) Continue working on Charybdis. Add some deformations. Tweak the joints. Redefine the limb types. Tune the animations. 2019-03-27 20:56:14 +02:00
Joonas Rikkonen
86d1102f56 (88961a6ea) Fix wrong spelling: Blatter -> Bladder. 2019-03-27 20:56:01 +02:00
Joonas Rikkonen
963657cd9c (f5d1ca382) Video title padding 2019-03-27 20:55:48 +02:00
Joonas Rikkonen
567fb99864 (c3950a782) Tweaks to video title size & placement, wording 2019-03-27 20:55:35 +02:00
Joonas Rikkonen
55cb2b84d7 (6934499e1) Removed: Duplicates from EnglishVanilla 2019-03-27 20:55:22 +02:00
Joonas Rikkonen
9c5b43bf72 (02c733ec8) Added: Notion of how to rewatch the tutorial instructions 2019-03-27 20:55:06 +02:00
Joonas Rikkonen
81833e7920 (65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-03-27 20:54:53 +02:00
Joonas Rikkonen
6ca760ceda (93f4e5d57) Allow repair tools to hit structures even if the barrel is inside the structure. Possibly closes #1306 2019-03-27 20:54:40 +02:00
Joonas Rikkonen
ac60c9477e (d8c40ca6c) Merge branch 'dev' into tutorial-rework 2019-03-27 20:54:27 +02:00
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