 Joonas Rikkonen
|
0f4c7c302f
|
(41e8be463) Revert "Rewiring the door changes it's behavior. TODO: Might be better to implement as two separate type of doors?" (Now using two separate doors instead)
|
2019-04-10 13:23:31 +03:00 |
|
|
Joonas Rikkonen
|
fde99f5373
|
(586e37096) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-10 13:22:57 +03:00 |
|
|
Joonas Rikkonen
|
bd0c8a9d34
|
(818a83da1) Alternate door versions with integrated buttons
|
2019-04-10 13:22:39 +03:00 |
|
|
Joonas Rikkonen
|
842b6a2e34
|
(9619c01cd) Change the info text colors and cache the list.
|
2019-04-10 13:22:19 +03:00 |
|
|
Joonas Rikkonen
|
d7c88e3055
|
(f185bce97) Fix an indentation.
|
2019-04-10 13:22:02 +03:00 |
|
|
Joonas Rikkonen
|
5a7abc430c
|
(5d7e5eb93) Rewiring the door changes it's behavior. TODO: Might be better to implement as two separate type of doors?
|
2019-04-10 13:21:45 +03:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
443d199017
|
(cd7359bb3) StatusEffects can modify item sound and sight ranges (requires an AITarget)
|
2019-04-08 23:12:09 +03:00 |
|
|
Joonas Rikkonen
|
71128c27e6
|
(7764eef2d) CustomInterfaces can apply status effects when a button is pressed or depending on the state of a tickbox (OnUse when the tickbox is checked, OnSecondaryUse otherwise).
|
2019-04-08 23:11:56 +03:00 |
|
|
Joonas Rikkonen
|
4811ec796f
|
(50447ac17) Inventory syncing fixes. Could be related to #768. - When moving an item from an inventory to another, create the event for the target inventory first, then for the inventory the item is being removed from. Otherwise clients would first drop the item, and then put it in the container with the next event, which works most of the time, but if the second event is delayed enough that the item is not within the character's reach by the time it arrives, the client will be unable to put it in the container and the item will just be dropped. - Fixed item velocities not being reset when they're dropped from a character's inventory. I'm not exactly sure why, but sometimes they had very high downwards velocities (even though the body was previously inactive), which caused them to launch through floors and made the previous inventory syncing issue much worse (because a delay of just a couple of frames was enough to move the item out of the character's reach).
|
2019-04-08 19:18:04 +03:00 |
|
|
Joonas Rikkonen
|
71d546ff7f
|
(f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 19:17:50 +03:00 |
|
|
Joonas Rikkonen
|
9a829206af
|
(2c264b075) Improve readability (no functional changes).
|
2019-04-08 19:17:06 +03:00 |
|
|
Joonas Rikkonen
|
e19bf22112
|
(9c93ed664) Fixed fabricators and deconstructors deteriorating when they're powered (not just when fabricating/deconstructing) something
|
2019-04-08 19:16:23 +03:00 |
|
|
Joonas Rikkonen
|
d8b194d249
|
(91c5faef2) Item deterioration fixes
|
2019-04-08 19:15:41 +03:00 |
|
|
Joonas Rikkonen
|
4902de606b
|
(5d9bdaea4) Deterioration values (timer, deterioration rate, whether the timer is currently running, item condition) are visible in debugdraw, fixed items that should only deteriorate for X seconds after being used deteriorating continuously
|
2019-04-08 15:59:53 +03:00 |
|
|
Joonas Rikkonen
|
eaf8b1275d
|
(f0be0bba0) Fixed inability to repair items when they'er not deteriorating (was caused by 9a14162)
|
2019-04-08 15:59:19 +03:00 |
|
|
Joonas Rikkonen
|
be96afc5dd
|
(4ddf8b0b2) Fixed power not working correctly in some grids with chained relays and junction boxes. Closes #1385
|
2019-04-07 21:44:02 +03:00 |
|
|
Joonas Rikkonen
|
be76bd53e9
|
(9a14162c6) Disabled spontaneous deterioration on items that are not being used. TODO: adjust all deterioration rates and delays
|
2019-04-07 21:43:35 +03:00 |
|
|
Joonas Rikkonen
|
1297127ae2
|
(0be4bd31d) Todo note about idling characters killing the framerate (see #1397)
|
2019-04-07 13:41:07 +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
|
d15a88c619
|
(3e8bdbb0a) v0.8.9.9 + merge fix
|
2019-04-06 17:54:39 +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
|
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
|
161f725778
|
(2b36813ef) Added Back button to submarine editor
|
2019-04-05 16:19:07 +03:00 |
|
|
Joonas Rikkonen
|
8f42801c7a
|
(2d473d38a) Add RequireAimToUse checks for being logical and for future. Shouldn't have any functional implications in the current version, but we could have RepairTools or Weapons that don't require aiming.
|
2019-04-05 16:18:52 +03:00 |
|
|
Joonas Rikkonen
|
07c40f317f
|
(52c7231e3) Reparse item messages when key bindings are changed
|
2019-04-05 16:15:27 +03:00 |
|
|
Joonas Rikkonen
|
6ac3ecd2b2
|
(86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-04 11:43:25 +03:00 |
|
|
Joonas Rikkonen
|
3b35ba056d
|
(1a47431ff) Instead of displaying the red flash, automatically put the currently equipped item in the inventory (no matter if it's one or two handed) when picking up items that require two hands. If the item cannot be put into the inventory, the flash should be displayed (no auto dropping).
|
2019-04-04 11:12:32 +03:00 |
|
|
Joonas Rikkonen
|
709d9e44ab
|
(541e3ffbe) Check that the mask is equipped in the head before trying to unequip.
|
2019-04-04 11:12:18 +03:00 |
|
|
Joonas Rikkonen
|
7126a60b7a
|
(558e47075) -Reduced condition loss per use for plastiseal (-100 to -25), reduced the effect a bit (TODO: add more plastiseal to subs) -Reduced condition loss per use for antibiotic glue (-100 -> -50) -Implemented crafting recipes for antidotes -Made spacing more uniform in medical xml
|
2019-04-04 11:12:05 +03:00 |
|
|
Joonas Rikkonen
|
4e45876a6c
|
(502e453a9) Instead of placing the weapon to a slot 3, find the allowed hand slots.
|
2019-04-04 11:11:51 +03:00 |
|
|
Joonas Rikkonen
|
a7899b4b08
|
(869f6c46e) Restore text changes that were lost due to a merge: Display the binded key alongside the required tool.
|
2019-04-04 11:11:38 +03:00 |
|
|
Joonas Rikkonen
|
7c4f8fcb88
|
(153cbd717) Fix reset button not refreshing the settings frame. Fix a text tag.
|
2019-04-04 11:11:24 +03:00 |
|
|
Joonas Rikkonen
|
87592720df
|
(4c3f5c691) Changed default radio keybind to R and creature attack keybind to 3rd mouse button. Radio key is used much more frequently than the attack key, so it makes sense for it to be closer to WASD (+ R for radio is more intuitive).
|
2019-04-04 11:11:09 +03:00 |
|
|
Joonas Rikkonen
|
81239418f3
|
(218b21ab0) Set keybind textboxes to be equal height
|
2019-04-04 11:10:56 +03:00 |
|
|
Joonas Rikkonen
|
16c558a859
|
(7c1aa6679) Reset settings frame when controls are reset, added a button for resetting to default controls & tooltips for the control reset buttons, split keybind textboxes into two columns
|
2019-04-04 11:10:43 +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
|
371bcb11c1
|
(7a980e4e6) Increased the range of docking port sounds and added a subtle camera shake when locking the ports to make it more noticeable when a sub docks.
|
2019-04-04 11:09:58 +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 |
|
|
Joonas Rikkonen
|
1966bcb4ab
|
(c445db0f5) Lazy load item & structure sprites (loaded automatically when switching to the sub editor or instantiating an item/structure, so should not cause any mid-game freezes).
|
2019-04-04 11:09:32 +03:00 |
|
|
Joonas Rikkonen
|
66fa81bd3d
|
(23a7169b0) Updated item assemblies to get the items in sync with the current prefabs (see #1363)
|
2019-04-04 11:09:17 +03:00 |
|
|
Joonas Rikkonen
|
dce643e116
|
(a135020e9) Fixed item assembly names and descriptions not being fetched from the text xml
|
2019-04-04 11:09:03 +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
|
860e5204ab
|
(cad2b1306) Fix the camera issue on turrets.
|
2019-04-04 11:07:29 +03:00 |
|