 Joonas Rikkonen
|
e086af2c6f
|
(bebc37619) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:20:27 +03:00 |
|
|
Joonas Rikkonen
|
25768d8845
|
(4b54fb4bf) Refactor AIObjectiveCombat and the reactions to the damage. Fixes bots not reacting to any damage done with repair tools. Now they should flee (but not retaliate).
|
2019-04-05 16:20:11 +03:00 |
|
|
Joonas Rikkonen
|
501a114000
|
(4119dec1c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:19:55 +03:00 |
|
|
Joonas Rikkonen
|
d7364171fb
|
(e31a38ae1) Fixed spritebatch not being disposed when saving submarine preview images, don't reload all subs when saving a sub
|
2019-04-05 16:19:40 +03:00 |
|
|
Joonas Rikkonen
|
161f725778
|
(2b36813ef) Added Back button to submarine editor
|
2019-04-05 16:19:07 +03:00 |
|
|
Joonas Rikkonen
|
8f42801c7a
|
(2d473d38a) Add RequireAimToUse checks for being logical and for future. Shouldn't have any functional implications in the current version, but we could have RepairTools or Weapons that don't require aiming.
|
2019-04-05 16:18:52 +03:00 |
|
|
Joonas Rikkonen
|
aef3a96d60
|
(cb01ae2fe) Small adjustments to Sub Editor entity list
|
2019-04-05 16:18:23 +03:00 |
|
|
Joonas Rikkonen
|
d259ac40a2
|
(33511440f) Small tweaks to the Sub Editor screen
|
2019-04-05 16:17:53 +03:00 |
|
|
Joonas Rikkonen
|
f787256dc8
|
(03383d4e3) Fixed items being impossible to select in character mode in the sub editor when using the legacy control scheme
|
2019-04-05 16:16:54 +03:00 |
|
|
Joonas Rikkonen
|
7dae8639cc
|
(2c4d0cf44) Fixed memorystream not being disposed when saving a submarine preview image
|
2019-04-05 16:14:26 +03:00 |
|
|
Joonas Rikkonen
|
9e62d2219a
|
(335f60e63) Don't deselect items in the subeditor with "select" key. Use "deselect" instead. Fixes inventories and other interfaces closing when clicking trying to interact with the items inside them.
|
2019-04-05 16:13:41 +03:00 |
|
|
Joonas Rikkonen
|
f91e28c248
|
(5643d05c2) Show wall count in the sub editor, color the item/structure/wall counts orange/red if there's a very high number of them
|
2019-04-05 16:12:57 +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
|
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
|
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
|
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
|
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
|
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
|
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
|
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
|
eada5e222a
|
(4e7f7d0a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-03-27 13:52:38 +02:00 |
|
|
Joonas Rikkonen
|
8d42f777db
|
(3525199b1) First iteration of the new Charybdis (incomplete). TODO: tweak joints and animations, add deformations, attacks, ai, and sounds.
|
2019-03-27 13:52:22 +02:00 |
|
|
Joonas Rikkonen
|
fd56875e95
|
(98a962701) Close the save/load dialogs when leaving the sub editor. Otherwise they'll still be visible when re-entering the editor, and saving at that point will overwrite the previously loaded sub with an empty one. Closes #1357
|
2019-03-27 11:31:30 +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
|
63eb4d64e5
|
f8b0295...0671290
|
2019-03-18 23:30:58 +02:00 |
|
|
Joonas Rikkonen
|
23687fbf2f
|
aeafa16...4d3cf73
|
2019-03-18 22:57:05 +02:00 |
|
|
Joonas Rikkonen
|
97f31d0c94
|
5202af9...3ea33fb
|
2019-03-18 22:24:07 +02:00 |
|
|
Joonas Rikkonen
|
044fd3344b
|
2f107db...5202af9
|
2019-03-18 21:42:26 +02:00 |
|