87a0ee21eb
(6e187d247) Fixed contained items' status effects being added twice to the list of an ItemContainer's active status effects when swapping items. For example, when swapping a fuel rod with another one, the status effect that increases AvailableFuel would be applied twice, causing the reactor to act as if there were 2 rods in it. Closes #1643 + merge fix
2019-06-15 20:24:01 +03:00
c76ae7612d
(c224aa4f4) Refresh the size of the linked gap when a door's scale is changed
2019-06-15 20:14:58 +03:00
cdc58316ed
(f2cce83a3) AI combat improvements: - Bots now find weapons that are inside the equipped containers (tool boxes). - Bots can now use any item as a weapon as long as there's a combat priority defined for the items. - Adjust the combat priorities a bit; the bots now prioritize welding tool and plasma cutter over wrench or toolbox.
2019-06-04 16:52:24 +03:00
e367f900b8
(2a4bd39c2) Merge branch 'dev' into human-ai
2019-05-16 05:33:13 +03:00
bec7aadfa9
(af16ecdfa) Merge branch 'dev' into human-ai
2019-05-16 05:14:00 +03:00
039d07f693
(a2943d8b7) Merge branch 'dev' into human-ai
2019-05-16 05:04:10 +03:00
60f52375e6
(7788ec72a) Test issuing orders automatically.
2019-05-16 05:03:49 +03:00
5868b1da41
(0792e9b34) Option to ignore item requirements in the sub editor. Items can now be placed to secure cabinets and crates in character mode without having to spawn an ID Card in the inventory first.
2019-05-06 11:33:42 +03:00
fbb7daed00
(0c3442136) Merge branch 'dev' into docking-interface
2019-05-03 13:41:23 +03:00
b551ae7999
(c1468d39d) Overhauled docking interface (WIP)
2019-05-03 13:39:54 +03:00
e83dba2959
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
2019-04-25 18:07:37 +03:00
b0580a9050
(7e43eae73) Optimized Item.ApplyStatusEffects & ItemComponent.PlaySound: check if the item has effects/sounds of the correct type from a bool array instead of doing a dictionary lookup. A small thing, but the methods are called so frequently that it adds up to a lot.
2019-04-18 12:05:11 +03:00
6262b3ea54
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-16 17:12:09 +03:00
bd07acf26d
(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0
2019-04-16 17:11:49 +03:00
373554ddfb
(461eade89) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
2019-04-15 12:09:36 +03:00
8a42bb3bbd
(add7a8fe6) Fixed: Error in localization when importing npc conversations. Added: proofread englishvanilla
2019-04-15 12:09:22 +03:00
45be409a84
(84bcafc68) Added "text picker menu" to ItemMsgs, replace """ with a quotation mark in texts
2019-04-15 12:08:39 +03:00
2ca299af10
(ab07307c5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-10 13:27:49 +03:00
593d99ec38
(df9b1966f) Added an option to disable directional voice chat. Closes #1414
2019-04-10 13:27:30 +03:00
74da38bd10
(3315662d5) Implement optional required items (lol) and fix the doors. It's a bit confusing, but should work.
2019-04-10 13:26:56 +03:00
25453018fc
(3f015888d) Implement manual doors that can be opened simply by clicking on them. Add a test sub (not added in the project -> have to manually place in the local bin folder to test it).
2019-04-10 13:21:25 +03:00
d15a88c619
(3e8bdbb0a) v0.8.9.9 + merge fix
2019-04-06 17:54:39 +03:00
07c40f317f
(52c7231e3) Reparse item messages when key bindings are changed
2019-04-05 16:15:27 +03:00
860e5204ab
(cad2b1306) Fix the camera issue on turrets.
2019-04-04 11:07:29 +03:00
5f05322fdb
(fdc038d5d) Keymapping and UX test: - Map use to "E" and Select to "Left Mouse". - Introduce a dedicated key for deselecting ("Right Mouse"). - Introduce a dedicated key for shooting ("Left Mouse"). - Define certain objects as shootables, which simply means that they use the "Shoot" key instead of using the "Use" key. This required the least amount of refactoring the existing code. - TODO: don't register the "Select" input when aiming or when an interface is open -> should prevent interacting through UI elements. - TODO: sync the new input types with the server.
2019-04-04 11:06:12 +03:00
0ecfc426ff
(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-03 16:22:12 +03:00
0dd1823eb1
(44a496915) Added: Template for using a video with the Welcome text in the tutorial if needed. Removed: Old spritesheets. Fixed: Bug in fetching crew with certain jobs
2019-04-03 16:21:57 +03:00
c5725dbb62
(d47fee08d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-01 22:49:42 +03:00
3062e4c705
(1a1137b26) Charybdis now also targets the walls. Tweak Charybdis' attacks and priorities. Fix targeting walls for non-aggressiveboarders. Don't double the wall priority.
2019-04-01 22:49:15 +03:00
a0e1ba52eb
(0bd92547e) Show ping direction when adjusting the direction slider even if directional ping is not enabled. Closes #1298
2019-04-01 22:48:47 +03:00
885c30f70d
(10a8ba8fc) Fix reversing getting reset when the target is not in range causing issues in steering.
2019-04-01 22:48:33 +03:00
cbb3216466
(633f44200) Emptying the "required items" field of an item in the sub editor now removes the item requirements (instead of using the default ones)
2019-04-01 22:48:03 +03:00
2eaf22683d
(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)
2019-04-01 22:47:22 +03:00
ec7e23061b
(38b5d9aad) Experimental changes to syncing ragdolled (unconscious/dead) characters: - Higher error tolerance when syncing the positions. It's often hard to get the main limb exactly to the same position as the collider, because the positions of the limbs aren't synced and the pose of the ragdoll may differ between the server and clients. Increasing the tolerance makes it less likely for dead/unconscious characters to "twitch" when the game attempts to force the main limb to the position of the collider. - If the position of the ragdoll differs from the position of the collider so much that CheckDistFromCollider disables limb collisions, apply an additional force to all limbs to force the ragdoll to the correct position. Otherwise the ragdoll can occasionally start "hanging" midair, clipping through solid objects, because the main limb's pull joint doesn't necessarily have enough force to pull the entire ragdoll up to the collider.
2019-04-01 22:47:03 +03: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
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
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
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
c78546b5f4
a75a560...814f6c9
...
commit 814f6c9dd4d48b3931e1d3bcb1918ff79324c1d4
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 19:33:18 2019 +0200
Fixed multiplayer campaign setup UI showing the client's subs instead of the server's (see #1311 )
commit 4a3e485dea85aa21037b13fd1b86af4a4ec1a5fd
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 19:16:17 2019 +0200
Move new texts in the end of the localization file.
commit 5a8af99afe5aad0b2f5343ca6f923d8c7eb19e68
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 19:05:43 2019 +0200
Recreate the editing gui window when resetting the entities with the "resetall" command.
commit 0048e6dcb9699e5b1e434ace867bc8f426cdae28
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 19:04:42 2019 +0200
Fix resetting to prefab.
commit 88be0923761f5ac2c895364c8ad0e11fe9a66576
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 18:40:13 2019 +0200
Fix item components not being loaded properly.
commit 6f970d54ed800eff25ae3643b03c0020336c8621
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 18:21:25 2019 +0200
Add a console command for resetting all items and structures to the prefabs.
commit bd561ef43391a2e4251bef18a8738b233f540961
Merge: e8843c30c a75a56088
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 17:47:14 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
commit e8843c30cdb966832236ec361494e4c886130590
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 17:46:38 2019 +0200
Implement item and structure instance resetting to prefab. Add buttons in the subeditor. Allow to save the msg text in the editor.
2019-03-20 19:42:17 +02:00
5127038dc8
7cc231b...69487a2
...
commit 69487a2a8596ac24252c12624b40b7ad7a06edb5
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 15:50:44 2019 +0200
Fixed TargetItemComponentName comparisons in StatusEffect conditionals. Closes #1307
commit 8568bbce1a6d7d809e8e7a63509850387d6d2b91
Merge: b4bd00925 481755c1b
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 15:46:12 2019 +0200
Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
commit b4bd0092566cb31239bc8c585d98f4949fdc57b1
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 15:45:48 2019 +0200
Reinstate equipped item overrides for all item component instances.
commit 481755c1b636794886a38f8503b801df89eeee7e
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 15:37:55 2019 +0200
Don't create network events in the LightComponent.IsOn setter if the round hasn't started (= when loading a game and initializing the items)
2019-03-20 16:07:57 +02:00
Joonas Rikkonen