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

162 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 1fe6427c05 9-Sliced UI sprites & some new UI graphics 2017-04-07 22:22:07 +03:00
Regalis 43d29de45c Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Barotrauma.csproj
 2017-04-03 18:36:22 +03:00
Regalis 2ca609855a Particle collision and project file fixes 2017-04-03 18:32:49 +03:00
Regalis c58d7dfd73 Animated fire & smoke particles 2017-03-30 21:32:08 +03:00
Regalis 9ef069bf61 New head sprite 2017-03-27 01:54:48 +03:00
Regalis 5bdb57b98a Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
	Subsurface/Source/Characters/AICharacter.cs
	Subsurface/Source/Characters/Animation/HumanoidAnimController.cs
	Subsurface/Source/Characters/Character.cs
	Subsurface/Source/GameMain.cs
	Subsurface/Source/Items/Components/Signal/Connection.cs
	Subsurface/Source/Items/Item.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Physics/PhysicsBody.cs
 2017-03-11 13:24:09 +02:00
Regalis ede3f1c393 Removed old fonts 2017-03-09 20:09:34 +02:00
Regalis be72a04d90 Switched to the pro version of Code Bold 2017-03-09 20:04:33 +02:00
Regalis 5450ff498a Progress on file transfers (class for receiving files, FileSender can transfer multiple files to the same recipient simultaneously) 2017-03-07 20:03:40 +02:00
juanjp600 d6c292a2cc SharpFont + ScalableFont implementation 
https://github.com/Robmaister/SharpFont

TODO: replace Code Bold.otf with the full version, fix any bugs, build on Linux, possibly move ToolBox string wrapping and limiting logic to ScalableFont class for better results.
 2017-03-07 13:44:42 -03:00
Regalis cf859eee7c WIP file transfer logic 2017-03-06 20:31:24 +02:00
juanjp600 ba026a8f88 Added list of homoglyphs for name comparison 
Unicode is now allowed in player names, but it can't be easily exploited anymore
 2017-03-02 12:09:08 -03:00
Regalis 3fcaff0288 Merge branch 'master' into new-netcode 
Conflicts:
	Subsurface/Properties/AssemblyInfo.cs
 2017-02-22 23:33:14 +02:00
Regalis 27e74490a0 New wire sprite and switched the body from circle to capsule, tweaked physicsbody position lerping logic (catches up with the server faster) 2017-02-22 22:02:33 +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 52bf73722f ServerEntityEventManager doesn't process received events until the character inputs of the client for the corresponding frame have been processed (fixes character movement lagging behind EntityEvents at the servers side) 
+ split character networking logic into a separate file, characters drop items at the position of their collider instead of hands
 2017-02-09 23:09:42 +02:00
Regalis 4b8d1054b1 Changed lobby & chatMsg IDs to from uint to ushort, added a utility class that handles the wrap around of IDs 2017-02-05 22:55:19 +02:00
Regalis b375422c4e "Undertow games" splashscreen 2017-02-05 18:41:49 +02:00
Regalis 89e881cb57 Readded voting (submarine, mode, end round & kick) 2017-02-04 18:30:40 +02:00
Regalis 0cd2d7a0b9 Readded traitors 2017-01-30 19:49:13 +02:00
Regalis 15b3dd31a8 Merge branch 'master' into new-netcode 2017-01-25 20:30:26 +02:00
Regalis a2d6b4890e Updated to the latest version of NVorbis, fixed OggStream.Empty() failing to unqueue buffers when quitting due to a modified ALHelper.Check method that doesn't throw an exception on error 2016-12-31 14:49:43 +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 c01ac33e1d Option to configure damage sounds for structures with a specific tag, some new sounds 2016-12-21 00:07:25 +02:00
Regalis ede1dd58a0 New enemy (concept & sounds by Omniary) 2016-12-17 15:17:09 +02:00
Regalis b01b38da68 Bunch of new sounds by Omniary, some charactersound & soundplayer refactoring 2016-12-15 21:42:15 +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
Regalis 82aa43cda3 Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 2016-11-21 16:31:54 +02:00
Regalis 50d706c67b - changed how PowerContainers determine how much power to provide to the grid, batteries can now match the load of the grid 
- light-emitting alien structures that hold the artifacts instead of just having the artifacts lay on the floor (can also be used for turning artifacts into power sources if installed in a sub)
 2016-11-21 16:28:30 +02:00
juanjp600 7a3bce3973 Hull volume helper in editor + Character name matches client name + Better-looking Watcher light source 
Also '' is a thing of the past, use \" instead
 2016-11-20 18:47:22 -03:00
Regalis 498c72c64a Server sends ServerEntityEvents to clients, NetEntityEvents can contain an object array which will be passed to the serializable entity (now only used for ItemComponent indices) 2016-11-13 13:56:48 +02:00
Regalis c314b37029 Some classes for syncing entity state changes. Similar to the NetworkEvents in the old netcode, but the logic is split into separate classes which prevent the server from reading updates for entities that aren't IClientSerializable. 
todo: add NetEntityEventManagers to server & client, some logic to prevent sending events that don't need to be sent (e.g. duplicate event state updates)
 2016-11-12 20:56:06 +02:00
juanjp600 fae2dc2536 Can compile again 
Let's hope it's not too broken.
 2016-11-05 18:55:11 -03: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
Regalis 799efd8474 - attempt to fix "DXGI_ERROR_NOT_CURRENTLY_AVAILABLE" exceptions (the game tries forcing focus to the window and running GameMain again, and if that doesn't help, disables hardware mode switching) 
- messages can be added to debugconsole before it's initialized
 2016-11-02 20:38:55 +02:00
Regalis 170e1a0da8 ItemRemover -> EntityRemover, clients reset spawner & remover when starting a new round 2016-10-12 20:46:47 +03: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
Regalis 9540972db4 Added a near-indestructible ruin wall variant that has a higher chance of being used in rooms further away from the ruin entrance 2016-10-11 22:46:24 +03:00
juanjp600 a1d319d0df Merged branch new-netcode into new-netcode 2016-10-08 19:14:52 -03:00
Regalis ffc6782025 Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain) 2016-10-04 19:54:17 +03:00
Regalis 050f7ffc83 Removed fixed timestep logic from GameScreen (redundant now because the logic is handled in GameMain) 2016-10-04 19:21:05 +03:00
juanjp600 fc8eab688d Merged branch master into new-netcode 2016-09-27 19:45:14 -03:00
juanjp600 71ebbc00d9 Merged branch master into combat-mission 2016-09-27 19:42:35 -03:00
Regalis 2bdc7441fc Merge branch 'level-gen-overhaul' 2016-09-27 20:19:29 +03:00
juanjp600 344947c3c4 Search and destroy mission 
Featuring ugly code
 2016-09-26 22:09:06 -03:00
juanjp600 ff326bdc00 Fixed project file 2016-09-26 17:12:36 -03:00
juanjp600 0ef813f189 Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	Subsurface/Barotrauma.csproj
	Subsurface/Source/Screens/GameScreen.cs
 2016-09-26 17:03:14 -03:00
Regalis 4d6ebe8374 Some more wall damage sounds 2016-09-22 18:14:36 +03:00
Regalis 721f4ff5a6 Particle system improvements: 
- particles can collide with the outer walls of the sub
- drag + waterdrag parameters
- fixed particles "twitching" when the submarine is moving fast
- submarine velocity only affects the initial velocity of the particles (i.e. accelerating the sub doesn't automatically accelerate them)
 2016-09-21 19:45:20 +03:00