q3aql/Serious-Engine
q3aql/Serious-Engine
1
0
Fork 0
mirror of https://github.com/ptitSeb/Serious-Engine synced 2024-12-27 07:54:51 +01:00
Code Issues Packages Projects Releases Wiki Activity
348 Commits 2 Branches 0 Tags 94 MiB
189edcb75f
Commit Graph

348 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
SLAwww
8aa4b9658a Fix typo 2016-04-05 14:34:00 +03:00
Ryan C. Gordon
7bbd5df8c0 Fixed a string-literal-to-char* conversion warning. 2016-04-04 22:42:06 -04:00
Ryan C. Gordon
c752e7cace Fixed a mismerge. 
(But I still need to figure out what I'm doing between SetAbsolutePath() and
whatever I had before...)
 2016-04-04 22:40:30 -04:00
Steven Chamberlain
3adda272b7 Fix pointer truncation on 64-bit 
Use size_t instead of int for arithmetic on pointers, to avoid

truncation on ILP64 architectures (like amd64).
 2016-04-04 22:09:51 -04:00
Steven Chamberlain
26f1a33749 Building on GNU/kFreeBSD and possibly Hurd 
* Only use ENOSR and ENOPKG if defined

ENOSR and ENOPKG are part of the POSIX optional STREAMS extension, and
are not available on most other platforms than GNU/Linux.

* Support building on other GNU platforms than Linux

Build for other GNU platforms the same way as Linux:  this includes
CMAKE_SYSTEM_NAME "GNU" (GNU/Hurd) and "GNU/kFreeBSD" (GNU/kFreeBSD).
 2016-04-04 20:34:34 -04:00
Ryan C. Gordon
5ba4bccabd Backed out the splitting up of SeriousSam/Menu.cpp 2016-04-04 16:09:41 -04:00
Ryan C. Gordon
f35e86661e Moved Ogg Vorbis files to the "External" directory, plugged into CMake project. 2016-04-04 02:43:12 -04:00
Ryan C. Gordon
6436618937 Merge github.com:Croteam-Official/Serious-Engine 
Conflicts:
	Sources/Engine/Sound/SoundDecoder.cpp
 2016-04-04 02:41:23 -04:00
Ryan C. Gordon
a7e4f8237e Patched to compile on Linux, and cleaned out almost all compiler warnings. 2016-04-04 02:34:07 -04:00
SLAwww
6fb03b21be OGG playback no longer unsupported 2016-04-04 04:12:19 +03:00
SLAwww
1e6eafd777 Merge pull request #33 from rcgordon/ecc-empty-files-simplify 
Simplify dealing with empty files in ECC
 2016-04-04 00:43:41 +03:00
SLAwww
5b4c0abacf Merge branch 'zcaliptium-vorbis-replace' 2016-04-04 00:42:21 +03:00
zcaliptium
f697fcc2f5 Engine: Return dynamic vorbisfile library loading. 2016-04-03 23:45:57 +03:00
zcaliptium
6e35f6bd11 Initial commit 2016-04-03 18:59:48 +03:00
Ryan C. Gordon
706814653d Simplify dealing with empty files. 
Why write a parser when you already have a perfectly good one already?  :)
 2016-04-03 02:07:52 -04:00
Ryan C. Gordon
f9bfaf7435 Initial add of build-linux.sh 2016-04-03 01:23:42 -04:00
Ryan C. Gordon
986140db64 Build on Mac OS X with reported number of CPU cores. 2016-04-03 00:00:04 -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
Tan Wang Leng
33a3bda3e3 Fix missing endif() 2016-04-02 22:55:53 -04:00
Salamanderrake
cdcf6afc34 Sources/CMakeLists.txt: Added missing find_packge(SDL REQUIRED) to link in the SDL1.2 libraries via ${SDL_LIBRARY} generate variable 
and added to the target_link_libraries for SeriousSam and SeriousSamDedicated. I don't know not linking the SDL library was

	the intended outcome but SeriousSam* was failing to link to libSeriousEngine.a.
 2016-04-02 22:33:11 -04:00
