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

51 Commits

Author SHA1 Message Date
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
2cac176c87 More UI tweaking 2017-04-20 21:24:52 +03:00
Regalis
9a5777183f Separate sprites for horizontal and vertical scrollbars, style tweaking 2017-04-18 19:24:13 +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
juanjp600
e1d5d63dbd Sync monster spawn settings 2017-04-06 16:50:11 -03:00
Regalis
89e881cb57 Readded voting (submarine, mode, end round & kick) 2017-02-04 18:30:40 +02:00
Regalis
ffb6ec2000 Fixed server infobox saving 2016-11-24 20:40:28 +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
ba7fcad8f2 Readded special client permissions 
Also added a command that requires a password to gain the permissions.
I think they were never vulnerable in the first place, gamerfood was just trying to intimidate us.
 2016-11-20 22:01:37 -03:00
Regalis
16cf9f6c81 Handling exceptions in particle update, gamesession UI order fix, traitor setting loading fix 2016-11-16 20:14:14 +02:00
Regalis
5b99f9e35e Saving server info box & traitor settings 2016-11-16 17:36:38 +02:00
juanjp600
72033a581e Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GUI/GUI.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/GameSettings.cs
	Subsurface/Source/Items/CharacterInventory.cs
	Subsurface/Source/Items/Components/ItemComponent.cs
	Subsurface/Source/Items/Components/Machines/Pump.cs
	Subsurface/Source/Items/Components/Machines/Radar.cs
	Subsurface/Source/Items/Components/Machines/Steering.cs
	Subsurface/Source/Items/Components/Power/PowerContainer.cs
	Subsurface/Source/Items/Inventory.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Map/Levels/WaterRenderer.cs
	Subsurface/Source/Map/LinkedSubmarine.cs
	Subsurface/Source/Map/Map/Map.cs
	Subsurface/Source/Map/Structure.cs
	Subsurface/Source/Map/Submarine.cs
	Subsurface/Source/Map/WayPoint.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Physics/PhysicsBody.cs
	Subsurface/Source/Screens/GameScreen.cs
 2016-10-11 20:19:25 -03:00
juanjp600
ffeda27c1b Restored change lost in conflict resolve 
Also checking for itemprefab because adding structures wouldn't make any sense here
 2016-10-05 17:01:38 -03:00
Regalis
4ebe961024 Simpler method of checking which items to put in the Additional Cargo menu 2016-10-05 20:19:09 +03:00
juanjp600
4874ad2ef8 Host can have subs spawn with more items 
TODO: check if clients see the extra cargo, they probably don't
 2016-10-04 22:28:13 -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
404c506662 Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/Character.cs
 2016-09-07 17:35:18 -03:00
Regalis
53b3ef533e Moved the whitelist UI to server settings, GUITextBoxes can't be selected through other UI elements anymore 2016-09-05 18:12:56 +03:00
juanjp600
6f25bee9e1 Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	.vs/Subsurface_Solution/v14/.suo
	Subsurface/Barotrauma.csproj
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Items/ItemSpawner.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
 2016-09-03 17:54:33 -03:00
juanjp600
d0efbe14f3 Whitelist saving 2016-09-03 17:51:10 -03:00
juanjp600
ef2b0d8721 Whitelist + conflict resolve 2016-09-03 14:57:36 -03:00
juanjp600
9416eb64d7 Completely destroyed game 
Looks like a lot more than just netcode is getting rewritten. Removing coroutines because there are better ways of handling asynchronous tasks, removing filestream because that's to be reimplemented later
 2016-08-30 19:59:14 -03:00
Regalis
5de48a030e Changes to the layout of the "manage players" menu 2016-08-29 18:28:31 +03:00
juanjp600
e284ff5f38 Heavier password encryption 
I don't think this fixes actual bugs but the encryption seemed kinda weak.
 2016-08-29 07:13:19 -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
