 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
|
7eb0972d16
|
(df7ca4c53) updated doors + merge fix
|
2019-04-29 23:03:58 +03:00 |
|
|
Joonas Rikkonen
|
9e8a5046fb
|
(ec7043278) Set correct location change rules, removed ruins from the world until we know what to do with them.
|
2019-04-29 21:19:24 +03:00 |
|
|
Joonas Rikkonen
|
cb96e4667f
|
(d7d1a1027) First pass rebalance of the distribution of missions in the campaign.
|
2019-04-29 21:19:08 +03:00 |
|
|
Joonas Rikkonen
|
c0b8a26bfc
|
(63010b9f0) Fixed incorrect keybinds being displayed in a couple of tutorial texts
|
2019-04-29 21:18:52 +03:00 |
|
|
Joonas Rikkonen
|
285ca8f78b
|
(5cf4ab11c) Don't draw order indicators (the icons pointing towards the target item) when far away and not inside the same sub as the target. Prevents exploiting the indicators in locating the sub. Closes #1444
|
2019-04-29 21:18:36 +03:00 |
|
|
Joonas Rikkonen
|
4f0f5b309b
|
(94b673f74) Monsters stop dragging targets if there's a collider between the characters. Closes #1441
|
2019-04-29 21:18:20 +03:00 |
|
|
Joonas Rikkonen
|
482b3dacfd
|
(392954b0e) Swap the order of the starting location & destination in nav terminals when playing in a mirrored sub.
|
2019-04-29 21:18:04 +03:00 |
|
|
Joonas Rikkonen
|
aa48f19801
|
(902225da6) More automatic text scaling in places where texts are likely to overflow
|
2019-04-29 21:13:51 +03:00 |
|
|
Joonas Rikkonen
|
ce7d36d9e2
|
(78888f7fb) Changes to reactor interface to make it adapt better to different text lengths
|
2019-04-29 21:13:36 +03:00 |
|
|
Joonas Rikkonen
|
ad298c69c2
|
(118683d11) Fixed crashing when generating levels in the level editor.
|
2019-04-29 21:13:20 +03:00 |
|
|
Joonas Rikkonen
|
8d3d103e17
|
(a2b4f82e7) Fixed Job.Save not saving the identifier of the job, preventing jobs from being loaded correctly if the language is changed after saving.
|
2019-04-29 21:13:03 +03:00 |
|
|
Joonas Rikkonen
|
8737a0e0dd
|
(26639256a) - Added a method that automatically sets the text scale of a set of GUITextBlocks so that they all use the same scale and the text fits in all of the blocks. - Fixed TextBlock padding not being taken into account if the text is centered. - AutoScale and change the layout in a bunch of places where translated texts are likely to not fit.
|
2019-04-29 21:12:47 +03:00 |
|
|
Joonas Rikkonen
|
e21b4e5efc
|
(529c58f9a) Added a couple of missing texts to EnglishVanilla. Because it may take a while until these can be added, a hard-coded text is used if these lines can't be found.
|
2019-04-29 21:12:31 +03:00 |
|
|
Joonas Rikkonen
|
2c1a5be93e
|
(19c8c7b56) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-29 21:12:15 +03:00 |
|
|
Joonas Rikkonen
|
0b1b39d70a
|
(caf7e6a2e) Replaced Concentus NuGet package with csproj (ensures correct System.Runtime references)
|
2019-04-29 21:11:59 +03:00 |
|
|
Joonas Rikkonen
|
f10adc2612
|
(08ad40cc0) Fixed items "vanishing" if they move directly from sub to another without going outside first.
|
2019-04-29 21:11:42 +03:00 |
|
|
Joonas Rikkonen
|
9930a3081c
|
(e082ed22d) Fixed AllowRagdollButton settings not being synced with clients. Might be related to #1297
|
2019-04-29 21:11:24 +03:00 |
|
|
Joonas Rikkonen
|
dd24c604d1
|
(d653e2340) Fixed workshop items switching order in the workshop menu when the preview thumbnails are received.
|
2019-04-29 21:11:07 +03:00 |
|
|
Joonas Rikkonen
|
2ffb8d922d
|
(acf0cb343) Fixes to EnableWorkShopItem: - Don't allow enabling if the item is not compatible with the user's version of Barotrauma or if it's a core package that's missing some required files. - Don't allow enabling if the item external files referenced in the content package are not found (e.g. if a mod uses vanilla files but the vanilla files aren't found).
|
2019-04-29 21:10:51 +03:00 |
|
|
Joonas Rikkonen
|
6c4bf4ea44
|
(d8eff8346) Fix a null reference exception.
|
2019-04-29 21:10:35 +03:00 |
|
|
Joonas Rikkonen
|
d3ef770243
|
(9122340aa) Fixed inability to enable content packages if some of the files included in the package are already in the game folder (which may happen, for example, if enabling a content package fails)
|
2019-04-29 21:10:20 +03:00 |
|
|
Joonas Rikkonen
|
4d1c3b1ed4
|
(43a58c2c3) Fixed content package hash calculation failing if the package is not enabled and contains new monster files. Was caused by Character.GetConfigFile failing to find the config file because it only searched from currently selected content packages.
|
2019-04-29 21:10:05 +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
|
1f3c6349ab
|
(961d41b31) Ragdoll syncing improvements: - Don't ignore platforms when correcting a ragdoll's position using Ragdoll.SetPosition. Otherwise forcing the character above a platform may cause it to drop down again if the feet don't end up above the platform. - Correct ragdoll position to server position immediately if the error is very large. - Force collider to stay upright after fixed rotation is enabled.
|
2019-04-29 21:07:44 +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
|
f4f87b454d
|
(8e4f5cb03) Add a disclaimer for switching from game to character editor.
|
2019-04-25 17:43:29 +03:00 |
|
|
Joonas Rikkonen
|
4e20fe871f
|
(7f12d8742) More reliable firesource syncing: instead of just creating a network event when a firesource is created/removed and trusting that the fire behaves deterministically enough to stay in sync between the client and server, create events at 0.5 s intervals when there's fire in a hull. Closes #721
|
2019-04-25 17:43:13 +03:00 |
|
|
Joonas Rikkonen
|
907df8fa09
|
(bb8bbd4d3) Don't mute footstep sounds in the character editor
|
2019-04-25 17:42:55 +03:00 |
|
|
Joonas Rikkonen
|
c983e5fb36
|
(4ffec29f1) More reliable monster footstep sounds: instead of relying on the feet to hit the floor with enough force to trigger an impact sound, play the sounds manually at appropriate times in the walking cycle
|
2019-04-24 11:50:24 +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
|
c77c30fda7
|
(7cc515e57) SpriteDeformation optimization: don't update deformations on disabled or SimplePhysics characters, don't check if resolution has changed in the SpriteDeformation.Resolution getter because it's called very frequently
|
2019-04-18 12:05:27 +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
|
8f310256b5
|
(2bbea6767) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-15 13:43:07 +03:00 |
|
|
Joonas Rikkonen
|
fe235eb37a
|
(2fc766fe5) Add support for wearable item variants. Not used yet. Not synced (not sure if it should).
|
2019-04-15 13:42:37 +03:00 |
|
|
Joonas Rikkonen
|
918fac9e5e
|
(6c6831abf) Some new sounds, fixed damage sounds not being played if no damage modifiers are applied
|
2019-04-15 13:42:08 +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
|
a46c195532
|
(2a183f60c) Merge branch 'dev' of https://github.com/Regalis11/Barotrauma-development into dev
|
2019-04-01 22:51:07 +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
|
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 |
|
|
Joonas Rikkonen
|
3062e4c705
|
(1a1137b26) Charybdis now also targets the walls. Tweak Charybdis' attacks and priorities. Fix targeting walls for non-aggressiveboarders. Don't double the wall priority.
|
2019-04-01 22:49:15 +03:00 |
|
|
Joonas Rikkonen
|
fc9a3893f6
|
(b9babfcf6) Merge branch 'ragdoll-syncing-improvements' into dev
|
2019-04-01 22:49:01 +03:00 |
|