7ceba13e8f
(deebc187d) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-05-16 06:25:48 +03:00
e500ba2bdf
(a17abe3fa) Remove a not so useful loop from a method, which might be used often.
2019-05-16 06:25:12 +03:00
48070a3f90
(23ecb8f20) Fixed: Scaling past 1920x1080 for: Reactor UI, Submarine labels, loading tips, inventoryslot container status
2019-05-16 06:20:54 +03:00
cb83984e80
(4ca668169) Fixed: Conflict
2019-05-16 05:58:48 +03:00
0a67590572
(21a808335) Added: 4k fixes
2019-05-16 05:58:32 +03:00
68ced76e1b
(cc26984a5) Merge remote-tracking branch 'origin/dev' into human-ai
2019-05-16 05:45:37 +03:00
f8090d470e
(5670a7c58) Don't get stuck if cannot use the button.
2019-05-16 05:44:48 +03:00
5ec107bf83
(0d96091e5) Adjusted layout spacing on Reactor to make the warning labels slightly more readable on Brazilian Portugese
2019-05-16 05:43:40 +03:00
7614642d93
(e7b2add9d) Merge branch 'human-ai' of https://github.com/Regalis11/Barotrauma-development into human-ai
2019-05-16 05:30:39 +03:00
54a0164f89
(98501b696) Reduce the max accepted distance for repair tool ai operate.
2019-05-16 05:30:23 +03:00
8621d9927e
(a21f15055) Merge branch 'dev' into human-ai
2019-05-16 05:27:17 +03:00
3d7a113d75
(048b753e6) Merge branch 'dev' into human-ai
2019-05-16 05:20:29 +03:00
bec7aadfa9
(af16ecdfa) Merge branch 'dev' into human-ai
2019-05-16 05:14:00 +03:00
454dda56c7
(1762f02b3) Merge branch 'dev' into human-ai
2019-05-16 05:08:22 +03:00
60f52375e6
(7788ec72a) Test issuing orders automatically.
2019-05-16 05:03:49 +03:00
2c3d33e3d5
(245fdaa7e) Fixed invisible reactor on/off lever
2019-05-03 13:55:06 +03:00
fb21005258
(6f4bea467) Updated doors
2019-05-03 13:43:47 +03:00
fbb7daed00
(0c3442136) Merge branch 'dev' into docking-interface
2019-05-03 13:41:23 +03:00
b551ae7999
(c1468d39d) Overhauled docking interface (WIP)
2019-05-03 13:39:54 +03:00
ce7d36d9e2
(78888f7fb) Changes to reactor interface to make it adapt better to different text lengths
2019-04-29 21:13:36 +03:00
e83dba2959
(42d13c09f) Merge remote-tracking branch 'origin/tutorial-rework' into dev
2019-04-25 18:07:37 +03:00
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
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
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
2281035ffa
(05ee3bb5f) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
2019-03-28 18:11:10 +02:00
fde8cc1d6f
(9edcbf86d) Added: More prominent graphics for when a tutorial objective is completed
2019-03-28 18:10:56 +02:00
68a601722c
(34987308f) Fixed reactor warning lights being clickable
2019-03-28 18:10:27 +02:00
080ac78ded
(5c35a640e) Update tutorial-rework with dev
2019-03-27 20:52:47 +02:00
3f82c9a2cb
(f417b026f) Fetched: Changes for playing video tutorial from local branch
2019-03-27 20:45:14 +02:00
1561fa4867
df7366c...817c58e
...
commit 817c58e2a4b04017130cc06c522471e76dc109e0
Author: Joonas Rikkonen <poe.regalis@gmail.com >
Date: Tue Mar 19 14:37:16 2019 +0200
Some changes to the reactor logic:
The colored areas on the fission rate gauge now follow the amount of available fuel (previously they were static and didn't really have an effect on anything), and trying to push the fission rate above the upper limit makes the pointer "jitter" to make it more obvious that the fission rate can't be pushed any further.
2019-03-19 14:37:52 +02:00
63eb4d64e5
f8b0295...0671290
2019-03-18 23:30:58 +02:00
044fd3344b
2f107db...5202af9
2019-03-18 21:42:26 +02:00
6c0679c297
38f1ddb...178a853: v0.8.9.1, removed content folder
2019-03-18 20:39:27 +02:00
dcb6de32c0
Some more hard-coded text removal
2018-01-31 19:01:48 +02:00
5f2227489b
Reactor temperature has to stay above the meltdown temperature for 30 seconds before it explodes. The reactors now also have an output connection that sends out a signal when the temperature is critical. + Added reactor meltdown warning sirens & lights to vanilla subs. Closes #157
2018-01-10 00:33:21 +02:00
64ad5e5003
Removed unnecessary using directives
2017-07-05 18:35:09 +03:00
4d225c65f2
Updated to MonoGame 3.6 + Directory refactor
...
- Barotrauma's projects are in the Barotrauma directory
- All libraries are in the Libraries directory
- MonoGame is now managed by NuGet, rather than referenced from the installed files (TODO: consider using PCL for easier cross-platform development?)
- NuGet libraries are not included in the repo, as getting the latest versions automatically should be preferred
- Removed Content/effects.mgfx as it didn't seem to be used anywhere
- Removed some references to Subsurface directory
- Renamed Launcher2 to Launcher
2017-06-27 09:52:57 -03:00
Joonas Rikkonen
juanjp600