Ryan C. Gordon
a96fe8de8b Patched to compile on Linux. 
(The EntitiesMP and/or GameMP libraries need symbols exported from the main
binary, but when we built the engine as a static library to reuse it between
the client and server, the Linux linker stripped out symbols those libraries
needed. If we can force these symbols to remain, or maybe move to shared
library..? then we can avoid building the engine sources twice to get the
dedicated server too. For now, though...good enough!)
 2016-04-02 21:55:48 -04:00
Ryan C. Gordon
74a7321a7f Don't do the Mac policy for now, it upsets pre-3.0 CMake. 
I don't want to bump requirements to CMake 3 yet.
 2016-04-02 21:54:38 -04:00
Ryan C. Gordon
9c5fa5f0fc Fixed some things GCC complained about on this Linux box. 2016-04-02 02:03:41 -04:00
Salamanderrake
2be26952c7 Case Issue with #include statement. 
* Gfx_wrapper.cpp: two #include statemenst with incorrect case.

* Fixed an empty line issue
 2016-04-02 01:12:25 -04:00
Salamanderrake
4ce00bca08 Statistics_internal.h: Incorrect case as its Statistics_Internal.h on disk. 2016-04-02 01:11:53 -04:00
Salamanderrake
7778fdcaae Add missing ; to Sources/Ecc/Parser.y 2016-04-01 23:38:29 -04:00
Ryan C. Gordon
49b5163cc9 Regenerated parsers and scanners. 2016-04-01 15:17:48 -04:00
Ryan C. Gordon
d02a7a41c4 Added CMake and a simple Mac build script, and nuked the awful old Makefile. 2016-04-01 15:17:23 -04:00
Ryan C. Gordon
0d426d5998 Fixed up some StdH includes. 2016-04-01 14:04:24 -04:00
Ryan C. Gordon
3e59daa5e6 Fixed function signature for yyerror to take a const char *. 2016-04-01 12:19:18 -04:00
SLAwww
e07e08d1e5 Merge branch 'zcaliptium-working-resolve' 2016-04-01 14:45:54 +03:00
Ryan C. Gordon
5aea1f7c4d Untangle the symbols in the engine's parser and the Ska parser. 2016-04-01 01:49:13 -04:00
Ryan C. Gordon
b29b27a868 Turn this back off. 2016-04-01 01:49:13 -04:00
Ryan C. Gordon
0f6b9ca1c1 We actually get NULL here, so these stay for now, Clang warnings be damned. 2016-03-31 21:54:25 -04:00
Ryan C. Gordon
88c41117f5 Fill in some stuff that is needed to compile. 
I had better versions of this stuff, which I still need to re-merge.
 2016-03-31 21:53:54 -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
SLAwww
664b20bad2 Merge pull request #30 from RocketersAlex/fixstuff 
Update MSLegacy.h Network.cpp GameAgent.cpp
 2016-03-31 23:47:26 +03:00
zcaliptium
4cb76b506f GameExecutable: Replace 4-spaced tabs with 2-spaced. 2016-03-31 23:27:11 +03:00
Ryan C. Gordon
f1e8add4ca "-mdynamic-no-pic" was largely a Mac OS X/powerpc optimization. Remove it. 2016-03-31 16:01:23 -04:00
zcaliptium
80471f5041 GameExecutable: Fix } else { formatting. 
Make code more readable.
 2016-03-31 22:57:40 +03:00
Ryan C. Gordon
887bc474e0 Deal with other things that are optimizing out instead of linking properly. 2016-03-31 15:48:48 -04:00
Ryan C. Gordon
7c9d29ad1a Naturally, there are two files with inline asm with an "mmShift" symbol. :) 2016-03-31 15:48:48 -04: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
ee754e7edf Made static variables that inline asm needs to touch non-static. 
I dislike having to do this, but Clang sees them as unused and removes them
from the object file, causing linking to fail.

The real solution here is to remove all the assembly code because it's 2016
and this game doesn't have to run on 133MHz Pentium now.  :)
 2016-03-31 13:04:57 -04:00
Ryan C. Gordon
ed527eb29e A little tapdancing to fix a missing symbol at link time. 2016-03-31 12:40:11 -04:00