q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-26 04:05:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
134 Commits 2 Branches 0 Tags 94 MiB
a7e4f8237e
Commit Graph

41 Commits

Author SHA1 Message Date
Ryan C. Gordon
a7e4f8237e Patched to compile on Linux, and cleaned out almost all compiler warnings. 2016-04-04 02:34:07 -04:00
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
Ryan C. Gordon
9c5fa5f0fc Fixed some things GCC complained about on this Linux box. 2016-04-02 02:03:41 -04:00
zcaliptium
f9f4ec904c Fix the License. 2016-04-01 01:12:10 +03:00
zcaliptium
9bb4fa43cd Update SeriousSam/StdH.h 2016-04-01 01:04:08 +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
Ryan C. Gordon
ed527eb29e A little tapdancing to fix a missing symbol at link time. 2016-03-31 12:40:11 -04: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
RocketersAlex
0d8f7da318 Fixed SeriousSam and GameAgent bugs 2016-03-30 16:54:30 +03:00
Ryan C. Gordon
6ac856824f Fixed mismerge. 2016-03-30 01:36:03 -04:00
Ryan C. Gordon
aa8d0216db fixed a variable initialized and also marked 'extern'. 2016-03-30 01:31:46 -04:00
Ryan C. Gordon
9bdb8becb1 Whoops, that '==' should be '='. 2016-03-30 01:31:24 -04:00
zcaliptium
31d597856d Add and remove excess empty lines between functions, 
Make code better.
 2016-03-29 23:49:32 +03:00
Ryan C. Gordon
2f10f864d8 Silence a whole bunch of warnings about string literals vs non-const char *. 2016-03-29 12:51:34 -04:00
Ryan C. Gordon
24cb244d43 First attempt to hand-merge Ryan's Linux and Mac OS X port. 
This was a _ton_ of changes, made 15 years ago, so there are probably some
problems to work out still.

Among others: Engine/Base/Stream.* was mostly abandoned and will need to be
re-ported.

Still, this is a pretty good start, and probably holds a world record for
lines of changes or something.  :)
 2016-03-28 23:46:13 -04:00
zcaliptium
ef0b970490 Fixes 2016-03-22 21:03:12 +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
zcaliptium
d9cd480103 GameExecutable: Move some stuff from Menu.cpp into files PART VII 
3700 lines! Yay!
 2016-03-16 01:21:35 +03:00
zcaliptium
7745f8ced1 GameExecutable: Move some stuff from Menu.cpp into files PART VI 
4183 lines... Continue working...
 2016-03-16 00:24:35 +03:00
zcaliptium
2fcc548f29 GameExecutable: Move some stuff from Menu.cpp into files PART V 
Now it's 4463 lines!
 2016-03-15 01:03:22 +03:00
zcaliptium
16990d713c GameExecutable: Move some stuff from Menu.cpp into files PART IV 
Now it's 4901 lines! Progress!
 2016-03-14 23:45:56 +03:00
zcaliptium
899d297f7b GameExecutable: Move some stuff from Menu.cpp into files PART THREE 
Menu.cpp is so large(>6000 lines). I'll separate it!
 2016-03-14 03:59:44 +03:00
zcaliptium
220875d2de GameExecutable: Move some stuff from Menu.cpp into files PART TWO 
Menu.cpp is so large(>6000 lines). I'll separate it!
 2016-03-14 02:46:30 +03:00
zcaliptium
189c343368 GameExecutable: Move some stuff from Menu.cpp into files 
Menu.cpp is so large(>6000 lines). I'll separate it!
 2016-03-14 00:52:32 +03:00
zcaliptium
216246cf15 GameExecutable: Separate Menu.h into multiple files. 
Too many classes definitions in one file. Preparing for separation
Menu.cpp
 2016-03-12 18:25:48 +03:00
Matt Lee
a4af93fa31 Add GPL header to files 2016-03-11 18:20:51 -06:00
zcaliptium
f33bb4519f Fix. I forgot to remove piece of my code. 2016-03-12 00:53:58 +03:00
zcaliptium
a84fb76883 Game executable: Separate MenuGadgets(.h/.cpp) 
MenuGadets(.h/.cpp) separated into multiple files for each gadget!
 2016-03-12 00:45:21 +03:00
SLAwww
9d8b787be2 Uploading full engine sources 2016-03-11 15:57:17 +02:00