 Joonas Rikkonen
|
4f746b04ea
|
(b8e5081e1) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-25 18:14:20 +03:00 |
|
|
Joonas Rikkonen
|
eb7ac2bfbe
|
(8e98e6343) Add and implement new clown gear.
|
2019-04-25 18:13:47 +03:00 |
|
|
Joonas Rikkonen
|
07b937ca90
|
(ce70f0edf) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-25 18:13:28 +03:00 |
|
|
Joonas Rikkonen
|
03797df87b
|
(224725392) fixed default state of a few emergency pumps.
|
2019-04-25 18:12:55 +03:00 |
|
|
Joonas Rikkonen
|
f31114ea01
|
(9f6737ced) Fixed: Old text tag in sonar.cs
|
2019-04-25 18:10: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
|
99344e4031
|
(b7893662b) Changed small font to Exo2 Medium (a bit more readable than the light version) + merge fix
|
2019-04-25 17:52:14 +03:00 |
|
|
Joonas Rikkonen
|
52991e1ded
|
(41a4cf029) Merge
|
2019-04-25 17:50:53 +03:00 |
|
|
Joonas Rikkonen
|
8be51d71bd
|
(444f7d53a) Added: Workaround for macOS not allowing editing the .app bundle, using Library/Barotrauma instead
|
2019-04-25 17:50:35 +03:00 |
|
|
Joonas Rikkonen
|
e4ac5434d7
|
(f1791560b) Switched back to old fonts (requested by art)
|
2019-04-25 17:50:17 +03:00 |
|
|
Joonas Rikkonen
|
457000c8dd
|
(9e2b50b03) Removed unused duplicate texture
|
2019-04-25 17:49:59 +03:00 |
|
|
Joonas Rikkonen
|
3a83ac42c9
|
(dd2b3452f) Social center png added (was missing)
|
2019-04-25 17:49:41 +03:00 |
|
|
Joonas Rikkonen
|
47ef561a03
|
(ade7449ec) increase stun baton damage slightly, should take 6 or so hits to kill a crawler instead of 12.
|
2019-04-25 17:49:23 +03:00 |
|
|
Joonas Rikkonen
|
a90cdb7843
|
(c5ad20e76) Graphics for outposts: Added new backwalls for outpost rooms (shop,maintenance bay and social center) aswell as some corridor pieces
|
2019-04-25 17:49:05 +03:00 |
|
|
Joonas Rikkonen
|
9df0141640
|
(ca0e4bd45) When attempting to deconstruct an item that can't be deconstructed, put it in the output inventory instead of leaving it in the input
|
2019-04-25 17:48:45 +03:00 |
|
|
Joonas Rikkonen
|
1a3184dbad
|
(4c452f172) Force reactor IsActive=true when an AI character or a remote player operates it. Previously this was only done in UpdateHUD, so inactive reactors would not become enabled.
|
2019-04-18 12:04:56 +03:00 |
|
|
Joonas Rikkonen
|
c85cf63494
|
(99fb00391) Don't allow deconstructing items that don't give anything when deconstructed. Closes #690
|
2019-04-18 12:03:22 +03:00 |
|
|
Joonas Rikkonen
|
6262b3ea54
|
(ce8e185aa) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-16 17:12:09 +03:00 |
|
|
Joonas Rikkonen
|
bd07acf26d
|
(052ab6307) Use MonoKickstart on Linux so installing Mono is not required, fixed division by zero if the width of the server console window is 0
|
2019-04-16 17:11:49 +03:00 |
|
|
Joonas Rikkonen
|
b8b61ebb02
|
(a405d1aed) Check volume validity in SoundPlayer.UpdateWaterAmbience (there was a report on GameAnalytics about the method setting the gain to an invalid value) + Merge fix
|
2019-04-15 14:12:14 +03:00 |
|
|
Joonas Rikkonen
|
a53c0fd9bb
|
(8f575fa16) Fixed chatbox & crew menu being hidden if any character uses a controller
|
2019-04-11 18:23:31 +03:00 |
|
|
Joonas Rikkonen
|
9f55da3677
|
(8d282f4cc) Hide the crew area and the chat box when using a controller (= aiming with a turret or similar item).
|
2019-04-10 15:13:25 +03:00 |
|
|
Joonas Rikkonen
|
be76bd53e9
|
(9a14162c6) Disabled spontaneous deterioration on items that are not being used. TODO: adjust all deterioration rates and delays
|
2019-04-07 21:43:35 +03:00 |
|
|
Joonas Rikkonen
|
6ac3ecd2b2
|
(86a1bac17) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-04 11:43:25 +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
|
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
|
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
|
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
|
03f2444968
|
(7341d33ff) Fixed nullref exception if a fabricator finishes creating an item after the user has been removed.
|
2019-04-03 16:20:37 +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
|
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
|
3219479774
|
(f202305e0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 14:26:57 +03:00 |
|
|
Joonas Rikkonen
|
e154492a05
|
(a4e1c30c0) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 14:26:43 +03:00 |
|
|
Joonas Rikkonen
|
0ca4a8db06
|
(169dbd4fd) Increased submarine masses to make it less easy for characters to push them around.
|
2019-04-01 14:26:29 +03: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
|
817a6100d7
|
(f4680f78f) Made AI characters less eager to load extra fuel to the reactor (the load needs to be 2x higher than the theoretical max output of the reactor). In some subs the reactor's max output is so low that extra fuel is frequently needed, causing AI characters to constantly put in and take out rods as the load fluctuates. + The AI characters now put the excess rods in their inventory instead of dropping them.
|
2019-03-29 17:22:36 +02:00 |
|
|
Joonas Rikkonen
|
db1d0acac9
|
(4d569f38c) AI characters can take out excess fuel rods from the reactor, and calculate if more fuel is needed to keep the output at a suitable level instead of only adding more fuel when the reactor is completely empty.
|
2019-03-29 17:21:52 +02:00 |
|
|
Joonas Rikkonen
|
9849e76f76
|
(5d39bdb07) Disabled reactors cooling down when underwater. If we want to include this, we need to explain to the player that they may need extra fuel to keep the reactor running when the reactor room is flooded.
|
2019-03-28 12:35:15 +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 |
|