vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
991 Commits 5 Branches 2 Tags
44cbd0d9bf23b2ca7e34ab1e5e752e264e47ef1d
Commit Graph

139 Commits

Author SHA1 Message Date
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
Regalis 5918e845ac Progress bars that show the health of wall sections when welding/cutting 2016-09-20 18:40:30 +03:00
Regalis b24359464b Wall damage shader testing (WIP) 2016-09-16 14:47:08 +03:00
Regalis 7f543c394a More background sprites again, sprite commonness can vary between different level types 2016-09-14 19:54:03 +03:00
Regalis eae854abbc More background sprites (+ some sprites swing slightly, sprites are less likely to be placed in unreachable places) 2016-09-13 21:23:37 +03:00
Regalis c6105afc80 A separate class for parameters used by the level generator, different "level types" with configurable parameters 2016-09-12 20:48:43 +03:00
juanjp600 e232f1d2f1 Fixed project file 2016-09-05 13:31:47 -03:00
Regalis 98b04f1147 Merge branch 'master' of https://gitlab.com/poe.regalis/barotrauma 
Conflicts:
	Subsurface/Barotrauma.csproj
 2016-09-04 19:24:00 +03:00
Regalis 3b394976e4 A new monster, some changes to fish animation logic (creatures don't need to have a head, more pronounced swimming movement, option to select the position where steering forces are applied) 2016-09-04 19:18:44 +03:00
juanjp600 efa8b4da51 Removed per-user password from whitelist 2016-09-03 17:18:44 -03:00
juanjp600 ef2b0d8721 Whitelist + conflict resolve 2016-09-03 14:57:36 -03:00
Regalis 2c51ba50a8 v0.5.1.2: spawnitem console command, "spawn inside" always spawns characters in the main sub, a new music clip, modified the topwindow sprite a bit 2016-08-31 22:06:05 +03:00
Regalis e2885a912d Husk infections, manually attacking when controlling a creature 2016-08-28 16:16:02 +03:00
Regalis f03d3b2f61 - included wrap_oal.dll in the build (may help with the OpenAL exceptions?) 
- medics always have a high enough medical skill to fabricate any drug
- respawned characters get the same ID card tags they would've gotten if they had spawned inside the main sub
- highlighted characters glow in the dark
 2016-08-22 21:06:01 +03:00
Regalis ef0098d52a Anti-gamerfood measures: 
- clients don't send server passwords as plaintext: the server sends a nonce which the client encrypt using the password as the key
- IPs are visible in netstats
- amount of client jobpreferences limited to 3 at the servers side
- sanitizing client names
 2016-08-19 18:18:07 +03:00
Regalis ab923c47e3 Error message if a character config file isn't found, Linux version tries to search for "Characterfolder" if "characterfolder" isn't found 2016-08-11 21:31:02 +03:00
Regalis 581a7d5d9f Highlighted items glow in the dark, health bars are hidden when health is full, usernames and health bars are drawn at full brightness 2016-07-31 19:13:08 +03:00
Regalis a4ad91da44 Small pump, added docking ports to all vanilla subs 2016-07-18 20:34:22 +03:00
Regalis cafeceb6d2 WIP dockingport/multisub saving in single player mode 2016-07-02 14:59:49 +03:00
Regalis 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
Regalis 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
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 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
Regalis 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