 Joonas Rikkonen
|
e3ca616fff
|
(869ac975f) Merge branch 'master' into dev
|
2019-06-12 16:43:56 +03:00 |
|
|
Joonas Rikkonen
|
eaf4f6afb8
|
(face37755) Fixed clients timing out when trying to connect to a server that has banned someone. Closes #1568
|
2019-06-12 16:43:34 +03:00 |
|
|
Joonas Rikkonen
|
4a401c865d
|
(4d56b6900) Fixed ability to drop items into secure lockers (or other containers that require specific items) without having access to it. Closes #1559
|
2019-06-11 21:43:02 +03:00 |
|
|
Joonas Rikkonen
|
7c67b1f164
|
(57c46943d) Quick fix watchman graphics (not quite right yet, but better). Re-enable the variant 2.
|
2019-05-20 21:00:11 +03:00 |
|
|
Joonas Rikkonen
|
b71adc7589
|
(2e0e45e1f) Updated: Localization
|
2019-05-20 20:46:21 +03:00 |
|
|
Joonas Rikkonen
|
97b095bd10
|
(0e668e083) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev (squashed together 20290af96..0e668e083 because the merge script shit itself due to the merges in between)
|
2019-05-20 20:25:12 +03:00 |
|
|
Joonas Rikkonen
|
f605651966
|
(683b11c00) High-res shuttle preview images + merge fix
|
2019-05-16 08:49:01 +03:00 |
|
|
Joonas Rikkonen
|
108e42edb0
|
(b5250291f) Merge branch 'dev' into human-ai
|
2019-05-16 05:15:16 +03:00 |
|
|
Joonas Rikkonen
|
2ae54a01a5
|
(ac7ab10b0) Pass AIObjectiveManager reference in the constructors instead of methods so that we can always access it.
|
2019-05-16 05:14:20 +03:00 |
|
|
Joonas Rikkonen
|
bec7aadfa9
|
(af16ecdfa) Merge branch 'dev' into human-ai
|
2019-05-16 05:14:00 +03:00 |
|
|
Joonas Rikkonen
|
454dda56c7
|
(1762f02b3) Merge branch 'dev' into human-ai
|
2019-05-16 05:08:22 +03:00 |
|
|
Joonas Rikkonen
|
60f52375e6
|
(7788ec72a) Test issuing orders automatically.
|
2019-05-16 05:03:49 +03:00 |
|
|
Joonas Rikkonen
|
5af8170ac6
|
(372c6e60a) More automatic text scaling + merge fix
|
2019-05-06 14:15:40 +03:00 |
|
|
Joonas Rikkonen
|
953b5690ec
|
(2a7829fab) Add ISpatialEntity as a common interface for everything that has a position in the game world. Would have used IMapEntity, but there's already MapEntity, which inherits Entity, so that would be confusing. Declare the inheritance only in the shared class (Character).
|
2019-05-03 13:45:41 +03:00 |
|
|
Joonas Rikkonen
|
fb21005258
|
(6f4bea467) Updated doors
|
2019-05-03 13:43:47 +03:00 |
|
|
Joonas Rikkonen
|
32a8b97ad4
|
(01452b66f) Fixed "maintain position" indicators & inputs being relative to the center of the screen, not the center of the sub. Flash the docking button when ready to dock.
|
2019-05-03 13:41:42 +03:00 |
|
|
Joonas Rikkonen
|
fbb7daed00
|
(0c3442136) Merge branch 'dev' into docking-interface
|
2019-05-03 13:41:23 +03:00 |
|
|
Joonas Rikkonen
|
b551ae7999
|
(c1468d39d) Overhauled docking interface (WIP)
|
2019-05-03 13:39:54 +03:00 |
|
|
Joonas Rikkonen
|
67a0636470
|
(b21318728) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-29 21:09:50 +03:00 |
|
|
Joonas Rikkonen
|
2554e17189
|
(621326f05) Don't flee when taking damage if part of a swarm.
|
2019-04-29 21:08:32 +03:00 |
|
|
Joonas Rikkonen
|
c5452048d7
|
(d88b2f1f7) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-29 21:08:16 +03:00 |
|
|
Joonas Rikkonen
|
b3b1d1851d
|
(eda627512) Fixed MonoKickStart files needed by the dedicated server not being copied to the output directory in release builds
|
2019-04-29 21:08:00 +03:00 |
|
|
Joonas Rikkonen
|
788c51143b
|
(55f425031) Tutorial outpost visual pass
|
2019-04-29 21:06:26 +03:00 |
|
|
Joonas Rikkonen
|
205f808f84
|
(5b377538a) Adjust crawler attacks a bit.
|
2019-04-29 21:05:53 +03:00 |
|
|
Joonas Rikkonen
|
45e0d2f663
|
(99e6eb7c7) Fixed "attempted to access a potentially removed ragdoll" in SoundPlayer.Update, set Character.Controlled to null if the character is removed to prevent this from happening elsewhere
|
2019-04-29 21:05:37 +03:00 |
|
|
Joonas Rikkonen
|
e83dba2959
|
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
|
2019-04-25 18:07:37 +03:00 |
|
|
Joonas Rikkonen
|
ba6a4450eb
|
(3f55858c9) Made the volume and range parameters of SoundPlayer.PlaySound optional: if they're omitted, the values defined in the sound xml are used.
|
2019-04-24 11:49:27 +03:00 |
|
|
Joonas Rikkonen
|
3877c18d0c
|
(c15419d90) Changelog additions + merge fix
|
2019-04-08 19:20:05 +03:00 |
|
|
Joonas Rikkonen
|
71d546ff7f
|
(f36b3a111) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 19:17:50 +03:00 |
|
|
Joonas Rikkonen
|
9a829206af
|
(2c264b075) Improve readability (no functional changes).
|
2019-04-08 19:17:06 +03:00 |
|
|
Joonas Rikkonen
|
63971c90a9
|
(a9fbb0120) Disable controls when the pause menu or settings menu is open. Closes #1391
|
2019-04-08 19:16:37 +03:00 |
|
|
Joonas Rikkonen
|
d482e6554d
|
(276e03242) Reset Use and Select inputs when releasing the Shoot input to prevent accidentally selecting/using items
|
2019-04-08 19:16:09 +03:00 |
|
|
Joonas Rikkonen
|
9c07ebda53
|
(8311f9380) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-08 13:36:00 +03:00 |
|
|
Joonas Rikkonen
|
d28b04ed3b
|
(30308f7e4) Fixed players being able to overwrite vanilla content when the vanilla package is not selected
|
2019-04-08 13:35:46 +03:00 |
|
|
Joonas Rikkonen
|
1f8b2325ed
|
(5d487a390) Cleanup.
|
2019-04-08 13:35:32 +03:00 |
|
|
Joonas Rikkonen
|
8850d49960
|
(3f75a3756) Minor optimization: removing hudbars don't generate garbage anymore (the collection usually contains only one item and the loop was not evaluated many times, but it still doesn't hurt to fix it, especially when there's a todo note about it).
|
2019-04-08 13:35:18 +03:00 |
|
|
Joonas Rikkonen
|
14d0daf16d
|
(ccef21f63) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:49:31 +03:00 |
|
|
Joonas Rikkonen
|
45c1ed499a
|
(e326112f5) Increased discharge coil sound range and added camera shake to make it more noticeable when it's used
|
2019-04-06 17:49:18 +03:00 |
|
|
Joonas Rikkonen
|
8e56174d28
|
(6a236c1f3) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-06 17:47:58 +03:00 |
|
|
Joonas Rikkonen
|
ebb62d2fd2
|
(a432c283e) Fixed popping texture when fixing reactor
|
2019-04-06 17:47:45 +03:00 |
|
|
Joonas Rikkonen
|
8713b0ba8e
|
(9a1210d72) Fixed not being able to zoom out fully with turrets
|
2019-04-06 17:47:20 +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
|
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
|
64bec6d3b9
|
(684bcee1a) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-03 16:24:20 +03:00 |
|