q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-12-28 08:24:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
73aab13a79
Serious-Engine/Sources/Engine/Entities
History
Ryan C. Gordon 1a2ccb8f50 Merge github.com:Croteam-Official/Serious-Engine 
Conflicts:
	Sources/Ecc/Parser.cpp
	Sources/Ecc/Scanner.cpp
	Sources/Engine/Base/Scanner.cpp
	Sources/Engine/GameAgent/GameAgent.cpp
	Sources/Engine/Graphics/Gfx_wrapper.h
	Sources/Engine/Network/Network.cpp
	Sources/Engine/Sound/SoundDecoder.h
	Sources/Engine/Templates/HashTableTemplate.cpp
	Sources/Engine/Terrain/Terrain.h
	Sources/EntitiesMP/ParticleCloudsHolder.es
	Sources/EntitiesMP/ParticleCloudsMarker.es
	Sources/SeriousSam/CDCheck.h
	Sources/SeriousSam/Menu.cpp
	Sources/SeriousSam/MenuGadgets.cpp
	Sources/SeriousSam/SeriousSam.cpp
	Sources/SeriousSam/SplashScreen.cpp
	Sources/SeriousSam/StdH.cpp
	Sources/SeriousSam/StdH.h
	Sources/Shaders/StdH.cpp
2016-04-02 23:56:12 -04:00
..
Entity.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Entity.h We actually get NULL here, so these stay for now, Clang warnings be damned. 2016-03-31 21:54:25 -04:00
EntityClass.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EntityClass.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EntityCollision.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EntityCollision.h Add GPL header to files 2016-03-11 18:20:51 -06:00
EntityCopying.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EntityEvent.h Add GPL header to files 2016-03-11 18:20:51 -06:00
EntityPointer.h Add GPL header to files 2016-03-11 18:20:51 -06:00
EntityProperties.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
EntityProperties.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
FieldBSPTesting.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
FieldSettings.h Add GPL header to files 2016-03-11 18:20:51 -06:00
InternalClasses.h Add GPL header to files 2016-03-11 18:20:51 -06:00
LastPositions.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
LastPositions.h Add GPL header to files 2016-03-11 18:20:51 -06:00
NearestPolygon.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
PlayerCharacter.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
PlayerCharacter.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Precaching.h Add GPL header to files 2016-03-11 18:20:51 -06:00
ShadingInfo.h Add GPL header to files 2016-03-11 18:20:51 -06:00