Commit Graph

2851 Commits

Author SHA1 Message Date
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
Joonas Rikkonen
2d52a8ddf4 (883c460d5) Don't require holding the aim key when using the periscope/controller. Move the RequireAimToUse from Controller component to Item. Change the use and shoot logic accordingly. TODO: fix the camera centering. 2019-04-04 11:07:14 +03:00
Joonas Rikkonen
c8a7815ef8 (6ae5f1e59) Sync the new input with the server. 2019-04-04 11:06:59 +03:00
Joonas Rikkonen
3f05035c18 (c4338b107) Disable aiming when interacting with an item other than ladders. 2019-04-04 11:06:44 +03:00
Joonas Rikkonen
0cd81c6a99 (cdc68f306) Don't select items when aiming. 2019-04-04 11:06:28 +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
2290645bc9 (caa04a08a) Added a search bar to fabricators, made the interface larger and item previews smaller to fit more items in the view, take chatbox into account when preventing item interface overlap. Closes #1305
+ merge fix
2019-04-03 16:31:17 +03:00
Joonas Rikkonen
0fb6896f1c (b56c60044) Updated: Submarine descriptions 2019-04-03 16:29:34 +03:00
Joonas Rikkonen
f3d1888c71 (fb4821343) Added descriptions for Dugong, Remora, Venture 2019-04-03 16:29:20 +03:00
Joonas Rikkonen
4e525633bf (575357b4b) Made settings and quit buttons larger 2019-04-03 16:29:06 +03:00
Joonas Rikkonen
ea23ff94d2 (cb16eb160) Removed: Unused instruction 2019-04-03 16:28:53 +03:00
Joonas Rikkonen
b4e0294b2d (52b28ec91) Removed: Unused objective 2019-04-03 16:28:38 +03:00
Joonas Rikkonen
b787157dc7 (ded94593e) Updated: EnglishVanilla with terms regarded as new additions due to translation not starting until now 2019-04-03 16:28:24 +03:00
Joonas Rikkonen
6b38ba8434 (7749cbf6a) Server sends the current facing direction of a character to clients instead of the TargetDirection. Fixes monsters flipping around constantly client-side. + Don't allow clients to make characters flip in EnemyAIController (controlled by the server) 2019-04-03 16:28:10 +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
814aadeab0 (917efcc26) Modified stun baton and diving knife prices, added line to remove exploding harpoon after it explodes (used to be able to pick up and fire again) 2019-04-03 16:27:13 +03:00
Joonas Rikkonen
a0724d3ab0 (33ddb995d) Added more spacing to keybind inputs in Controls settings tab, commodates smaller resolutions 2019-04-03 16:26:59 +03:00
Joonas Rikkonen
5fb983f48f (4082dd031) Implemented some more Steam achievements 2019-04-03 16:26:44 +03:00
Joonas Rikkonen
df155079cc (2a51e42a4) Set PositionUpdateInterval to zero when an item is dropped to make sure clients receive some position updates and become aware of the new position of the item 2019-04-03 16:26:28 +03:00
Joonas Rikkonen
4537c9a8cd (6269da936) Fixed audio settings layout 2019-04-03 16:26:14 +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
8bf3927d98 (61331126a) Game Settings layout consistency pass 2019-04-03 16:25:16 +03:00
Joonas Rikkonen
92713cf587 (d041dfb1b) Implemented lazy sprite loading (= the texture isn't loaded until it's accessed for the first time). Atm only used in LevelObjectPrefabs and location portraits. 2019-04-03 16:25:02 +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
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
64bec6d3b9 (684bcee1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-03 16:24:20 +03:00
Joonas Rikkonen
516159fe43 (d404aba3e) Added background color to keybind inputs in the Controls settings layout, to help readability 2019-04-03 16:24:06 +03:00
Joonas Rikkonen
c9ad39da08 (b35e82550) Added a longer delay to getting killed by pressure (5 seconds in max pressure), made the pressure-zoom-in effect appear as soon as the pressure in a room starts to rise (not after it's half-way to lethal pressure), added blood particle effects when under high pressure 2019-04-03 16:23:51 +03:00
Joonas Rikkonen
abad70f0c1 (7e32870a0) Check that item has a non-zero mass before applying water forces (couldn't reproduce it, but had a debug assertion fail due to the mass of an alien artifact being 0), validate clamped force before attempting to apply it 2019-04-03 16:23:37 +03:00
Joonas Rikkonen
98cf26178f (3b3130a00) Added an option to disable mouselook, let camera zoom further when controlling a large monster 2019-04-03 16:23:23 +03:00
Joonas Rikkonen
d66a49bb7c (929d3d0fd) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev 2019-04-03 16:23:08 +03:00
Joonas Rikkonen
212b7074a8 (8bcb4dfd5) Refined cable holders, added variants for 1-3 cables (background still missing) 2019-04-03 16:22:54 +03:00
Joonas Rikkonen
c751c58495 (c793f55af) Clamp velocities when pushing characters out of doorways, play only one damage sound when hit by a door (not once per each limb that's in the doorway), refactored the logic so to prevent creating new lists 2019-04-03 16:22:41 +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
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