Serious-Engine/Sources/Engine/Math
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
..
AABBox.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Clipping.inl First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
FixInt.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Float.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Float.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Functions.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Functions.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Geometry_DOUBLE.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Geometry.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Geometry.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Geometry.inl First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Matrix.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
OBBox.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Object3D_CSG.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Object3D_IO.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Object3D.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Object3D.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ObjectSector.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Placement.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Placement.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Plane.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection_DOUBLE.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Projection_Isometric.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection_Parallel.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection_Perspective.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection_Simple_DOUBLE.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection_Simple.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Projection.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Quaternion.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
TextureMapping.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
TextureMapping.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Vector.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00