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
f9f4ec904c
Fix the License.
2016-04-01 01:12:10 +03:00
zcaliptium
ecac2063ff
Resolve conflicts
2016-04-01 01:00:14 +03:00
zcaliptium
4cb76b506f
GameExecutable: Replace 4-spaced tabs with 2-spaced.
2016-03-31 23:27:11 +03:00
zcaliptium
80471f5041
GameExecutable: Fix } else { formatting.
...
Make code more readable.
2016-03-31 22:57:40 +03:00
zcaliptium
6434adfc1b
GameExecutable: Fix spaces for headers.
2016-03-31 22:43:28 +03:00
zcaliptium
7972586d1d
GameExecutable: Cleanup. Make some extern functions and variables static.
2016-03-31 21:58:50 +03:00
zcaliptium
3aa14342b3
GameExecutable: Get rid of CMENU preprocessor.
...
Use preprocessor for making the code shorter was bad idea. It makes
weird code parser, shows a lot of false errors and breaks code
highlighting(blinking).
2016-03-31 20:58:27 +03:00
zcaliptium
e9267112a1
GameExecutable: Get rid of the TECHTESTONLY and _SE_DEMO code.
2016-03-31 20:12:26 +03:00
zcaliptium
ca5873a2af
GameExecutable: Some cleanup and reorder.
...
Clean clean clean!
2016-03-31 19:21:46 +03:00
zcaliptium
cb907fbb87
GameExecutable: Add License into sources.
2016-03-31 03:38:57 +03:00
zcaliptium
1f0da8a443
GameExecutable: Some cleanup for menu code.
2016-03-30 23:09:51 +03:00
zcaliptium
de240b4ad7
GameExecutable: Continue refactoring. Rename some files.
2016-03-30 22:25:24 +03:00
zcaliptium
ef788b5299
GameExecutable: Put menus' extern variables into container.
2016-03-30 21:21:32 +03:00
zcaliptium
36c6eb19c0
Continue splitting Menu.cpp into multiple files.
2016-03-30 19:23:12 +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
zcaliptium
66cc1d014f
GameExecutable: Some improvements. Idk how to name it.
...
Add some empty lines. Move some files. Replace long repeating variable
names with shorter preprocessors.
2016-03-16 21:43:05 +03:00
