vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
804 Commits 5 Branches 2 Tags
35dafc4792e98dc28dc2dc52849bcda255eb0ec3
Commit Graph

53 Commits

Author SHA1 Message Date
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
7e20d7a17a Timing.Alpha isn't updated if accumulator < step, using interpolated positions to draw lightsources & ragdoll/ai debug info (-> no twitching when the sub is moving) 2016-10-11 16:34:59 +03:00
Regalis
e720fa366c Timing.Alpha isn't updated when the game is paused (-> no "twitching" when the pause menu is open), moved water scrolling and surface lerping from draw method to update 2016-10-09 15:12:57 +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
e1296e4a8e Backported vsync changes from new-netcode, WIP hull visibility culling 
The hull culling functions are there, they just aren't being used right now because there are some annoying bugs.
 2016-10-02 22:24:31 -03:00
juanjp600
fc8eab688d Merged branch master into new-netcode 2016-09-27 19:45:14 -03:00
Regalis
2bdc7441fc Merge branch 'level-gen-overhaul' 2016-09-27 20:19:29 +03:00
juanjp600
02d98f5d29 Merge remote-tracking branch 'refs/remotes/barotrauma/master' 
Conflicts:
	Subsurface/Source/Networking/FileStreamReceiver.cs
	Subsurface/Source/Networking/FileStreamSender.cs
	Subsurface/Source/Networking/GameClient.cs
	Subsurface/Source/Networking/GameServer.cs
	Subsurface/Source/Networking/GameServerLogin.cs
	Subsurface/Source/Networking/NetworkEvent.cs
	Subsurface/Source/Screens/NetLobbyScreen.cs
 2016-09-24 21:28:37 -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
edab86f730 Character freezing + Misc fixes 2016-09-21 16:46:12 -03:00
juanjp600
f3fbbb8aec Fixed bug with GUIComponent children changing order in parent's list 2016-09-19 22:02:00 -03:00
juanjp600
c97f729fb3 Added option to toggle vsync 
For the ultimate PC master race experience.

Also calling water scroll on every frame with deltatime instead of being called at fixed intervals, making it look smoother as framerate increases.
 2016-09-18 18:24:50 -03:00
juanjp600
5da2bc9523 Fixed water scroll speed 2016-09-18 15:35:35 -03:00
juanjp600
33641ead3e Fixed timestep for some GUI & input code 
Fixed timestep only applied to the physics simulation, but input and GUI updates were not being handled properly, so here's some progress into fixing them.
 2016-09-18 11:03:52 -03:00
juanjp600
179c0424d7 Disabled vsync + added input list to Character 
Not everything breaks without vsync. GUI updates need to be fixed.
 2016-09-16 15:54:11 -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
e0b6642767 Minor fixes and tweaks 2016-09-01 22:22:45 -03:00
juanjp600
7bdcc51bae Made game compilable 
Networking functionality is fully disabled now.

I think it's time to start rewriting everything. OH BOY
 2016-08-30 21:13: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
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
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
e7a06a6171 Option to choose mission type in mp 2016-05-10 18:42:50 +03:00
Regalis
d5f6fff2c2 Lighting improvements: lightmap is drawn over all structures and blurred, flashlight item, OnContained statuseffects are also applied when the item is contained in a characterinventory 2016-05-07 09:16:29 +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
e84e72bba6 Borderless windowed mode, mid-round settings menu 2016-04-22 20:55:56 +03:00
Regalis
12dc494e42 Displaying the condition of contained items in the inventory slot of the parent item (i.e. the amount of oxygen left in a diving suit is visible without highlighting the suit), some debug logging, colored speech bubbles 2016-04-21 17:17:42 +03:00
Regalis
2f7295eaad Option to set a duration for a status effect 2016-03-26 23:20:02 +02:00
Regalis
3402dad741 v0.3.5.1: 
- fixed UI controls not working in launcher
- fixed battery cells not reloading inside batteries
- moloch spawns earlier in tutorial
- fixed wrong updaterversion in launcher (caused the launcher to always show a warning)
 2016-03-14 18:34:57 +02:00
Regalis
d1580328ed Some cleanup using ReSharper (mostly removing redundancies) 2016-03-12 15:32:34 +02:00
Regalis
35c36d283a Upgraded to MonoGame v0.3.4: rebuilt shaders, removed the old content project, added a default config file 2016-02-29 22:06:48 +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
9e11134bd3 Navigation requires power, locationtypes and missions included in content packages 2016-02-18 22:04:47 +02:00
Regalis
f5c2dbf22a v0.3.0.3: ignoring input if window isn't active 2016-01-28 21:49:52 +02:00
Regalis
2761c4a610 Fade in when shift starts, fixed fadeout canceling before screen is switched to lobby 2016-01-20 23:22:55 +02:00
Regalis11
63dd5e1bf6 Added HhyperDescriptor, sorting backgroundsprites according to texture 2015-12-21 12:12:31 +02:00
Regalis
ca7eae5322 Order symbols 2015-12-07 19:32:55 +02:00
Regalis
5bcdfa2b56 AI combat, misc AI improvements, characters can't get stuck inside doors 2015-12-03 18:34:35 +02:00
Regalis
cddf4f1bde Sending NetTime at the start of a combined networkevent instead of individual networkevents, syncing itemcomponents for spectators, AICharacter importantentityupdates are sent again, misc bugfixes, some new heads 2015-11-20 17:12:33 +02:00
Regalis
f42cc78af3 Merged linux changes, fixed first item in inventory not being loaded, fixed levels breaking if re-entering the same level 2015-11-19 16:29:13 +02:00
Regalis
cd48d12be6 Setting ragdoll position without limbs going through walls, rotating entire ragdoll, using combined network messages client->server, fixed fabricators 2015-11-08 22:20:29 +02:00
Regalis
b0deba514e ghkjghk 2015-10-31 15:16:49 +02:00
Regalis
dc4b502248 "Infinite walls", converting old InputTypes in saved subs to new ones 2015-10-29 00:59:00 +02:00
Regalis
948285f6ab Control settings, more server settings, selecting character face 2015-10-28 19:07:17 +02:00
Regalis
9ed2963cd9 Settings menu with sound and music volume sliders, re-enabled deselecting connectionpanels with E in editmapscreen 2015-10-26 19:35:57 +02:00
Regalis
b3462b24b4 Reliablesender exception handling, buttons crashing multiplayer, using screwdrivers/wrenches with left click, RestoreCollision exception handling, nerfed c4, UpdateLimbCollisionCategories fix 2015-10-23 00:10:27 +03:00
Regalis
51e68f0949 Banning players, networkevent refactoring, wire syncing bugfixes, wrenches can be used as a melee weapon, proper error message for invalid IPs, drawing held items in correct position, fixed client crashing if sending a chatmessage while connection is lost 2015-10-22 01:04:42 +03:00
Regalis
3c1a66078c v0.2: iteminventory sync bugfix, meleeweapon "reload time", spears can be picked even if they're stuck inside a wall, tutorial bugfixes, "submarine godmode", removed round duration, drag character sync, reliable structure damage messages, job assignment bugfixes, some extra sounds 2015-10-17 16:01:42 +03:00
Regalis
838022fcd5 Switch to Barotrauma & too many misc changes to remember 2015-10-16 18:11:58 +03:00