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
|
11a7bf3600
|
(6ed01ab09) Add a todo note.
|
2019-04-15 11:59:09 +03:00 |
|
Joonas Rikkonen
|
a7feb6f7e0
|
(a6a0c23a1) Close all message boxes when clicking the quit button in the pause menu. Fixes character wizard not closing if it's open when quitting to the main menu.
|
2019-04-15 11:58:38 +03:00 |
|
Joonas Rikkonen
|
f4275de1ac
|
(845cfe372) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-11 18:26:56 +03:00 |
|
Joonas Rikkonen
|
a57b7184fb
|
(f6c34b377) Fix crawlers not reacting to any targets if properly latched on walls.
|
2019-04-11 18:26:42 +03:00 |
|
Joonas Rikkonen
|
9b0e0ab278
|
(ec990ac7c) Save chatbox & crew menu toggle state between rounds
|
2019-04-11 18:26:26 +03:00 |
|
Joonas Rikkonen
|
9f55da3677
|
(8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item).
|
2019-04-10 15:13:25 +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
|
57e5a969ba
|
(f95283b36) Submarine preview layout changes, don't display attributes that don't have a value, GUIMessageBox layout tweaking
|
2019-04-05 16:13:12 +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 |
|
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
|
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
|
fd0e394827
|
(04facf9b6) Gray out the text in disabled buttons if the button has no visible sprite (the buttons in the main menu for example looked the same when disabled)
|
2019-04-03 16:24:34 +03:00 |
|
Joonas Rikkonen
|
cae366e807
|
(4d924cc86) Fixes to New Game and Game Settings layouts
+ merge fix
|
2019-04-01 22:55:04 +03:00 |
|
Joonas Rikkonen
|
22372dfffe
|
(061c63299) Wall collider tuning
|
2019-04-01 22:53:41 +03:00 |
|
Joonas Rikkonen
|
43578f3bb2
|
(bb8a4525e) Progress on LOS effect improvements. Hiding the unnecessary shadows at spots where the ends of two walls meet works now, still got to do something about corner areas where a vertical wall meets a horizontal one.
|
2019-04-01 22:53:27 +03:00 |
|
Joonas Rikkonen
|
98e0504e1f
|
(52748e937) Fixed nullref exception if a character eats another one when a gamesession has not been started
|
2019-04-01 22:53:12 +03:00 |
|
Joonas Rikkonen
|
ae3dea40b0
|
(3c1d889c9) Fixed voice activity controls going outside the settings frame
|
2019-04-01 22:52:58 +03:00 |
|
Joonas Rikkonen
|
ee18a1b508
|
(66b8e2955) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:52:44 +03:00 |
|
Joonas Rikkonen
|
6332a6e077
|
(c896c51fb) Display submarine preview in the "new game" menu, layout tweaks
|
2019-04-01 22:52:31 +03:00 |
|
Joonas Rikkonen
|
ca9a516403
|
(8ea276c68) Fixed game settings panel input consistency
|
2019-04-01 22:52:17 +03:00 |
|
Joonas Rikkonen
|
26210da6a6
|
(7076afabd) Reimplemented the "new game" menu changes in b378675 using layout groups
|
2019-04-01 22:52:04 +03:00 |
|
Joonas Rikkonen
|
a3eabfabac
|
(2400ab447) Revert "Improved New Game panel" (easier to do the columns with layoutgroups than by setting the contents to half the width)
|
2019-04-01 22:51:50 +03:00 |
|
Joonas Rikkonen
|
8b12f85f48
|
(b6f451292) Moved crafting recipes from the fabricator xml to the xmls of the items. Makes it possible for modders to add new craftable items without having to modify the fabricators. Closes #1001
|
2019-04-01 22:51:37 +03:00 |
|
Joonas Rikkonen
|
508bd960be
|
(b378675eb) Improved New Game panel
|
2019-04-01 22:51:21 +03:00 |
|
Joonas Rikkonen
|
a46c195532
|
(2a183f60c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:51:07 +03:00 |
|
Joonas Rikkonen
|
8cb4702a5a
|
(cda6af1ad) Increase the steering speed when going to eat. TODO: Adjusting the weight shouldn't have any effect on character speed. The steering vector should be normal until multiplied by the movement speed in the Update function.
|
2019-04-01 22:50:53 +03:00 |
|
Joonas Rikkonen
|
5d6cbb5898
|
(b522c4551) Don't assign the attackinglimb if we shouldn't be attacking. Fixes Hammerhead not falling back after hitting the sub.
|
2019-04-01 22:50:39 +03:00 |
|
Joonas Rikkonen
|
e9a3577316
|
(b2df6e88c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:50:25 +03:00 |
|
Joonas Rikkonen
|
d511ecd4e3
|
(5218c43a0) Server sends the IDs of both selected characters and selected items to the clients. Previously this wasn't needed, because it wasn't possible to have both a character and an item selected at the same time. Fixes characters floating mid-air client-side when dragging others up stairs, and probably some other undiscovered bugs as well.
|
2019-04-01 22:50:11 +03:00 |
|
Joonas Rikkonen
|
ae6b797d73
|
(c2e1b24e2) Fixed remote characters sliding slowly to the left in multiplayer. Happened because linear velocity was written with an accuracy of 12 bits, causing the lowest possible value to be about 1.5 cm/s. Now extremely low velocity values are rounded down to zero. The server also now quantizes the LinearVelocity/AngularVelocity values, which should make position syncing a little more reliable because the server runs the physics using the same rounded values as the clients.
|
2019-04-01 22:49:58 +03:00 |
|
Joonas Rikkonen
|
c5725dbb62
|
(d47fee08d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:49:42 +03:00 |
|
Joonas Rikkonen
|
9fffb05625
|
(9db186429) Double the wall priorioties for crawlers and mudraptors, so that they remain effectively the same after the code changes.
|
2019-04-01 22:49:28 +03:00 |
|
Joonas Rikkonen
|
3062e4c705
|
(1a1137b26) Charybdis now also targets the walls. Tweak Charybdis' attacks and priorities. Fix targeting walls for non-aggressiveboarders. Don't double the wall priority.
|
2019-04-01 22:49:15 +03:00 |
|
Joonas Rikkonen
|
fc9a3893f6
|
(b9babfcf6) Merge branch 'ragdoll-syncing-improvements' into dev
|
2019-04-01 22:49:01 +03:00 |
|
Joonas Rikkonen
|
a0e1ba52eb
|
(0bd92547e) Show ping direction when adjusting the direction slider even if directional ping is not enabled. Closes #1298
|
2019-04-01 22:48:47 +03:00 |
|
Joonas Rikkonen
|
885c30f70d
|
(10a8ba8fc) Fix reversing getting reset when the target is not in range causing issues in steering.
|
2019-04-01 22:48:33 +03:00 |
|
Joonas Rikkonen
|
ed3d5fadeb
|
(f46ddf83f) Fixed calyxanide not being usable in syringe guns
|
2019-04-01 22:48:20 +03:00 |
|
Joonas Rikkonen
|
cbb3216466
|
(633f44200) Emptying the "required items" field of an item in the sub editor now removes the item requirements (instead of using the default ones)
|
2019-04-01 22:48:03 +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
|
7cb70fa344
|
(73193fb71) Updated a couple of sound effects
|
2019-04-01 22:47:36 +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 |
|