q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-11-23 02:40:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
1a2ccb8f50
Serious-Engine/Sources/Engine/Base
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
..
SDL Silence a whole bunch of warnings about string literals vs non-const char *. 2016-03-29 12:51:34 -04:00
Unix First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Win32 Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Anim.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Anim.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Assert.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Base.h Add GPL header to files 2016-03-11 18:20:51 -06:00
bison.simple Uploading full engine sources 2016-03-11 15:57:17 +02:00
Changeable.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Changeable.h Add GPL header to files 2016-03-11 18:20:51 -06:00
ChangeableRT.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Console_internal.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Console.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Console.h Add GPL header to files 2016-03-11 18:20:51 -06:00
CRC.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CRC.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CRCTable.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CRCTable.h Add GPL header to files 2016-03-11 18:20:51 -06:00
CTString.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
CTString.h Add GPL header to files 2016-03-11 18:20:51 -06:00
CTString.inl First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Directory.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
DynamicLoader.h First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
ErrorReporting.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ErrorReporting.h Add GPL header to files 2016-03-11 18:20:51 -06:00
ErrorTable.h Add GPL header to files 2016-03-11 18:20:51 -06:00
FileName.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
FileName.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
FileSystem.h First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
FLEX.skl Uploading full engine sources 2016-03-11 15:57:17 +02:00
GroupFile.h Add GPL header to files 2016-03-11 18:20:51 -06:00
IFeel.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
IFeel.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Input.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Input.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
KeyNames.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ListIterator.inl First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Lists.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Lists.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Lists.inl Uploading full engine sources 2016-03-11 15:57:17 +02:00
Memory.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Memory.h Add GPL header to files 2016-03-11 18:20:51 -06:00
NullSynchronization.cpp First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
parser.h Regenerated parsers and scanners. 2016-04-01 15:17:48 -04:00
Parser.y Fixed function signature for yyerror to take a const char *. 2016-04-01 12:19:18 -04:00
ParsingSymbols.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Priority.inl First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Profiling.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Profiling.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ProfilingEnabled.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ProgressHook.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ProgressHook.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Protection.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Protection.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Registry.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Registry.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Relations.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Relations.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ReplaceFile.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ReplaceFile.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Scanner.l First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Serial.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Serial.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Shell_internal.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Shell.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Shell.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ShellTypes.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
StackDump.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Statistics_Internal.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Statistics.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Statistics.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Stream.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Stream.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Synchronization.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
ThreadLocalStorage.h First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Timer.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Timer.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Timer.inl First attempt to hand-merge Ryan's Linux and Mac OS X port. 2016-03-28 23:46:13 -04:00
Translation.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Translation.h Add GPL header to files 2016-03-11 18:20:51 -06:00
TranslationPair.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Types.h Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Unzip.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Unzip.h Add GPL header to files 2016-03-11 18:20:51 -06:00
Updateable.cpp Merge github.com:Croteam-Official/Serious-Engine 2016-04-02 23:56:12 -04:00
Updateable.h Add GPL header to files 2016-03-11 18:20:51 -06:00
UpdateableRT.h Add GPL header to files 2016-03-11 18:20:51 -06:00