3f804acd42 v0.5.0, updated subs + changelog 2016-08-14 16:39:27 +03:00
Regalis
70dd90f0f8 Respawn shuttle transport duration can be adjusted or set to unlimited (= shuttle won't leave after spawning), subs with the HideInMenus tag aren't shown in menus, respawn info msgs are shown to all players 2016-08-08 23:37:11 +03:00
Regalis
09782be231 - sonar shows the outlines of docked subs (instead of normal sonar blips) 
- fixed lights not being removed if the same explosion is triggered again before the previous one is finished
- fixed electrical shocks from junction boxes stunning nearby players (and not just the player using the jb)
- showing restart timer as mins + secs
- more server settings
 2016-07-25 18:30:13 +03:00
Regalis
8abea5c0c7 - gameServerSettings refactoring: using ObjectProperties for saving/loading instead of doing it manually 
- tabs for different types of server settings
- moved banlist to server settings
- option to select autorestart delay
- character name is always the same as client name (less griefing potential)
 2016-07-21 21:18:38 +03:00
Regalis
911846acff - submarines send position updates more frequently when they're moving faster 
- small AICharacter syncing optimizations
- respawning can be disabled in server setting
- netstats show the total amount of bytes sent for each networkevent type
 2016-07-20 17:20:27 +03:00
Regalis
9689ef070d Vote kick settings 2016-06-07 14:13:12 +03:00
Regalis
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
Regalis
310e85fd8c WIP kicking by voting 2016-05-26 16:05:45 +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
d1580328ed Some cleanup using ReSharper (mostly removing redundancies) 2016-03-12 15:32:34 +02:00
Regalis
00c1edad09 - Changes in UpdateNetPlayerPosition 
- Holdable items don't try to change the pose if hand anim is disabled (e.g. when dragging someone or using a railgun controller)
- Indicator which shows the position of the sub when spectating
- Bugfix in controller selection logic
- Saving attributes on separate lines in serversettings.xml
- Safer validation of received sub files
 2016-02-28 14:33:03 +02:00
Regalis
cc4ada952f - File transfer improvements (switching the sub selection during transfer works, max transfer duration, waiting for transfers to finish before starting the round) 
- Firesource changes (more particles with shorter lifetimes, combining bugfix)
- StatusEffects can target hulls and always be active
- Cyrillic character support
- Saving server settings
- Swapping items in inventory by dropping an item to a non-free slot
 2016-02-27 21:01:10 +02:00
Regalis
9f8f4e290e Fixed propulsion applying force to _every limb except_ the ones it's supposed to, fixed pressure building up in enclosed rooms that are full of water, fixed netlobby displaying multiple votes for clients, progress on file transfer 2016-02-26 22:21:00 +02:00
Regalis
94e34c0ed9 Molochs can damage characters, server log UI, stun weapons have a longer stun time, characters can't breathe when wearing a diving suit with no oxygen tank 2016-02-14 19:05:03 +02:00
Regalis
bec6d95198 Server log, ai characters steer away from the abyss 2016-02-14 16:47:23 +02:00
Regalis
08f1d05507 Fuel rods can't be turned back to uranium/incendium if they've already been used, fixed level generation breaking with smaller subs 2016-02-13 13:09:27 +02:00
Regalis
c6f52cc68f Voting for round to end, level generation improvements 2016-02-12 19:39:24 +02:00
Regalis
14ee39e59a Endworm & moloch immune to bleeding, showing right sub name in save file info, disable charactermode before saving, option to end round when the end of the level is reached, maintain position option in steering 2016-02-01 22:21:26 +02:00
Regalis
5513637fe5 Item.Container bugfix (affected at least railguns in MP), merged the "your crew has died" message box with shiftsummary, reliable reactor syncing, prevent artifacts dropping out of the level 2016-01-12 01:02:05 +02:00
Regalis
03f569b161 Traitor probability selection instead of separate traitor mode, stopping water ambience on round end, lobby sync after client has verified connection, WIP shiftsummary in multiplayer, "cleanbuild" command in debugconsole 2016-01-07 23:25:42 +02:00
Regalis
11857f894b AI operating reactors & railguns, misc AI improvements 2015-11-30 19:06:27 +02:00
Regalis
9b08201972 Fire extinguisher, burnt limbs, spectating improvements, option to disable spectating, jumpsuits for engi & mech, fireproof items, stuff 2015-11-18 20:02:45 +02:00
Regalis
4d949e3be1 Spectating, fire, damaged limb sprites, water detector, engineer jumpsuit, new signal comp sprites, resharper cleanup (god knows what else, commit more often) 2015-11-10 22:22:26 +02:00
Regalis
b0deba514e ghkjghk 2015-10-31 15:16:49 +02:00