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
817a6100d7
(f4680f78f) Made AI characters less eager to load extra fuel to the reactor (the load needs to be 2x higher than the theoretical max output of the reactor). In some subs the reactor's max output is so low that extra fuel is frequently needed, causing AI characters to constantly put in and take out rods as the load fluctuates. + The AI characters now put the excess rods in their inventory instead of dropping them.
2019-03-29 17:22:36 +02:00
db1d0acac9
(4d569f38c) AI characters can take out excess fuel rods from the reactor, and calculate if more fuel is needed to keep the output at a suitable level instead of only adding more fuel when the reactor is completely empty.
2019-03-29 17:21:52 +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
c76fb32e15
(5bab406f1) Fixed "allowInsideFixture" raycasts not working correctly - checking if the ray is inside the AABB is not enough, we also need to take the shape and rotation of the fixture into account.
2019-03-28 18:12:23 +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
98935935c9
(46c711ce2) Made a bunch of ItemContainer UI panels larger
2019-03-28 18:10:41 +02:00
68a601722c
(34987308f) Fixed reactor warning lights being clickable
2019-03-28 18:10:27 +02:00
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
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
c468b4f6f1
(ccaa0d2e9) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-28 18:09:45 +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
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
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
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
e09740d31e
(371088346) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
2019-03-28 12:34:18 +02:00
ef7b0f0ccf
(edc1704a5) Added: A checkmark and small delay before removal for completed objectives
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.
2019-03-28 12:33:49 +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
8a22dbfebd
(92723d062) Increase Hammerhead head attack dmg to characters.
2019-03-27 20:57:10 +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
86d1102f56
(88961a6ea) Fix wrong spelling: Blatter -> Bladder.
2019-03-27 20:56:01 +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
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
080ac78ded
(5c35a640e) Update tutorial-rework with dev
2019-03-27 20:52:47 +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
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
2019-03-27 13:52:04 +02:00
26a3f866ee
(a3947cb13) Batteries output charge values as ints. Closes #1358
2019-03-27 11:31:16 +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
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
2019-03-26 14:07:37 +02:00
4b3e78b566
(913ed2ce9) Merge remote-tracking branch 'origin/dev' into enemy-ai
2019-03-26 14:07:11 +02:00
Joonas Rikkonen