vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,300 Commits 5 Branches 2 Tags
53bfbb3ea7edfcc48a504887a99722e9c1dee4bb
Commit Graph

76 Commits

Author SHA1 Message Date
Regalis
e3b595b9e0 Cleanup (removing unused variables & other redundancies, rethrowing exceptions instead of wrapping them in a new exception instance) 2017-05-20 15:35:13 +03:00
Regalis
31f7eca717 Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Source/GUI/GUIButton.cs
	Subsurface/Source/GameSession/CrewManager.cs
	Subsurface/Source/GameSession/GameSession.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Screens/MainMenuScreen.cs
	Subsurface/Source/Screens/ServerListScreen.cs
 2017-04-23 21:40:11 +03:00
Regalis
645df3fde6 Crew command menu and the info menu can't be open at the same time, UI layout tweaking again 2017-04-23 21:06:30 +03:00
Regalis
3844dd9dac GUIStyle logic changes: instead of having a predetermined GUIComponentStyle for each type of GUIComponent, any GUIComponent can use any style. The GUIComponent constructors take the name of the style as a parameter, and if no style is specified, the default style for the GUIComponent in question will be used. 2017-04-08 16:46:53 +03:00
Regalis
1a3c18c727 EntitySpawner sends spawn/removal messages to clients using EntityEvents. 
EntityEvents and EntitySpawner used to work independently of each other, with separate IDs, and there was no guarantee that spawning and events would happen in the correct order. For example, a client could fail to read events during midround syncing because the entity has been removed, or read an event for an incorrect entity because the entity has been removed and the ID taken by some other entity.
 2017-03-27 21:05:32 +03:00
Regalis
04f86865f7 Changed GUIMessageBox.MessageBoxes from a queue to a list to make it easier to remove messageboxes that aren't currently visible, fixed clients creating multiple "permissions changed" messageboxes if there's another messagebox on the screen 2017-02-18 15:58:46 +02:00
Regalis
7f7ac76484 Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GUI/LoadingScreen.cs
 2017-02-13 22:04:28 +02:00
Regalis
5871faa2dd Added a few new console commands: disablehud, lockx & locky (disables submarine movement on the respective axis), followsub (toggles whether the camera moves with the subs) 2017-02-13 16:23:28 +02:00
Regalis
ff96f152ce Resetting EntityEvent & EntitySpawner IDs when starting a new round, LOS effect is enabled when a client takes control of a character 2017-01-09 18:22:37 +02:00
Regalis
1f07b18e5b Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/Components/DockingPort.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
 2016-12-29 22:18:27 +02:00
Regalis
dd46ce1d98 Adjusting submarine spawnposition if the sub (or any docked subs) intersect with walls 2016-12-20 16:11:47 +02:00
Regalis
adde3461ea Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/Items/Components/Door.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Components/Signal/Wire.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/ChatMessage.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/GameServerSettings.cs
	Subsurface/Source/Networking/NetworkMember.cs
 2016-11-24 19:52:40 +02:00
juanjp600
7a33f5c120 Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 
# Conflicts:
#	Subsurface/Source/GameSession/GameSession.cs
 2016-11-16 21:32:22 -03:00
juanjp600
fac0c850a5 Changes to collider behavior 
The collider now levitates above the ground, which makes small obstacles a non-issue. The raytest also helps the collider stick to staircases, so players don't jump off anymore.
Crouching now changes the collider to a smaller version, so now there is actual functionality to crouching.
I also removed the anchor from corpses of network players. I'm not entirely sure why this was done, but removing it doesn't seem to break anything.
 2016-11-16 21:30:49 -03:00
Regalis
1c206e1730 Adding CrewManager to GUIUpdateList in single player mode 2016-11-16 21:40:13 +02:00
Regalis
16cf9f6c81 Handling exceptions in particle update, gamesession UI order fix, traitor setting loading fix 2016-11-16 20:14:14 +02:00
juanjp600
d2c17274fe GUI elements now respect render order + some minor distance comparison optimization 2016-11-15 22:26:36 -03:00
Regalis
a18630c0b3 Fixed tutorial sub spawning twice 2016-11-10 19:34:47 +02:00
juanjp600
f0acf69065 Merge remote-tracking branch 'barotrauma/master' into new-netcode 
# Conflicts:
#	Subsurface/Properties/AssemblyInfo.cs
#	Subsurface/Source/Characters/AI/EnemyAIController.cs
#	Subsurface/Source/Characters/AICharacter.cs
#	Subsurface/Source/Characters/Character.cs
#	Subsurface/Source/Items/Components/Signal/Connection.cs
#	Subsurface/Source/Items/Item.cs
#	Subsurface/Source/Map/Structure.cs
#	Subsurface/Source/Networking/GameClient.cs
#	Subsurface/Source/Networking/GameServer.cs
#	Subsurface/Source/Screens/NetLobbyScreen.cs
 2016-11-05 18:18:20 -03:00
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
8f646a2723 - fixed dummy location generation crashing the tutorial 
- gameserver handles exceptions thrown when instantiating a new gamesession
- fixed screwdrivers (and other items that can be held in either hand) going into both hand slots when equipping by double clicking
 2016-11-03 18:22:45 +02: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
e7e51fbe0c Saving times and map seeds are displayed correctly in the "load game" menu 2016-10-09 17:38:01 +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
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
712953cc9e WIP client special permissions (kick, ban, end round) 2016-08-24 11:47:46 +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
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
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
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
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
e84e72bba6 Borderless windowed mode, mid-round settings menu 2016-04-22 20:55:56 +03:00
Regalis
188220c464 A "suicide button" which can be used if the character is unconscious and the player doesn't want to wait for help, fixed submarine staying loaded when clicking the "load previous" button mid-round, main path waypoint generation bugfix 2016-04-20 17:22:22 +03:00
Regalis
31a04c7bc1 Cargo missions, a menu that shows the mission description mid-round 2016-04-16 15:36:01 +03:00
Regalis
c7545d5816 - StartCoroutine returns a handle which can be used to stop a coroutine, and coroutines and be given a name to make accessing them easier 
- StatusEffect coroutines are stopped when the round ends
- Fixed GameServer keeping a reference to the TraitorManager after a round ends (causing traitor messages to appear even if traitors aren't on anymore)
- Option to spawn characters near/inside/outside the sub using the spawn command
 2016-04-06 18:36:26 +03:00
Regalis
d6443ac6a4 v0.3.3.1: fixed the inventories of selected players going behind the chatbox, fixed clients sending deselect messages for characters other than their own, using keybinds when moving the camera 2016-02-21 00:29:53 +02:00