 Joonas Rikkonen
|
b8b61ebb02
|
(a405d1aed) Check volume validity in SoundPlayer.UpdateWaterAmbience (there was a report on GameAnalytics about the method setting the gain to an invalid value) + Merge fix
|
2019-04-15 14:12:14 +03:00 |
|
|
Joonas Rikkonen
|
53f9202909
|
(8f7813f79) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-15 13:43:50 +03:00 |
|
|
Joonas Rikkonen
|
e839260a9d
|
(a3d3d1671) Health interface layout tweaking, change "drop" to "use as treatment" when dragging an item to the health interface
|
2019-04-15 13:43:35 +03:00 |
|
|
Joonas Rikkonen
|
4fae57916a
|
(0ac981d7a) Fixed wrong sprites on weapons and ballast icon labels
|
2019-04-15 13:43:21 +03:00 |
|
|
Joonas Rikkonen
|
8f310256b5
|
(2bbea6767) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-15 13:43:07 +03:00 |
|
|
Joonas Rikkonen
|
ffa6192377
|
(655499f68) Add new variants for some classes (wip). The female textures are placeholders. Rename a bunch of files to support the variants and to organize the files a bit better. Also moved the item definitions around and created dedicated xmls for all the classes.
|
2019-04-15 13:42:51 +03:00 |
|
|
Joonas Rikkonen
|
fe235eb37a
|
(2fc766fe5) Add support for wearable item variants. Not used yet. Not synced (not sure if it should).
|
2019-04-15 13:42:37 +03:00 |
|
|
Joonas Rikkonen
|
70a92425d0
|
(77c7a4df9) Small fix to mudraptor sprite sourcerect (adjacent limb was bleeding into the sprite)
|
2019-04-15 13:42:22 +03:00 |
|
|
Joonas Rikkonen
|
918fac9e5e
|
(6c6831abf) Some new sounds, fixed damage sounds not being played if no damage modifiers are applied
|
2019-04-15 13:42:08 +03:00 |
|
|
Joonas Rikkonen
|
3e0d4f5122
|
(16b390a10) Remove an empty line.
|
2019-04-15 13:41:55 +03:00 |
|
|
Joonas Rikkonen
|
bf78825f6d
|
(ff913f363) Renamed labels for consistency
|
2019-04-15 12:10:46 +03:00 |
|
|
Joonas Rikkonen
|
d3481c1dd6
|
(eaf02c38d) If the character has no mentionable afflictions, automatically select the limb with highest dmg on it (if none selected) to be displayed in the health interface.
|
2019-04-15 12:10:33 +03:00 |
|
|
Joonas Rikkonen
|
3b38c7e69e
|
(5616e8c9d) Added image Icons for different sections of the submarine aswell as letters and numbers as decals. NOTE: some of the image icons still needs to be iterated to make them our own
|
2019-04-15 12:10:19 +03:00 |
|
|
Joonas Rikkonen
|
8290c577d8
|
(1dd58d3ff) CustomInterface editor shows each label/signal as a separate textbox (w/ text picker option)
|
2019-04-15 12:10:05 +03:00 |
|
|
Joonas Rikkonen
|
f20e82832f
|
(04b477ff8) Added: ContextualTutorial texts to EnglishVanilla until replaced with the new tutorial
|
2019-04-15 12:09:50 +03:00 |
|
|
Joonas Rikkonen
|
373554ddfb
|
(461eade89) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-04-15 12:09:36 +03:00 |
|
|
Joonas Rikkonen
|
8a42bb3bbd
|
(add7a8fe6) Fixed: Error in localization when importing npc conversations. Added: proofread englishvanilla
|
2019-04-15 12:09:22 +03:00 |
|
|
Joonas Rikkonen
|
6943ff8586
|
(05b7a65ce) Further nerfed bleeding damage for raptors, increased internal damage to compensate.
|
2019-04-15 12:09:08 +03:00 |
|
|
Joonas Rikkonen
|
470b46a603
|
(6807c0fa1) Reverted detector sprite sourcerect changes in 65f7be0. (Need a new texture first)
|
2019-04-15 12:08:53 +03:00 |
|
|
Joonas Rikkonen
|
45be409a84
|
(84bcafc68) Added "text picker menu" to ItemMsgs, replace """ with a quotation mark in texts
|
2019-04-15 12:08:39 +03:00 |
|
|
Joonas Rikkonen
|
21a1b05ae7
|
(aa2fcf7ca) Gave an id card to watchmen to make it possible for them to leave their room (e.g. when running from a hostile player)
|
2019-04-15 12:08:25 +03:00 |
|
|
Joonas Rikkonen
|
c4c49dfb10
|
(5f6bab490) Fixed AI characters being unable to open doors w/ the built-in buttons
|
2019-04-15 12:08:11 +03:00 |
|
|
Joonas Rikkonen
|
754bcd9bf2
|
(97b5e76f9) Made mudraptor bit attack slightly less deadly. You will still die horribly, but less quickly now.
|
2019-04-15 12:07:56 +03:00 |
|
|
Joonas Rikkonen
|
649eeb5a27
|
(d9f7d6f5e) Created a new texture for wall damage
|
2019-04-15 12:07:42 +03:00 |
|
|
Joonas Rikkonen
|
ed38e60d13
|
(32ba1d322) When editing an item label or a room name, the text is colored gray/green according to whether the text can be translated (= if a matching text tag is found in the language files). There's also now a "text picker menu" that can be used to pick the text from a list of translatable texts. TODO: use this in ItemComponent.Msg and CustomInterface button/tickbox labels.
|
2019-04-15 12:07:27 +03:00 |
|
|
Joonas Rikkonen
|
40ef1c018d
|
(02594033c) Added campaign & editor disclaimers to EnglishVanilla
|
2019-04-15 12:07:13 +03:00 |
|
|
Joonas Rikkonen
|
66de47f041
|
(a83cec9d6) Made room names translatable, added "RoomName." to all room names in EnglishVanilla.xml
|
2019-04-15 12:06:58 +03:00 |
|
|
Joonas Rikkonen
|
af1970e8a4
|
(3e7222290) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:11:59 +03:00 |
|
|
Joonas Rikkonen
|
e84203781e
|
(e1b4346f3) Fix enemies not being able to get into the sub via vertical hatches. Removed the velocity manipulation, because it only caused issues.
|
2019-04-05 16:11:30 +03:00 |
|
|
Joonas Rikkonen
|
53443f5eee
|
(d3b1aba39) Slightly reduced the amount of oxygen characters consume from hulls
|
2019-04-05 16:11:15 +03:00 |
|
|
Joonas Rikkonen
|
cc122f2bbf
|
(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test
|
2019-04-04 11:10:29 +03:00 |
|
|
Joonas Rikkonen
|
b08a31a68f
|
(33ab1e038) Add buttons for resetting the settings to the defaults and setting the default keybindings. TODO: pressing the buttons should refresh the settings frame instead of closing it.
|
2019-04-04 11:10:14 +03:00 |
|
|
Joonas Rikkonen
|
a3425a0432
|
(bb85ea959) Fixed last item not being visible in grid layout groups if it's the only item on the last row
|
2019-04-04 11:08:49 +03:00 |
|
|
Joonas Rikkonen
|
7eb03ea6b3
|
(874c38a79) Show keybindings for use or shoot in the tooltips.
|
2019-04-04 11:08:33 +03:00 |
|
|
Joonas Rikkonen
|
d4752bb6a0
|
(9f5c9fbcb) Make sure lazy-loaded sprites load their texture when creating a GUIImage, because the image needs to know the size of the texture to scale itself correctly. Fixes location portraits not being visible in the campaign menu when a location is selected for the first time.
|
2019-04-04 11:08:18 +03:00 |
|
|
Joonas Rikkonen
|
7491b06a5d
|
(bbd192053) Rebind Select and Use keys. Refactor GameSettings to support legacy bindings, when they are set. That is, if the new "deselect" and "shoot" keys are not defined, but the player config file is found, use the "select" and the "use" keys instead of the defaults.
|
2019-04-04 11:08:02 +03:00 |
|
|
Joonas Rikkonen
|
79ea41e6c9
|
(4f4395b00) Reduced the size of the disallowed item interface area around the chatbox
|
2019-04-04 11:07:45 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
0ecfc426ff
|
(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-03 16:22:12 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
0844f1eae4
|
(8e2e6e4da) Physics error prevention: - Use the ApplyForce/ApplyImpulse method overrides that clamp the resulting velocity to a value (in this case NetConfig.MaxPhysicsBodyVelocity, 64 m/s). Without this, explosions and attacks for example could apply arbitrarily large forces to bodies, causing physics errors in Ragdoll.CheckValidity. - Make sure angular velocity still has a sane value after applying an impulse to a specific point of a collider.
|
2019-04-03 16:21:22 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
d4d6a2ad30
|
(f16622a9d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:26:26 +02:00 |
|
|
Joonas Rikkonen
|
a64096b5aa
|
(24cde6cae) Add a static sight range. Considerably increase the hull sight ranges.
|
2019-03-29 17:25:58 +02:00 |
|
|
Joonas Rikkonen
|
c1ac2bb5a9
|
(aa5cc0abe) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:25:14 +02:00 |
|
|
Joonas Rikkonen
|
ce8501adf3
|
(b05f3e3d1) Fixed: Flood check logic
|
2019-03-29 17:25:00 +02:00 |
|
|
Joonas Rikkonen
|
b375cd3be1
|
(db658d442) Keep oxygen percentage at the same level when resizing hulls in the sub editor (otherwise scaling up a hull will cause it to have less oxygen and vice versa)
|
2019-03-29 17:24:31 +02:00 |
|
 juanjp600
|
94c1b29beb
|
(9a13b4418) Hull syncing fixes: - Don't let clients decrease the size of FireSources below zero. May happen because clients are allowed to predict changes in the size (correcting the values when receiving updates from the server), but not remove the fires if their size is too small. - When using the fire/water command, the clients used to simply discard hull updates from the server if fire/water had been edited within 0.5 seconds (to prevent the state from reverting back to previous one when receiving an update). This occasionally caused the fires/water to get out of sync if the server didn't send additional updates after the 0.5 delay. Now the clients will simply correct the hull to the last known server state after the 0.5 second delay.
|
2019-03-25 10:57:18 -03:00 |
|
|
Joonas Rikkonen
|
3301bed442
|
409d4d9...aeafa16 (merge human-ai)
|
2019-03-18 22:52:17 +02:00 |
|