ddfd7274e9
(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-29 17:24:17 +02:00
ca08b803dc
(891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions
2019-03-29 17:24:02 +02:00
296ec8bab8
(d95fc9893) Fixed crashing when dragging waypoints in the sub editor due to waypoints not being assigned a prefab
2019-03-29 17:23:47 +02:00
af1f8be4fa
(ad3954bd2) Moved item HUD closing logic to Character.ControlLocal and removed it from ItemInventory. The deselection in ItemInventory was not synced with the server, causing the item to be immediately reselected after the HUD has been closed (and the logic was redundant anyway because it's also handled in Character).
2019-03-29 17:23:33 +02:00
ce359f5309
(93669eac9) Fix cannot close pause menu by pressing esc.
2019-03-29 17:23:19 +02:00
ce2131df42
(e4064088d) Close in-game interfaces when pressing esc. Currently only registered when the mouse is over the interface. Originally I intended to make it so that pressing esc always closes the open interface. But let's test this.
2019-03-29 17:23:05 +02:00
4c1726ed63
(ad2b7c007) Disable editing the vanilla subs in release builds (The subs can still be saved with another name -> can create copies). Change and and add some texts.
2019-03-29 17:22:07 +02:00
d974a5d72f
(3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-29 17:21:37 +02:00
c0cf060526
(7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature).
2019-03-29 17:20:54 +02:00
b9574dde2d
(361a8d556) LevelResource fixes:
...
- If collecting the resource doesn't require any items, allow it to be picked up withour a repair tool. Closes #1325
- Fixed deattach timer not being synced (the methods were implemented, but the server never sent any events). Closes #1292
- Fixed ridiculously small mineral colliders that made it hard to hit them with the plasma cutter (body size was not updated when the sprites were changed?).
2019-03-28 18:17:19 +02:00
f3dc34dfa3
(d211acd47) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-28 18:12:09 +02:00
2490951b2b
(6912a70c7) Removed: Unused, old code. Fixed: Formatting
2019-03-28 18:11:54 +02:00
f51c9c14df
(54ae135f5) Items can be dragged and dropped directly from the inventory into containers without having to select the container first.
2019-03-28 18:11:40 +02:00
a351ffcbda
(1beb64bd8) Removed: Duplicate code from VideoPlayer
2019-03-28 18:11:25 +02:00
2281035ffa
(05ee3bb5f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-28 18:11:10 +02:00
fde8cc1d6f
(9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed
2019-03-28 18:10:56 +02:00
68a601722c
(34987308f) Fixed reactor warning lights being clickable
2019-03-28 18:10:27 +02:00
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
9618c9b7e9
(db8417634) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-28 18:09:19 +02:00
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
bcd779fe78
(519124ad1) Fixed items with no sprite crashing the game. Closes #1153
2019-03-28 12:40:08 +02:00
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
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
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
ef7b0f0ccf
(edc1704a5) Added: A checkmark and small delay before removal for completed objectives
2019-03-28 12:34:04 +02:00
e6c3d6d537
(6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 21:00:33 +02:00
0ab2f2ac69
(29faa9c06) Reinstate charybdis monster events.
2019-03-27 20:57:50 +02:00
98224c6ec9
(cc0f963d6) Fixed nullref exception when loading campaign character inventories in single player.
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.
2019-03-27 20:57:23 +02:00
8a22dbfebd
(92723d062) Increase Hammerhead head attack dmg to characters.
2019-03-27 20:57:10 +02:00
7a5f589639
(99336eacb) Modified: Reduced video's textframe alpha
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
2019-03-27 20:56:42 +02:00
7c8f19ee14
(875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
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.
2019-03-27 20:56:14 +02:00
86d1102f56
(88961a6ea) Fix wrong spelling: Blatter -> Bladder.
2019-03-27 20:56:01 +02:00
963657cd9c
(f5d1ca382) Video title padding
2019-03-27 20:55:48 +02:00
567fb99864
(c3950a782) Tweaks to video title size & placement, wording
2019-03-27 20:55:35 +02:00
55cb2b84d7
(6934499e1) Removed: Duplicates from EnglishVanilla
2019-03-27 20:55:22 +02:00
9c5b43bf72
(02c733ec8) Added: Notion of how to rewatch the tutorial instructions
2019-03-27 20:55:06 +02:00
81833e7920
(65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
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
2019-03-27 20:54:40 +02:00
ac60c9477e
(d8c40ca6c) Merge branch 'dev' into tutorial-rework
2019-03-27 20:54:27 +02:00
86ded4b1d5
(2f573ba39) Fix Hammerhead spritesheet orientation.
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.
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
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
2019-03-27 20:53:30 +02:00
ec481eba45
(e54f169fe) Better quality videos for tutorial, removed sound
2019-03-27 20:53:17 +02:00
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
Joonas Rikkonen