 Joonas Rikkonen
|
114fada396
|
(779fe50ee) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 06:42:08 +03:00 |
|
|
Joonas Rikkonen
|
42f287e254
|
(59629f0e1) Fixed: ContentPackage path not being valid on MacOS
|
2019-05-16 06:41:51 +03:00 |
|
|
Joonas Rikkonen
|
d21ccf5ecd
|
(566a98ad3) Fixed docking button usage not being synced
|
2019-05-16 06:36:55 +03:00 |
|
|
Joonas Rikkonen
|
7ceba13e8f
|
(deebc187d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-05-16 06:25:48 +03:00 |
|
|
Joonas Rikkonen
|
e500ba2bdf
|
(a17abe3fa) Remove a not so useful loop from a method, which might be used often.
|
2019-05-16 06:25:12 +03:00 |
|
|
Joonas Rikkonen
|
dc2f96443a
|
(ff4df7194) Merge branch 'dev' of github.com:Regalis11/Barotrauma-development into dev
|
2019-05-16 06:24:39 +03:00 |
|
|
Joonas Rikkonen
|
880b7b1c02
|
(35b1c9d08) Fixed: NetLobby permission view dialog
|
2019-05-16 06:24:21 +03:00 |
|
|
Joonas Rikkonen
|
a2276b308f
|
(0634c0518) Fixed docking interface not activating in subs with more than one docking port (e.g. Selkie) or on nav terminals that control another sub (e.g. Remora's drone control terminal)
|
2019-05-16 06:23:47 +03:00 |
|
|
Joonas Rikkonen
|
f46990d539
|
(d74fee449) Revert "Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons."
|
2019-05-16 05:25:20 +03:00 |
|
|
Joonas Rikkonen
|
e4f41789b0
|
(143d158cb) Merge branch 'dev' into human-ai
|
2019-05-16 05:25:02 +03:00 |
|
|
Joonas Rikkonen
|
88de435487
|
(cf495e03c) Check the visibility to the target when engaging (the distance is not enough, if there's something blocking the line of sight).
|
2019-05-16 05:20:45 +03:00 |
|
|
Joonas Rikkonen
|
3d7a113d75
|
(048b753e6) Merge branch 'dev' into human-ai
|
2019-05-16 05:20:29 +03:00 |
|
|
Joonas Rikkonen
|
039d07f693
|
(a2943d8b7) Merge branch 'dev' into human-ai
|
2019-05-16 05:04:10 +03:00 |
|
|
Joonas Rikkonen
|
60f52375e6
|
(7788ec72a) Test issuing orders automatically.
|
2019-05-16 05:03:49 +03:00 |
|
|
Joonas Rikkonen
|
5af8170ac6
|
(372c6e60a) More automatic text scaling + merge fix
|
2019-05-06 14:15:40 +03:00 |
|
|
Joonas Rikkonen
|
bd659383b4
|
(1aa050263) Cherry pick from human-ai: Fix bots not knowing how to use the integrated controllers, effectively failing to use the doors with integrated buttons.
|
2019-05-03 13:48:48 +03:00 |
|
|
Joonas Rikkonen
|
3701f0e957
|
(7e3aa6097) Merge remote-tracking branch 'origin/docking-interface' into dev
|
2019-05-03 13:48:31 +03:00 |
|
|
Joonas Rikkonen
|
35f4657ea1
|
(d85d68721) Fixed character's feet getting stuck to platforms when climbing ladders while holding A/D
|
2019-05-03 13:44:04 +03:00 |
|
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
|
Joonas Rikkonen
|
7d7950e70b
|
(c3c244ef4) Nicer looking docking interface buttons (actual arrows instead of U, D, <, >)
|
2019-05-03 13:43:09 +03:00 |
|
|
Joonas Rikkonen
|
bc5f571903
|
(29d8edbb9) Use a sprite to draw the lines on the sonar display (looks better than GUI.DrawLine)
|
2019-05-03 13:42:36 +03:00 |
|
|
Joonas Rikkonen
|
1d7faa8d1d
|
(b778c4641) Docking button works now in the docking interface, change button text depending on whether we're docking/undocking, some placeholder UI graphics for the nav terminal
|
2019-05-03 13:42:19 +03:00 |
|
|
Joonas Rikkonen
|
32a8b97ad4
|
(01452b66f) Fixed "maintain position" indicators & inputs being relative to the center of the screen, not the center of the sub. Flash the docking button when ready to dock.
|
2019-05-03 13:41:42 +03:00 |
|
|
Joonas Rikkonen
|
fbb7daed00
|
(0c3442136) Merge branch 'dev' into docking-interface
|
2019-05-03 13:41:23 +03:00 |
|
|
Joonas Rikkonen
|
45ba589d96
|
(12412e6fd) Determine the steering vector relative to the center of the sub, not the center of the display when clicking on the display
|
2019-05-03 13:41:06 +03:00 |
|
|
Joonas Rikkonen
|
5d4a3f18c6
|
(021a3d977) Draw the steering indicator at the center of the sub, not at the center of the display. Change the color of the docking indicators when ready to dock
|
2019-05-03 13:40:49 +03:00 |
|
|
Joonas Rikkonen
|
a2c2f72357
|
(2edf7845f) Progress on docking interface (nudge controls), focus sonar on the center of the submarine instead of the nav terminal
|
2019-05-03 13:40:31 +03:00 |
|
|
Joonas Rikkonen
|
b551ae7999
|
(c1468d39d) Overhauled docking interface (WIP)
|
2019-05-03 13:39:54 +03:00 |
|
|
Joonas Rikkonen
|
482b3dacfd
|
(392954b0e) Swap the order of the starting location & destination in nav terminals when playing in a mirrored sub.
|
2019-04-29 21:18:04 +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
|
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 |
|
|
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
|
86ded4b1d5
|
(2f573ba39) Fix Hammerhead spritesheet orientation.
|
2019-03-27 20:54:13 +02:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
3f82c9a2cb
|
(f417b026f) Fetched: Changes for playing video tutorial from local branch
|
2019-03-27 20:45:14 +02:00 |
|
|
Joonas Rikkonen
|
6fd4d14497
|
(8b8693dbf) Allow editing selected wires in wiring mode, made connection panels a little less transparent. Closes #1329
|
2019-03-26 17:34:35 +02:00 |
|
|
Joonas Rikkonen
|
d60696f895
|
(a0e195312) Don't allow steering with WASD when a textbox is selected. Closes #1353
|
2019-03-26 17:34:21 +02:00 |
|
|
Joonas Rikkonen
|
044fd3344b
|
2f107db...5202af9
|
2019-03-18 21:42:26 +02:00 |
|
|
Joonas Rikkonen
|
6c0679c297
|
38f1ddb...178a853: v0.8.9.1, removed content folder
|
2019-03-18 20:39:27 +02:00 |
|
|
Joonas Rikkonen
|
8160abe109
|
Fixed nullref exceptions when loading a steering component when a gamesession is running but no locations have been selected (not sure how that can even happen)
|
2018-08-14 13:28:11 +03:00 |
|
|
Joonas Rikkonen
|
dcb6de32c0
|
Some more hard-coded text removal
|
2018-01-31 19:01:48 +02:00 |
|
|
Joonas Rikkonen
|
79f3f04c3b
|
Fixed Steering components never setting their currPowerConsumption field above zero, making them cause zero load on the electrical grid.
|
2018-01-01 15:00:12 +02:00 |
|
|
Joonas Rikkonen
|
64ad5e5003
|
Removed unnecessary using directives
|
2017-07-05 18:35:09 +03:00 |
|