 Joonas Rikkonen
|
f365bdc92f
|
(a66d0118e) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-25 18:11:45 +03:00 |
|
|
Joonas Rikkonen
|
c455bda37e
|
(6f4d8cd0e) Added: Dimmed background for info frames. Fixed: Highlight waits to be only a frame as it seems to be enough
|
2019-04-25 18:11:27 +03:00 |
|
|
Joonas Rikkonen
|
e11752276b
|
(9680a2a43) Moved tutorial sub and outpost to tutorial folder
|
2019-04-25 18:11:11 +03:00 |
|
|
Joonas Rikkonen
|
ad028163a2
|
(332bdd387) Added: Content.RootDirectory modifying on macOS
|
2019-04-25 18:08:20 +03:00 |
|
|
Joonas Rikkonen
|
52991e1ded
|
(41a4cf029) Merge
|
2019-04-25 17:50:53 +03:00 |
|
|
Joonas Rikkonen
|
8be51d71bd
|
(444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead
|
2019-04-25 17:50:35 +03:00 |
|
|
Joonas Rikkonen
|
457000c8dd
|
(9e2b50b03) Removed unused duplicate texture
|
2019-04-25 17:49:59 +03:00 |
|
|
Joonas Rikkonen
|
3a83ac42c9
|
(dd2b3452f) Social center png added (was missing)
|
2019-04-25 17:49:41 +03:00 |
|
|
Joonas Rikkonen
|
a90cdb7843
|
(c5ad20e76) Graphics for outposts: Added new backwalls for outpost rooms (shop,maintenance bay and social center) aswell as some corridor pieces
|
2019-04-25 17:49:05 +03:00 |
|
|
Joonas Rikkonen
|
f71cb42894
|
(6d31fd774) Fixed case issues with AlienButton.ogg and AlienPump.ogg
|
2019-04-25 17:44:41 +03:00 |
|
|
Joonas Rikkonen
|
e938256488
|
(22afbf1e9) New footstep sounds for crawler, mudraptor & walking on water
|
2019-04-24 11:50:04 +03:00 |
|
|
Joonas Rikkonen
|
402e13e78a
|
(1ec677b1b) Added OutpostWall_A.png to the project
|
2019-04-24 11:48:51 +03:00 |
|
|
Joonas Rikkonen
|
a044313347
|
(a7b61face) Added automatic bilge pump assembly, updated old airlock doors assembly
|
2019-04-23 11:17:02 +03:00 |
|
|
Joonas Rikkonen
|
fe163b34b2
|
(779eec74b) Removed unused wall textures from the project
|
2019-04-18 12:02:19 +03:00 |
|
|
Joonas Rikkonen
|
b8354d37a5
|
(d8e711f70) Atlased some background wall sprites, resized SubRearBow.png to power of two, removed some unused textures
|
2019-04-17 12:44:38 +03:00 |
|
|
Joonas Rikkonen
|
707d9ed398
|
(9d7465a38) New alien item sounds
|
2019-04-16 17:12:27 +03:00 |
|
|
Joonas Rikkonen
|
6262b3ea54
|
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-16 17:12:09 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
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
|
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
|
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
|
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
|
cb2a0ff49e
|
(65f7be0b6) Update: StructurePrefabs.xml, temp textures for fins, several new lamps, lightcomponent 90 degrees turned -option, icon atlas,
|
2019-04-15 12:01:18 +03:00 |
|
|
Joonas Rikkonen
|
bd0c8a9d34
|
(818a83da1) Alternate door versions with integrated buttons
|
2019-04-10 13:22:39 +03:00 |
|
|
Joonas Rikkonen
|
f278ff212c
|
(370a5daac) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 13:35:02 +03:00 |
|
|
Joonas Rikkonen
|
8a227a4f2c
|
(570318151) Cleanup.
|
2019-04-08 13:34:48 +03:00 |
|
|
Joonas Rikkonen
|
153b08065b
|
(12487d533) Added Berilia submarine, 95% complete
|
2019-04-08 12:06:38 +03:00 |
|
|
Joonas Rikkonen
|
db754188ce
|
(bc739e38f) Added impact sounds to items (e.g. when dropped to the ground). Closes #841
|
2019-04-07 13:40:53 +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
|
3f42d889a2
|
(166d035d7) New powerOn sounds
|
2019-04-06 17:48:52 +03:00 |
|
|
Joonas Rikkonen
|
110a63b88b
|
(5bd37e693) Removed PAX.sub
|
2019-04-06 17:48:38 +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
|
4558d8b919
|
(f17acef79) Added the new electrical discharge sound to the project file
|
2019-04-01 22:47:50 +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
|
c244b33fe8
|
(85018077f) HONK: Characters play Entrance of the Gladiators on the guitar when wearing a clown mask. Closes #1333
|
2019-03-30 15:35:07 +02:00 |
|
|
Joonas Rikkonen
|
fde8cc1d6f
|
(9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed
|
2019-03-28 18:10:56 +02:00 |
|