 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
|
b705b1579c
|
(c12fe7d80) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-15 12:00:49 +03:00 |
|
|
Joonas Rikkonen
|
b4ec36f5bb
|
(2fc72545e) new texts regarding missions and beacons.
|
2019-04-15 12:00:35 +03:00 |
|
|
Joonas Rikkonen
|
4675f969f1
|
(73da2532a) Only repairable items are indestructible in outposts (oxygen tanks, ammo boxes, etc can still deteriorate normally).
|
2019-04-15 11:57:28 +03:00 |
|
|
Joonas Rikkonen
|
561a1a8995
|
(0880ae29f) Don't add ai targets to alien ruin walls.
|
2019-04-15 11:56:18 +03:00 |
|
|
Joonas Rikkonen
|
dd45af5a9f
|
(20f37d9c7) Option to toggle structure drop shadows and edit the position of the shadow
|
2019-04-11 18:25:01 +03:00 |
|
|
Joonas Rikkonen
|
b76aa1ff3a
|
(03291eb8d) Use the sourcerect of a structure's default sprite for the background sprite if it doesn't define it's own sourcerect
|
2019-04-11 18:24:45 +03:00 |
|
|
Joonas Rikkonen
|
dc8b49b5b6
|
(e3f5b70a3) Updated vanilla sub preview images (resolution 1024 x 448-512)
|
2019-04-06 17:52:23 +03:00 |
|
|
Joonas Rikkonen
|
f80e9a29a7
|
(301f0a344) Option to set a custom preview image for subs
|
2019-04-06 17:50:53 +03:00 |
|
|
Joonas Rikkonen
|
c19899769e
|
(cb10b53db) Fixed GUIImage.RecalculateScale throwing an exception if the sprite is not set, use relative scales in GUINumberInput to make the child elements scale dynamically with the parent
|
2019-04-06 17:50:40 +03:00 |
|
|
Joonas Rikkonen
|
7b3ccde624
|
(46f58eedd) Set submarine preview image resolution back to 256x128. For some reason, higher resolutions seem to cause hangs for when loading the image. I suspected it was because of encoding the image as a Base64 string into the xml, but that doesn't seem to case: I tried saving the image as a separate file instead, and it still causes the same problem (see #19 in the private repo).
|
2019-04-06 17:50:27 +03:00 |
|
|
Joonas Rikkonen
|
8d8478432f
|
(00783cc63) Don't premultiply submarine preview image alpha, fixed background texture not covering the whole preview image when using an image resolution larger than the size of the texture
|
2019-04-06 17:50:13 +03:00 |
|
|
Joonas Rikkonen
|
14d0daf16d
|
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:49:31 +03:00 |
|
|
Joonas Rikkonen
|
45c1ed499a
|
(e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used
|
2019-04-06 17:49:18 +03:00 |
|
|
Joonas Rikkonen
|
c94f888c4d
|
(5d73de170) Fixed RefreshSavedSub removing an extra sub from the list (causing an index out of range exception if refreshing a sub at the end of the list)
|
2019-04-06 17:48:13 +03:00 |
|
|
Joonas Rikkonen
|
e086af2c6f
|
(bebc37619) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:20:27 +03:00 |
|
|
Joonas Rikkonen
|
25768d8845
|
(4b54fb4bf) Refactor AIObjectiveCombat and the reactions to the damage. Fixes bots not reacting to any damage done with repair tools. Now they should flee (but not retaliate).
|
2019-04-05 16:20:11 +03:00 |
|
|
Joonas Rikkonen
|
d7364171fb
|
(e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub
|
2019-04-05 16:19:40 +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
|
41da4e24a9
|
(cd41ee958) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-04 11:09:45 +03:00 |
|