juanjp600
35dafc4792
Merge remote-tracking branch 'barotrauma/master' into new-netcode
...
# Conflicts:
# Subsurface/Source/Characters/Character.cs
# Subsurface/Source/Items/Components/Machines/Steering.cs
# Subsurface/Source/Map/Structure.cs
# Subsurface/Source/Networking/GameClient.cs
# Subsurface/Source/Networking/GameServer.cs
2016-11-05 18:09:44 -03:00
Regalis
282611d0cc
Limiting too long location names in navigation terminals & end shift button
2016-10-26 19:48:39 +03:00
Regalis
980f8e0d33
- option to select which location autopilot navigates towards
...
- generating "dummy locations" for the MP gamesessions (visible in sonar and mission descriptions)
- EndGame network message tells the clients if the mission was successful (because the message may arrive before the sub has reached the exit or before some character has died at the client's end)
2016-10-26 19:22:40 +03:00
Regalis
6f9160e4a7
Removing & spawning entities in the same order as the server, EntitySpawner does both removing and spawning
2016-10-26 16:44:59 +03:00
Regalis
170e1a0da8
ItemRemover -> EntityRemover, clients reset spawner & remover when starting a new round
2016-10-12 20:46:47 +03:00
juanjp600
cb1b975f9f
Merged branch combat-mission into combat-mission
2016-10-10 09:58:06 -03:00
juanjp600
0125ff0f5c
Replace mission GUI box text hack + If both teams die, they both lose
2016-10-10 08:32:31 -03:00
Regalis
ef9dce9a0d
- fixed exception in GetSubsToLeaveBehind if the round ends when none of the subs is at an exit
...
- water surface is clamped above the bottom of the hull
- character names don't overlap with health bars
2016-10-09 18:20:32 +03:00
Regalis
e7e51fbe0c
Saving times and map seeds are displayed correctly in the "load game" menu
2016-10-09 17:38:01 +03:00
Regalis
f7e98ee6a8
Cargo spawning fix again: items are spawned slightly above the bottom of the cargo room (because the item is only inside the hull if pos.Y > hull.rect.bottom)
2016-10-09 17:33:51 +03:00
Regalis
0ea9600198
Team-specific combat mission descriptions + deepest lore
2016-10-06 19:55:26 +03:00
Regalis
fb28fc8cda
- separate listboxes for both teams in the crew menu
...
- fixed host getting team ID 0
- fixed clients not spawning if their ID is 0 (= if playing a non-combat mission before IDs have been assigned)
- fixed host's character taking part in the job assignment of both teams
2016-10-05 20:15:39 +03:00
Regalis
41289c098a
Moved some UI element updates from draw to update
2016-10-04 18:28:56 +03:00
juanjp600
1187686449
Host can disable spawning of certain characters
...
GUITickBox might not work very well because of the override of Rect, might want to look into that later
2016-10-03 22:27:32 -03:00
juanjp600
75e7b3a94e
Merged branch master into combat-mission
2016-10-01 20:10:38 -03:00
juanjp600
f6b82eb095
Some progress on flipping subs
...
Press crouch to flip every sub in the map, texture alignment breaks and physics items vanish, but other than that it's working.
2016-09-29 22:20:15 -03:00
Regalis
c1cb19b940
More suitable tutorial seed + moloch spawn position, moloch nerf
2016-09-29 19:32:14 +03:00
Regalis
86c50304dd
- saving after MainSub has been removed (i.e. saving after returning to map screen) doesn't break save files anymore
...
- fixed subs getting left behind if the sub moves too far from the start/end position during the ending cinematic
- map shows which LocationConnections have been passed through
2016-09-28 19:16:50 +03:00
Regalis
c5ce3a75a2
Sp campaign map shows which locations have been visited (+ some minor visual improvements to the map)
2016-09-28 16:53:08 +03:00
juanjp600
344947c3c4
Search and destroy mission
...
Featuring ugly code
2016-09-26 22:09:06 -03:00
juanjp600
d537e8795a
Replace '' (two single quotes) with \" (double quote)
...
We must correct post-traumatic Blitz disorder
2016-09-24 21:26:08 -03:00
juanjp600
ef2b0d8721
Whitelist + conflict resolve
2016-09-03 14:57:36 -03:00
Regalis
5de48a030e
Changes to the layout of the "manage players" menu
2016-08-29 18:28:31 +03:00
juanjp600
8f675e625b
Host can ban lobby players from ingame
...
New menu looks really ugly but it works
2016-08-28 22:16:49 -03:00
Regalis
e2885a912d
Husk infections, manually attacking when controlling a creature
2016-08-28 16:16:02 +03:00
Regalis
712953cc9e
WIP client special permissions (kick, ban, end round)
2016-08-24 11:47:46 +03:00
Regalis
08817090a0
Fixed docking ports leaking if multiple vessels have docked to the main sub, cargo is always spawned in the main sub
2016-08-19 20:13:24 +03:00
Regalis
26b6847bca
Fixed NullReferenceExceptions if in the netlobby when a round ends, fixed chatmsgbox staying disabled after being stunned
2016-08-16 20:18:19 +03:00
Regalis
ec59c47041
Docking ports have a power connector that can be used for distributing power between docked subs, already connected wires in respawn shuttles and the tutorial subs can't be disconnected, flares burn longer
2016-08-13 17:52:35 +03:00
Regalis
4252f4b9d0
- clients don't spawn character jobitems themselves (item data is written in the StartGame network message)
...
- after receiving a StartGame message, clients will wait until the game is loaded before reading new messages from the server
- the Item(prefab, position, submarine) constructor uses the position as the center of the item, not as top-left corner
2016-07-29 18:38:42 +03:00
Regalis
c773320a55
Autopilot can avoid other subs, characters won't go outside in idle state
2016-07-28 21:45:35 +03:00
Regalis
2490c0eb9d
- fixed Submarine.MainSub not being set in tutorialmode
...
- controllers can effect view distance (-> longer railgun view dist)
- fixed removeitem messages not being sent when a fabricator destroys an item
- changes to depth damage logic: structures won't take damage until the pressure is above the health of the hull (i.e. weaker structures break first, subs with no windows can go deeper)
2016-07-25 18:38:50 +03:00
Regalis
b81417ad16
Characters can be left behind in levels and they will stay there until the player returns, other subs visible in sonar
2016-07-20 17:13:34 +03:00
Regalis
2bdd6ff916
Multi-sub transition cinematic, linkedsubs don't have to be docked to the main sub when leaving (being at the same exit is enough), resetting item/serverlog listbox scroll when filtering the list
2016-07-18 20:37:53 +03:00
Regalis11
a3ae32d0dd
asdgsdfhsd
2016-07-18 18:47:00 +03:00
Regalis
f8fec79785
Parts of the submarine that are left behind in the level will stay there, it's possible to leave the level without the main sub (e.g. in an escape shuttle)
2016-07-16 16:14:51 +03:00
Regalis
03a3a156ba
- fixed camera "twitching" when trying to move it above the upper limit of the level
...
- fixed duplicate hulls/gaps being placed at docking ports when saving and loading
- fixed linkedsubmarines moving when saving and reloading if the center of the wall vertices isn't he same as the center of the sub
- moving docked submarines along with the main sub when syncing the position
- characters are killed when the client controlling them disconnects (+ cause of death: disconnected)
- fixed the description box in server lobby
2016-07-15 19:21:10 +03:00
Regalis
cafeceb6d2
WIP dockingport/multisub saving in single player mode
2016-07-02 14:59:49 +03:00
Regalis
dc7956274c
- camera follows the closest sub
...
- WIP "respawn shuttle"
- submarine size affects its mass
- electricity fixes
2016-06-18 14:46:40 +03:00
Regalis
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
Regalis
7349cdd310
Progress (compiles now)
2016-06-09 22:15:50 +03:00
Regalis11
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
Regalis
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
Regalis
6651933c45
Some decorative lights in tutorial sub, updated moloch spawn position, more detailed pump fix instructions
2016-05-19 19:44:42 +03:00
Regalis
be72fee824
Dirty workaround for background music breaking during loading (the music is switched when a round starts), the "wall" at the top of the levels is drawn on top of the lightmap, small fixes in AIObjectiveGetItem and BackGroundSpriteManager
2016-05-15 17:58:56 +03:00
Regalis
e7a06a6171
Option to choose mission type in mp
2016-05-10 18:42:50 +03:00
Regalis
3f22b2e4df
GUIMessageBoxes are drawn on top of everything else (they were obstructed by shiftsummary), placing background sprites based on level seed, instructions for dealing with broken junction boxes in tutorial
2016-05-01 18:55:44 +03:00
Regalis
d3ab7946a8
Using ToLowerInvariant instead of ToLower (the game works for Turkish players now!)
...
http://www.moserware.com/2008/02/does-your-code-pass-turkey-test.html
2016-04-27 17:14:09 +03:00
Regalis
2136641609
Stun syncing bugfix, fixed dead/unconscious characters being unselectable in the info menu, pockets for doctors, fixed tutorial (map generation algorithm changes had made the level unplayable)
2016-04-25 19:16:01 +03:00
Regalis
14ef736176
"Suicide button" is also usable in single player, unconscious characters can't be selected in sp, fixed resizing textblocks with wrapped text
2016-04-23 17:26:56 +03:00
