 Joonas Rikkonen
|
ddfdb3f4bf
|
(7f0d0fe11) Fixed specular maps going over characters, fixed levelobject draw order not working correctly in the level editor
|
2019-04-11 18:28:10 +03:00 |
|
|
Joonas Rikkonen
|
dd45af5a9f
|
(20f37d9c7) Option to toggle structure drop shadows and edit the position of the shadow
|
2019-04-11 18:25:01 +03:00 |
|
|
Joonas Rikkonen
|
9594ea67a7
|
(bf037f9b0) Don't allow deleting vanilla subs or subs that are a part of some content package
|
2019-04-08 13:36:58 +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
|
16c558a859
|
(7c1aa6679) Reset settings frame when controls are reset, added a button for resetting to default controls & tooltips for the control reset buttons, split keybind textboxes into two columns
|
2019-04-04 11:10:43 +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
|
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
|
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
|
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
|
1f94e174ef
|
(50a891840) Lazy deformable LevelObject sprite loading
|
2019-04-03 16:25:31 +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
|
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
|
5cf66d7343
|
(ecda2cb2a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-02 12:41:32 +03:00 |
|
|
Joonas Rikkonen
|
e86d86c41f
|
(9bd8db487) Allow to aim in ladders when not moving.
|
2019-04-02 12:41:18 +03:00 |
|
|
Joonas Rikkonen
|
6de0fa4b73
|
(c5f9e6070) Fixed lighting artifacts cause by the LOS changes
|
2019-04-02 12:40:50 +03:00 |
|
|
Joonas Rikkonen
|
28a8a5a2ed
|
(99be2b970) Fixed submarine preview info text overlap
|
2019-04-02 12:39:55 +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
|
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
|
6332a6e077
|
(c896c51fb) Display submarine preview in the "new game" menu, layout tweaks
|
2019-04-01 22:52:31 +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
|
0d0bf022b0
|
(20b8797d8) WIP los effect improvements to prevent weird-looking shadows at spots where two wall pieces meet
|
2019-04-01 14:25:04 +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
|
140f1894d4
|
(400cf2cbd) Fixed highlight raster scale changing according to lightmap resolution
|
2019-03-29 17:39:43 +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
|
296ec8bab8
|
(d95fc9893) Fixed crashing when dragging waypoints in the sub editor due to waypoints not being assigned a prefab
|
2019-03-29 17:23:47 +02:00 |
|
|
Joonas Rikkonen
|
d7526934e6
|
(f7209b813) Draw the sprites of the entities that are being dragged in the sub editor (instead of just a red rectangle).
|
2019-03-28 12:35:57 +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
|
080ac78ded
|
(5c35a640e) Update tutorial-rework with dev
|
2019-03-27 20:52:47 +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
|
bb17463aae
|
(f5be65240) Optimized explosions a bit, toned down wall damage effect when the wall has a small amount of damage.
|
2019-03-27 11:30:33 +02:00 |
|
|
Joonas Rikkonen
|
20e258f88e
|
(26025de59) Allow panning the campaign map with WASD. Closes #1352
|
2019-03-26 17:34:07 +02:00 |
|
|
Joonas Rikkonen
|
965a378f0e
|
(5d67aa3f5) Merge remote-tracking branch 'origin/dev' into enemy-ai
|
2019-03-25 19:50:58 +02:00 |
|
|
Joonas Rikkonen
|
fd5d2b86af
|
(a97ef2847) AI improvements: - Fix steering issues when attacking (yet again): We still have to offset the sim positions. - Fix the steering vector when escaping from the enemy that is inside the sub. - Enemies can now navigate out from the sub, when escaping. - Fix door tag not being used when targeting items. Change the priority boosts considering doors. Should now entirely ignore the outer doors when inside and inner doors when outside. - Change the way enemies react to characters that are not in the same sub. Halve the priority when the character is not in the same hull. Add some boost to the priority when escaping.
|
2019-03-25 19:50:02 +02:00 |
|
|
Joonas Rikkonen
|
19d5ed5d66
|
(14f26adfa) Take the position of a sub's docking port into account when determining where to place outposts. Humpback's docking port for example is 600 units to the right from the sub's centerpoint, which prevented it from docking in some levels because the left side of the sub hit the wall at the left side of the outpost. Closes #1028
|
2019-03-25 19:49:48 +02:00 |
|
|
Joonas Rikkonen
|
5ec6a7fba9
|
(325184804) Fix distance based attacks not registering if they hit a submarine.
|
2019-03-25 19:49:05 +02:00 |
|
 juanjp600
|
733271ea2e
|
(fd1ee0c02) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-25 10:57:44 -03:00 |
|
|
juanjp600
|
991639709c
|
(2da6c898b) Added 'pretty' merge script
|
2019-03-25 10:57:38 -03:00 |
|
|
juanjp600
|
94c1b29beb
|
(9a13b4418) Hull syncing fixes: - Don't let clients decrease the size of FireSources below zero. May happen because clients are allowed to predict changes in the size (correcting the values when receiving updates from the server), but not remove the fires if their size is too small. - When using the fire/water command, the clients used to simply discard hull updates from the server if fire/water had been edited within 0.5 seconds (to prevent the state from reverting back to previous one when receiving an update). This occasionally caused the fires/water to get out of sync if the server didn't send additional updates after the 0.5 delay. Now the clients will simply correct the hull to the last known server state after the 0.5 second delay.
|
2019-03-25 10:57:18 -03:00 |
|