vlad.os/LuaCsForBarotraumaEP
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Files
1dc255bc2f461d72504a1aa25edee36895b76dac
LuaCsForBarotraumaEP/BarotraumaShared/Content
History
juanjp600 1dc255bc2f Merge branch 'master' into dedicated-server 
# Conflicts:
#	BarotraumaClient/Source/GameSettings.cs
#	BarotraumaClient/Source/Screens/NetLobbyScreen.cs
2017-06-23 10:21:02 -03:00
..
BackgroundSprites
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Characters
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Items
Merge branch 'master' into dedicated-server
2017-06-23 10:21:02 -03:00
Lights
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Map
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Particles
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Sounds
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
UI
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
blurshader_opengl.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
blurshader.fx
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
blurshader.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Code Pro Bold.otf
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Content.mgcb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
damageshader_opengl.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
damageshader.fx
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
damageshader.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
effects.mgfx
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Exo2-Light.otf
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Exo2-Medium.otf
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
InfoTexts.xml
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Jobs.xml
Merge branch 'master' into dedicated-server
2017-06-23 10:21:02 -03:00
Missions.xml
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
Orders.xml
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
randomevents.xml
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
step.ogg
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
utg_4.mp4
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
utg_4.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
waterbump.png
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
watershader_opengl.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
watershader.fx
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00
watershader.xnb
Reducing usage of #if CLIENT / #elif SERVER
2017-06-14 17:30:40 -03:00