 Joonas Rikkonen
|
0725e1c4b2
|
(1d7e76d1f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:46:55 +03:00 |
|
|
Joonas Rikkonen
|
f958f5fb44
|
(248ac43ed) Added inventory icons for Physicorium items armor, helmet, ammunition box and spear + normal and explosive spear (not yet implemented)
|
2019-04-06 17:46:42 +03:00 |
|
|
Joonas Rikkonen
|
a3ff707a31
|
(cf99ace8a) Fix bots entering the combat state if taking damage from falling etc.
|
2019-04-05 16:21:12 +03:00 |
|
|
Joonas Rikkonen
|
69c414dfc9
|
(34cca982f) Steering tweaks that should fix bots not being able to proceed on ladders when the next waypoint is not on the ladder but the one after that is.
|
2019-04-05 16:20:58 +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
|
350e6d6036
|
(5c39920a7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-05 16:18:37 +03:00 |
|
|
Joonas Rikkonen
|
aef3a96d60
|
(cb01ae2fe) Small adjustments to Sub Editor entity list
|
2019-04-05 16:18:23 +03:00 |
|
|
Joonas Rikkonen
|
f6bf7d9219
|
(dc09b0993) Fix bots not aiming with the welding tool when trying to repair, because of a dump error when checking the RequireAimToUse property.
|
2019-04-05 16:18:08 +03:00 |
|
|
Joonas Rikkonen
|
7007804063
|
(1c5ab9230) Enemies don't attack outposts or targets inside it anymore.
|
2019-04-05 16:11:44 +03:00 |
|
|
Joonas Rikkonen
|
e84203781e
|
(e1b4346f3) Fix enemies not being able to get into the sub via vertical hatches. Removed the velocity manipulation, because it only caused issues.
|
2019-04-05 16:11:30 +03:00 |
|
|
Joonas Rikkonen
|
709d9e44ab
|
(541e3ffbe) Check that the mask is equipped in the head before trying to unequip.
|
2019-04-04 11:12:18 +03:00 |
|
|
Joonas Rikkonen
|
7126a60b7a
|
(558e47075) -Reduced condition loss per use for plastiseal (-100 to -25), reduced the effect a bit (TODO: add more plastiseal to subs) -Reduced condition loss per use for antibiotic glue (-100 -> -50) -Implemented crafting recipes for antidotes -Made spacing more uniform in medical xml
|
2019-04-04 11:12:05 +03:00 |
|
|
Joonas Rikkonen
|
4e45876a6c
|
(502e453a9) Instead of placing the weapon to a slot 3, find the allowed hand slots.
|
2019-04-04 11:11:51 +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
|
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
|
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
|
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
|
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
|
e86d86c41f
|
(9bd8db487) Allow to aim in ladders when not moving.
|
2019-04-02 12:41:18 +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
|
22372dfffe
|
(061c63299) Wall collider tuning
|
2019-04-01 22:53:41 +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
|
98e0504e1f
|
(52748e937) Fixed nullref exception if a character eats another one when a gamesession has not been started
|
2019-04-01 22:53:12 +03:00 |
|
|
Joonas Rikkonen
|
ae3dea40b0
|
(3c1d889c9) Fixed voice activity controls going outside the settings frame
|
2019-04-01 22:52:58 +03:00 |
|
|
Joonas Rikkonen
|
ee18a1b508
|
(66b8e2955) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:52:44 +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
|
ca9a516403
|
(8ea276c68) Fixed game settings panel input consistency
|
2019-04-01 22:52:17 +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
|
8b12f85f48
|
(b6f451292) Moved crafting recipes from the fabricator xml to the xmls of the items. Makes it possible for modders to add new craftable items without having to modify the fabricators. Closes #1001
|
2019-04-01 22:51:37 +03:00 |
|
|
Joonas Rikkonen
|
508bd960be
|
(b378675eb) Improved New Game panel
|
2019-04-01 22:51:21 +03:00 |
|
|
Joonas Rikkonen
|
a46c195532
|
(2a183f60c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:51:07 +03:00 |
|
|
Joonas Rikkonen
|
8cb4702a5a
|
(cda6af1ad) Increase the steering speed when going to eat. TODO: Adjusting the weight shouldn't have any effect on character speed. The steering vector should be normal until multiplied by the movement speed in the Update function.
|
2019-04-01 22:50:53 +03:00 |
|
|
Joonas Rikkonen
|
5d6cbb5898
|
(b522c4551) Don't assign the attackinglimb if we shouldn't be attacking. Fixes Hammerhead not falling back after hitting the sub.
|
2019-04-01 22:50:39 +03:00 |
|
|
Joonas Rikkonen
|
e9a3577316
|
(b2df6e88c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:50:25 +03:00 |
|
|
Joonas Rikkonen
|
d511ecd4e3
|
(5218c43a0) Server sends the IDs of both selected characters and selected items to the clients. Previously this wasn't needed, because it wasn't possible to have both a character and an item selected at the same time. Fixes characters floating mid-air client-side when dragging others up stairs, and probably some other undiscovered bugs as well.
|
2019-04-01 22:50:11 +03:00 |
|
|
Joonas Rikkonen
|
ae6b797d73
|
(c2e1b24e2) Fixed remote characters sliding slowly to the left in multiplayer. Happened because linear velocity was written with an accuracy of 12 bits, causing the lowest possible value to be about 1.5 cm/s. Now extremely low velocity values are rounded down to zero. The server also now quantizes the LinearVelocity/AngularVelocity values, which should make position syncing a little more reliable because the server runs the physics using the same rounded values as the clients.
|
2019-04-01 22:49:58 +03:00 |
|