 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
|
f676e8c67e
|
(914a15437) Fixed: Checking for jobs using name instead of the prefab identifier
|
2019-04-03 16:22:26 +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
|
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
|
c9db9ec4ff
|
(1631eb0fc) Added a null check to ContextualTutorial.IsFlooding
|
2019-03-29 21:51:11 +02:00 |
|
|
Joonas Rikkonen
|
6f919a4de0
|
(f8907b59f) Added: Proper scaling based on resolution for VideoPlayer. Modified: IsFlooding check of contextual tutorial to require water volume
|
2019-03-29 21:50:44 +02:00 |
|
|
Joonas Rikkonen
|
d4d6a2ad30
|
(f16622a9d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:26:26 +02:00 |
|
|
Joonas Rikkonen
|
a64096b5aa
|
(24cde6cae) Add a static sight range. Considerably increase the hull sight ranges.
|
2019-03-29 17:25:58 +02:00 |
|
|
Joonas Rikkonen
|
57f8fe437b
|
(2ae3a8227) Formatting
|
2019-03-29 17:25:43 +02:00 |
|
|
Joonas Rikkonen
|
ebe9af92c2
|
(a9f855db4) Fixed: order of checks in previous commit
|
2019-03-29 17:25:28 +02:00 |
|
|
Joonas Rikkonen
|
ce8501adf3
|
(b05f3e3d1) Fixed: Flood check logic
|
2019-03-29 17:25:00 +02:00 |
|
|
Joonas Rikkonen
|
ca08b803dc
|
(891ef87c3) Fixed: CrewManager throwing errors if changing resolutions when a crewmember is dead. Added: Scaling of the objective list when changing resolutions
|
2019-03-29 17:24:02 +02:00 |
|
|
Joonas Rikkonen
|
d974a5d72f
|
(3a98135bd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:21:37 +02:00 |
|
|
Joonas Rikkonen
|
c0cf060526
|
(7d7e17231) Implement reversing and make it as an option for attacks. Detach latching with "F" (debug feature).
|
2019-03-29 17:20:54 +02:00 |
|
|
Joonas Rikkonen
|
2490951b2b
|
(6912a70c7) Removed: Unused, old code. Fixed: Formatting
|
2019-03-28 18:11:54 +02:00 |
|
|
Joonas Rikkonen
|
a351ffcbda
|
(1beb64bd8) Removed: Duplicate code from VideoPlayer
|
2019-03-28 18:11:25 +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 |
|
|
Joonas Rikkonen
|
ef7b0f0ccf
|
(edc1704a5) Added: A checkmark and small delay before removal for completed objectives
|
2019-03-28 12:34:04 +02:00 |
|
|
Joonas Rikkonen
|
7c8f19ee14
|
(875de4a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-27 20:56:29 +02:00 |
|
|
Joonas Rikkonen
|
86d1102f56
|
(88961a6ea) Fix wrong spelling: Blatter -> Bladder.
|
2019-03-27 20:56:01 +02:00 |
|
|
Joonas Rikkonen
|
81833e7920
|
(65cb56d24) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-27 20:54:53 +02:00 |
|
|
Joonas Rikkonen
|
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 |
|
|
Joonas Rikkonen
|
ac60c9477e
|
(d8c40ca6c) Merge branch 'dev' into tutorial-rework
|
2019-03-27 20:54:27 +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
|
ad1a726e91
|
(8d8ed7727) Fixed: Invalid title font & color in tutorial infobo. Added: Some rudimentary scaling based on screen resolution for VideoPlayer
|
2019-03-27 20:53:46 +02:00 |
|
|
Joonas Rikkonen
|
8808edcd21
|
(025652eb8) Fixed: Holding an item preventing interaction with tutorial elements, medical overlay appearing on top of video / info, reactor command tutorial not completing when powered up by the player
|
2019-03-27 20:53:30 +02:00 |
|
|
Joonas Rikkonen
|
47b16f4f9e
|
(9f4948c63) Fixed: Welcome text size. Added: Using enter / escape to close both videoplayer and infobox to prevent errors when quitting while these are active
|
2019-03-27 20:52:30 +02:00 |
|
|
Joonas Rikkonen
|
b66bdb6da4
|
(a7d754a40) Fixed: ContextualTutorial not resetting properly when quitting a single player campaign session and starting a new game after. Added: Forced on for contextual tutorial when the selected sub is 'PAX'
|
2019-03-27 20:52:16 +02:00 |
|
|
Joonas Rikkonen
|
5a620ec60d
|
(771621c77) Added: Delays for medical & flooding tutorials, resetting of injuredmember when starting again
|
2019-03-27 20:51:33 +02:00 |
|
|
Joonas Rikkonen
|
0f405512b2
|
(69e52eea2) Fixed: Tutorial not resetting properly on retry
|
2019-03-27 20:51:03 +02:00 |
|
|
Joonas Rikkonen
|
8b5e18c348
|
(edf82e6ca) Modified: VideoPlayer video position, medical objective completion, saving segment when objective is completed
|
2019-03-27 20:50:50 +02:00 |
|
|
Joonas Rikkonen
|
ff20f7f374
|
(936119c69) Fixed: Aligning problems when an objective is removed, crashing when EnemyOnSonar is triggered, dead monsters still counting for EnemyOnSonar, ReactorCommand objective to complete when the order is given.
|
2019-03-27 20:50:21 +02:00 |
|
|
Joonas Rikkonen
|
69852a141e
|
(6840c9114) Set the objective frame to be drawn behind other gui elements. TODO: test and complain if doesn't work ;)
|
2019-03-27 20:49:53 +02:00 |
|
|
Joonas Rikkonen
|
2cdc7ce5f3
|
(57c934c4b) Added: Padding for video text, missing xml elements for titles, instructions.
|
2019-03-27 20:49:10 +02:00 |
|
|
Joonas Rikkonen
|
68aa95a5df
|
(351e4f8b8) Added: hiding of objectives via button
|
2019-03-27 20:48:42 +02:00 |
|
|
Joonas Rikkonen
|
27efec90c9
|
(ef6d724ea) Fixed: Invalid pathname when triggering a video for the first time
|
2019-03-27 20:48:13 +02:00 |
|
|
Joonas Rikkonen
|
7140151882
|
(c9b5d70ff) Removed: Hardcoded video path
|
2019-03-27 20:47:58 +02:00 |
|
|
Joonas Rikkonen
|
37f44b87fa
|
(43425b834) Added: Video looping, replaying, pre-video text
|
2019-03-27 20:47:30 +02:00 |
|
|
Joonas Rikkonen
|
e65b688edd
|
(44ca39e16) Added: Escaping the video player via enter, multiple objective tracking & removing
|
2019-03-27 20:46:58 +02:00 |
|
|
Joonas Rikkonen
|
474099732b
|
(f8525130a) Added: Objective tracking, UI changes.
|
2019-03-27 20:46:44 +02:00 |
|
|
Joonas Rikkonen
|
a939cdef91
|
(a58bf1e5d) Added: Fonts, layouting to video with objective
|
2019-03-27 20:46:27 +02:00 |
|
|
Joonas Rikkonen
|
bbfb472122
|
(ed863473d) Added: New tutorial content & UI
|
2019-03-27 20:46:13 +02:00 |
|