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 |
|
zcaliptium
|
ecac2063ff
|
Resolve conflicts
|
2016-04-01 01:00:14 +03:00 |
|
zcaliptium
|
cb907fbb87
|
GameExecutable: Add License into sources.
|
2016-03-31 03:38:57 +03:00 |
|
zcaliptium
|
31d597856d
|
Add and remove excess empty lines between functions,
Make code better.
|
2016-03-29 23:49:32 +03:00 |
|
zcaliptium
|
d29d0c64ab
|
GameExecutable: Some improvements part II
|
2016-03-16 21:56:44 +03:00 |
|