53f9202909
(8f7813f79) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-15 13:43:50 +03:00
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
8f310256b5
(2bbea6767) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-15 13:43:07 +03:00
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
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
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
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
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
bd0c8a9d34
(818a83da1) Alternate door versions with integrated buttons
2019-04-10 13:22:39 +03:00
f278ff212c
(370a5daac) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-08 13:35:02 +03:00
8a227a4f2c
(570318151) Cleanup.
2019-04-08 13:34:48 +03:00
153b08065b
(12487d533) Added Berilia submarine, 95% complete
2019-04-08 12:06:38 +03:00
db754188ce
(bc739e38f) Added impact sounds to items (e.g. when dropped to the ground). Closes #841
2019-04-07 13:40:53 +03:00
14d0daf16d
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-04-06 17:49:31 +03:00
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
3f42d889a2
(166d035d7) New powerOn sounds
2019-04-06 17:48:52 +03:00
110a63b88b
(5bd37e693) Removed PAX.sub
2019-04-06 17:48:38 +03:00
cc122f2bbf
(b451554e8) Merge remote-tracking branch 'origin/dev' into keymapping-refactor-test
2019-04-04 11:10:29 +03:00
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
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
7eb03ea6b3
(874c38a79) Show keybindings for use or shoot in the tooltips.
2019-04-04 11:08:33 +03:00
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
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
79ea41e6c9
(4f4395b00) Reduced the size of the disallowed item interface area around the chatbox
2019-04-04 11:07:45 +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
4558d8b919
(f17acef79) Added the new electrical discharge sound to the project file
2019-04-01 22:47:50 +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
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
fde8cc1d6f
(9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed
2019-03-28 18:10:56 +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
81833e7920
(65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-27 20:54:53 +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
ac60c9477e
(d8c40ca6c) Merge branch 'dev' into tutorial-rework
2019-03-27 20:54:27 +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
179b17e9aa
(093cf0b49) Merge branch 'tutorial-rework' of https://github.com/Regalis11/Barotrauma-development into tutorial-rework
2019-03-27 20:48:56 +02:00
68aa95a5df
(351e4f8b8) Added: hiding of objectives via button
2019-03-27 20:48:42 +02:00
a90ce22107
(8be88da45) Included videos in project, added them to xml
2019-03-27 20:48:29 +02:00
a939cdef91
(a58bf1e5d) Added: Fonts, layouting to video with objective
2019-03-27 20:46:27 +02:00
3f82c9a2cb
(f417b026f) Fetched: Changes for playing video tutorial from local branch
2019-03-27 20:45:14 +02:00
e65c669eaa
(2aa0ff8d3) Do not copy Muikku to output directory
2019-03-27 13:53:07 +02:00
b3a4efdd6f
(c368a04c8) Added a longer version of Muikku, renamed to Selkie
2019-03-27 13:52:53 +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
8537234b75
(df56e74f1) Rename Charybdis as Legacycharybdis. Temporarily disable charybdis events.
2019-03-26 17:09:21 +02:00
81fafaf3f5
633e54b...7cc231b
...
commit 7cc231bc51890e7fde50bbac3413328dd7bc5189
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 14:23:06 2019 +0200
Fixed server creating network events in Item.Load due to CreateServerEvent calls in some of the ItemComponent properties (e.g. LightComponent.IsOn). Caused syncing problems because the entity spawn events aren't created until the item has been loaded, leading to situations where clients fail to read events because the entity doesn't exist at their end yet (see #1293 ). TODO: get rid of console errors when attempting to create events during component initialization in the Item constructor.
commit ac1bf32edf125d95d56775e1e8ce54ac7671328c
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 13:49:55 2019 +0200
Fix Hammerhead attack causing warping. Adjust the targeting priorities.
commit e3e032d7c3a753397269bb4236c1494ab0809004
Author: itchyOwl <lauri.harkanen@gmail.com >
Date: Wed Mar 20 13:48:47 2019 +0200
Enemy AI fixes:
- Fix enemies "fleeing" after they have been shot. There was a steering issue when they targeted characters that were inside the sub when they were outside of it
- Fix the previous target resetting too often
- Fix the wall target resetting too often
- Use world positions instead of sim positions where possible, because the sub positions are then taken into account
commit 847cf5ffd9212a542000dbf12332b2c08756579a
Author: Daniel Asteljoki <daniel.asteljoki@gmail.com >
Date: Wed Mar 20 12:00:15 2019 +0200
Remora: added power connection between sub and drone, removed non-scaling hull parts
commit a9c2e8cc124713e90dd44a9adf2fcbb3204b2c4d
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Wed Mar 20 11:24:37 2019 +0200
Server sets clients' last received campaign save/update IDs to one before the current up-to-date IDs (instead of zero) when a campaign changes. Zero would get interpreted as a more up-to-date ID if the IDs of the current campaign are close to ushort.MaxValue where the IDs wrap around.
commit 07d82b64e6990eacaf8905aed1a5d7c61224e47d
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Tue Mar 19 18:24:01 2019 +0200
Log level inequality error messages & client error reports handled by the server to GameAnalytics
2019-03-20 14:25:03 +02:00
63eb4d64e5
f8b0295...0671290
2019-03-18 23:30:58 +02:00
Joonas Rikkonen