 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
|
4e525633bf
|
(575357b4b) Made settings and quit buttons larger
|
2019-04-03 16:29:06 +03:00 |
|
|
Joonas Rikkonen
|
311a34da80
|
(733c6d509) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-03 16:27:56 +03:00 |
|
|
Joonas Rikkonen
|
095a51f620
|
(98fa23c8d) Changed alien harpoon and alien shell to physicorium harpoon and shell
|
2019-04-03 16:27:42 +03:00 |
|
|
Joonas Rikkonen
|
1a8d4d5562
|
(98c4c2bac) Added custom colors to sub editor and keybind inputs, some minor tweaks to sub editor layout
|
2019-04-03 16:27:27 +03:00 |
|
|
Joonas Rikkonen
|
d6fb2b4861
|
(64bd73a57) Changed sub editor entity list height in order to get the second row of items fully visible, helps scrolling the list.
|
2019-04-03 16:25:59 +03:00 |
|
|
Joonas Rikkonen
|
8e47a0d1b0
|
(d44357df6) Improved Sub Editor screen
|
2019-04-03 16:25:45 +03:00 |
|
|
Joonas Rikkonen
|
1f94e174ef
|
(50a891840) Lazy deformable LevelObject sprite loading
|
2019-04-03 16:25:31 +03:00 |
|
|
Joonas Rikkonen
|
4685121eee
|
(3ffde5103) Disabled alpha premultiplication on a bunch of non-transparent textures (-> minor loading time reduction)
|
2019-04-03 16:24:48 +03:00 |
|
|
Joonas Rikkonen
|
0ecfc426ff
|
(45f083a5a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-03 16:22:12 +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
|
e4eb6c131c
|
(c225b9831) Fixed crashing if none of the selected content packages contain location portraits suitable for the main menu.
|
2019-04-03 16:20:52 +03:00 |
|
|
Joonas Rikkonen
|
4009a2f2b7
|
(5ef33c5cd) Revert "Set preview image size a bit larger to commodate larger resolutions and to get a clear image". Loading the preview image caused the game to hang.
|
2019-04-02 12:41:46 +03:00 |
|
|
Joonas Rikkonen
|
95fb792cd6
|
(06f76e063) Set preview image size a bit larger to commodate larger resolutions and to get a clear image
|
2019-04-02 12:40:22 +03:00 |
|
|
Joonas Rikkonen
|
1aad8b2038
|
(007519ad5) Higher-res submarine preview images
|
2019-04-02 12:40:08 +03:00 |
|
|
Joonas Rikkonen
|
34ee220bc9
|
(bb5ebaee3) Minor layout improvements to New Game and Game Settings
|
2019-04-02 12:39:42 +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
|
6332a6e077
|
(c896c51fb) Display submarine preview in the "new game" menu, layout tweaks
|
2019-04-01 22:52:31 +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
|
508bd960be
|
(b378675eb) Improved New Game panel
|
2019-04-01 22:51:21 +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
|
0ca4a8db06
|
(169dbd4fd) Increased submarine masses to make it less easy for characters to push them around.
|
2019-04-01 14:26:29 +03:00 |
|
|
Joonas Rikkonen
|
7e67c20ccd
|
(b99c0ef39) Fix the enemies not selecting another attack if they cannot reach the target.
|
2019-04-01 14:26:01 +03:00 |
|
|
Joonas Rikkonen
|
7971d8d3a7
|
(f0911ad58) Scale settings menu according to screen resolution, repositioned main menu tabs so that they don't overlap with the menu buttons
|
2019-04-01 14:25:46 +03:00 |
|
|
Joonas Rikkonen
|
848b069ab2
|
(fc5127152) Fixed inability to select a submarine in the multiplayer campaign setup UI due to the PAX checks
|
2019-03-31 19:12:52 +03:00 |
|
|
Joonas Rikkonen
|
fa2a338d73
|
(b8f75ee96) Fixed level inequality errors caused by 866621c. Accessing the level start/end location properties during level generation caused the seed of RandSync.Server to be changed. Now generating a new random location uses a new MTRandom instance and doesn't touch RandSync.Server.
|
2019-03-31 19:12:27 +03:00 |
|
|
Joonas Rikkonen
|
0b098efbf6
|
(92a838f87) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 21:50:58 +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
|
45e33bca28
|
(3f574078d) Fixed items emitting light from inside containers in the sub editor. Closes #1365
|
2019-03-29 17:27:08 +02:00 |
|
|
Joonas Rikkonen
|
ddfd7274e9
|
(d5ea3c7d5) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-29 17:24:17 +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
|
4c1726ed63
|
(ad2b7c007) Disable editing the vanilla subs in release builds (The subs can still be saved with another name -> can create copies). Change and and add some texts.
|
2019-03-29 17:22:07 +02:00 |
|
|
Joonas Rikkonen
|
e6c3d6d537
|
(6cc2e0541) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-27 21:00:33 +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
|
3b786d7ded
|
(e311dc982) Continue working on Charybdis. Add some deformations. Tweak the joints. Redefine the limb types. Tune the animations.
|
2019-03-27 20:56:14 +02:00 |
|
|
Joonas Rikkonen
|
86d1102f56
|
(88961a6ea) Fix wrong spelling: Blatter -> Bladder.
|
2019-03-27 20:56:01 +02:00 |
|
|
Joonas Rikkonen
|
9c5b43bf72
|
(02c733ec8) Added: Notion of how to rewatch the tutorial instructions
|
2019-03-27 20:55:06 +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 |
|