cd3ecd36e8
Merge branch 'multisub'
...
Conflicts:
.gitignore
Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
Subsurface/Source/Items/Components/Holdable/RepairTool.cs
Subsurface_Solution.v12.suo
2016-07-04 17:42:31 +03:00
e74d5adef4
Subs that aren't docked to the main sub aren't saved
2016-07-04 17:31:07 +03:00
cafeceb6d2
WIP dockingport/multisub saving in single player mode
2016-07-02 14:59:49 +03:00
17197a442d
Water can flow through vertical docking ports
2016-06-30 18:37:10 +03:00
aae24b2b2c
Better logic for determining which convex hulls are in the range of a lightsource (separate convexhull lists for each sub)
2016-06-30 17:50:02 +03:00
73ff859f33
Added .suo files to gitignore
2016-06-29 17:29:04 +03:00
34c6569313
Server can inflict impact damage on clients, character oxygen level syncing bugfix, hulls send a networkevent when oxygen level changes by >=5%, limb velocities aren't reset when receiving a network update
2016-06-29 17:26:26 +03:00
3e3ec5a2ef
Fixed fire extinquishers
2016-06-27 18:38:11 +03:00
38c5251005
Vertical docking port, docking sounds, water flows properly between horizontally docked hulls, falseoutput of signal check components can be changed, lighting and FOW works between hulls (todo: some logic for determining when to update light.HullsInRange when two subs are moving relative to each other)
2016-06-27 17:48:20 +03:00
b04e204dc3
- multiple submarines can be "merged" into one file (to be used as escape vessels etc)
...
- WIP docking ports
2016-06-26 14:31:00 +03:00
296c5a14ed
- host can respawn
...
- respawn info texts
- camera clamped to the the upper edge of the level
- fixed submarinebody being generated from all walls (and not just the ones belonging to that specific sub)
2016-06-23 18:23:20 +03:00
325332c0af
Fixed "queue empty" exception in GameServer.WaitForPlayersReady
2016-06-20 18:31:43 +03:00
dc7956274c
- camera follows the closest sub
...
- WIP "respawn shuttle"
- submarine size affects its mass
- electricity fixes
2016-06-18 14:46:40 +03:00
cf822cfae6
Submarine saving fixes, impact damage in sub-sub collisions, submarine ambient sounds
2016-06-12 14:23:08 +03:00
495a0f4124
- teleporting from sub to another works now
...
- repairtool fix
- submarines collide with each other
- every submarine is updated (so MainSub isn't the only one that can move)
- submarinebody vertex generation fix
2016-06-11 17:55:47 +03:00
ee2d817e6b
"Shifting" entity IDs to prevent them from overlapping between different subs, loading another submarine now works without crashing
2016-06-10 20:53:35 +03:00
7349cdd310
Progress (compiles now)
2016-06-09 22:15:50 +03:00
c9fd599276
Merge branch 'master' of https://bitbucket.org/Regalis11/barotrauma into multisub
...
Conflicts:
Subsurface/Source/GUI/GUI.cs
2016-06-09 18:39:54 +03:00
41569675f3
Started refactoring the submarine class in order to make it possible to add multiple submarines (or other movable structures)
2016-06-09 18:34:43 +03:00
d520c00dc9
- stunned characters don't move their hands behind their back when cuffed (caused the characters to flail around when someone grabs them)
...
- characters can run while grabbing/dragging someone
- inventory and chatbox are hidden when stunned
- turret rotation is reset between minRotation and maxRotation when changing the rotation limits
- fixed explosion damage being applied to simPositions of the limbs instead of worldpositions
2016-06-09 16:54:30 +03:00
37336095bd
v4.1.6
2016-06-08 17:46:36 +03:00
14c809b2f2
Debug text tweaking, guiframe for relay component, spears loaded into a harpoon gun don't float in the air, some new names
2016-06-07 20:41:32 +03:00
bd4292c3e5
- PowerContainer capacity is initialized before charge to allow setting the charge higher than default capacity
...
- soundplayer doesn't crash the game if it can't stream a music clip
- some new structure prefabs
- more effective corrigodone (health med)
2016-06-07 18:24:23 +03:00
8f8f1ed7dc
- fixed submarine selection resetting when switching to netlobbyscreen
...
- fixed EntityGrid IndexOutOfRangeException
- fixed AssignJobs() ignoring the highest job preference
2016-06-07 16:57:58 +03:00
9689ef070d
Vote kick settings
2016-06-07 14:13:12 +03:00
0e24eab5e3
Re-enabled vote kicking, with some improvements: chat messages notifying about votes, kick button is disabled for the host's character or if already voted
2016-06-03 15:00:36 +03:00
57abce298d
Fixed projectile velocity being reset in Item.Drop() after launch
2016-06-03 14:58:01 +03:00
6b6af6e72e
- head sprites can be given "tags", and body is chosen from sprites with the same tag
...
- black character sprites
2016-06-03 14:57:22 +03:00
50bee3da41
Wall convexhulls are split every 5 sections, convexhull edges that overlap with another convexhull are ignored (i.e. unneccessarys shadows aren't drawn where two walls meet)
2016-06-01 20:58:03 +03:00
0621f6c9e3
Impulses aren't applied to disabled item bodies when the submarine hits something, velocities of item bodies are reset when the item is dropped, pathfinding errors don't open the debug console
2016-06-01 20:56:07 +03:00
1828198abf
More descriptive coroutine exception error messages, more null checks in Level.Unload
2016-05-30 18:33:46 +03:00
b512a7ec18
- fixed clients failing to load submarines if they're not in the root Submarine folder
...
- some refactoring
- temporarily disabled kicking by voting
2016-05-30 18:32:36 +03:00
9b659f72d6
- fixed fulgurium batteries not working with flashlights or sonars and never running out in scooters
2016-05-30 18:28:42 +03:00
c77060d485
Fixed vents, more powerful oxygen generators in vanilla subs
2016-05-30 18:25:50 +03:00
c71a935de6
v0.4.1.3:
...
- fixed debug message height not being set correctly
- fixed submarine list not being updated if host has enabled "play yourself"
- fixed "queue empty" error when attempting to download a sub from the server
- maximum number of iterations when carving a path for a cave
2016-05-27 14:41:34 +03:00
68870b67f5
- fractal guardians have higher impact tolerance to stop them from killing themselves by slamming at the walls
...
- enemies use pathfinding when inside the sub and handle platforms/stairs better
2016-05-26 18:04:25 +03:00
2398d8aa8a
- resetting the "blood overlay" when switching the controlled character
...
- fixed 1-section long walls being impossible to fix after their body has been destroyed
- better looking blur (small lights aren't "skewed")
2016-05-26 18:03:08 +03:00
6a3572e1d2
ItemComponent properties that are editable in the editor are always saved
2016-05-26 16:10:24 +03:00
7aa1b44cae
Fixed flare lightcomponent staying active after the flare burns out, OnActive statuseffects are applied to lightcomponents even if the item is inside an inventory/container (= flares won't stop burning if placed back to inventory)
2016-05-26 16:08:55 +03:00
310e85fd8c
WIP kicking by voting
2016-05-26 16:05:45 +03:00
1d06522bd8
Nitroglyserine -> nitroglycerin, fixed Mission.LoadRandom returning null if the missiontype parameter isn't set, cargo is placed at the cargo spawnpoint instead of a random position within the hull it's inside
2016-05-26 16:04:37 +03:00
da98ade77c
- item sprites visible in fabricator menu
...
- deth charge rotation fix
- sonar tweaking (ruin walls look slightly different from cave walls)
- connector sprite positioning fix
- repairtool is active when in use
2016-05-25 16:18:02 +03:00
b4af92ace2
Small optimization: items have a list of components that have to be drawn
2016-05-24 21:17:38 +03:00
ed529052a2
- relaycomponent inherits from powertransfer, so that they're included when calculating the load/power for the grid
...
- deactivated powertransfer components don't carry power
- fixed reactor graph lines going over the graph if load > 10 000
2016-05-24 19:17:42 +03:00
52f28f98a7
- server asks the clients whether they're ready to start a round, giving some time to load the selected sub before the round starts
...
- fixed joining clients not being informed about vote status or voting being enabled
2016-05-24 19:10:11 +03:00
4f4c59eba3
- Changes to connectionpanel layout: less wire overlap, making it easier to select individual wires
...
- Highlighting selected wire and the items it's connected to works in editor
2016-05-24 19:03:07 +03:00
e6b073f872
- clients see the submarines that the host has instead of their own subs in server lobby
...
- possible to vote for subs the client doesn't have
- fixed the "votes required" slider moving when re-opening the server settings
- WIP method for sending missing subs to clients before the round starts (atm the clients won't have time to request a sub file that was chosen by voting)
2016-05-22 01:39:10 +03:00
c2f1a1a383
Only the largest firesource within a hull plays a sound
2016-05-22 01:32:23 +03:00
00b1ec38e2
Some new wall sprites, wires are automatically dropped if both items they're attached to are removed, other items aren't highlighted while dragging an item in editor
2016-05-22 01:31:36 +03:00
b2f83b43f8
Attacks can apply a force to the target (i.e. monsters can throw characters around)
2016-05-22 01:28:46 +03:00
Regalis
Regalis11