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
425 Commits 2 Branches 0 Tags 94 MiB
d1081324a2
Commit Graph

334 Commits

Author SHA1 Message Date
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
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
Ryan C. Gordon
2668cdc44f Fix up some mismerges and get the OpenGL code to compile again. 2016-03-31 12:26:43 -04:00
Ryan C. Gordon
c2be372822 Some work to get Stream.cpp compiling. 2016-03-31 12:25:53 -04:00
Ryan C. Gordon
fbfef87ce0 Fixed a mismerge. 2016-03-31 12:25:40 -04:00
Ryan C. Gordon
75b824ddf8 Removed the exception handling code from CTStream. 
I think this is a leftover from the mmap()-like code that used to be
in the engine, but now it's a lot of complexity to basically test this:

- Was this a memory access violation?
- If no, crash.
- If yes:
  - Was it part of a CTStream?
  - If no, crash.
  - If yes, crash.

Instead, let's just crash.   :)

(If I'm misunderstanding this, just roll back from revision control.)
 2016-03-31 12:22:55 -04:00
zcaliptium
ca5873a2af GameExecutable: Some cleanup and reorder. 
Clean clean clean!
 2016-03-31 19:21:46 +03:00
RocketersAlex
c5f5d72e3f Update MSLegacy.h Network.cpp GameAgent.cpp 2016-03-31 05:43:38 +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
Ryan C. Gordon
105bc12d64 Bunch more work on getting this to compile. Down to Stream and Gfx_OpenGL now. 2016-03-30 13:41:30 -04:00
zcaliptium
36c6eb19c0 Continue splitting Menu.cpp into multiple files. 2016-03-30 19:23:12 +03:00
Ryan C. Gordon
7d118bd249 First attempt at porting GameAgent code. 2016-03-30 11:00:29 -04:00
Ryan C. Gordon
8ea00b12d2 More work on getting this to compile. 2016-03-30 11:00:01 -04:00
Ryan C. Gordon
4f061d916c Adding regenerated parsers so they'll stop spamming my diffs. 2016-03-30 10:59:17 -04:00
Ryan C. Gordon
888b35dbca Mismerge fix. 2016-03-30 10:56:56 -04:00
RocketersAlex
0d8f7da318 Fixed SeriousSam and GameAgent bugs 2016-03-30 16:54:30 +03:00
Ryan C. Gordon
146da64d86 Fixed filename case on an include statement. 2016-03-30 04:00:23 -04:00
Ryan C. Gordon
98972f6a43 Build everything with -fPIC until we dump this Makefile for CMake. 2016-03-30 03:58:31 -04:00
Ryan C. Gordon
2e7af8cf00 More mismerge corrections and other fixes to get this closer to compiling. 2016-03-30 02:01:02 -04:00
Ryan C. Gordon
28a8b5cb2e Various patches to get this closer to compiling again. 2016-03-30 01:51:52 -04: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
Ryan C. Gordon
735b1cb66b Fixed mismerge. 2016-03-30 01:29:43 -04:00
Ryan C. Gordon
892fbea6cd Turned off some compiler warnings for now. 
Just need to see through the mess until this compiles again.
 2016-03-30 01:28:12 -04:00
Ryan C. Gordon
43e4866df4 Fixed a mismerge. 2016-03-30 01:27:59 -04:00
Ryan C. Gordon
18b339a2b6 Uncommented to include Terrain.h. Let's see what happens. 2016-03-30 01:25:58 -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
a4000c69a8 Clean out a bunch of compiler warnings. 2016-03-29 12:51:33 -04:00
Ryan C. Gordon
bafa5fca05 Blank .es files confuse ECC, so remove them. 2016-03-28 23:51:18 -04:00
Ryan C. Gordon
e564f155e5 Updated Makefile to (maybe) build this on a modern Mac. 2016-03-28 23:51:18 -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
SLAwww
987e9a6655 Merge branch 'FixReallyStupidTypos' of https://github.com/zcaliptium/Serious-Engine into zcaliptium-FixReallyStupidTypos 2016-03-25 16:14:16 +02:00
SLAwww
503fc3a7ef Updated gitignore 2016-03-25 16:09:30 +02:00
zcaliptium
1c5556dbd9 Fixes II 2016-03-23 20:42:20 +03:00
zcaliptium
ef0b970490 Fixes 2016-03-22 21:03:12 +03:00
SLAwww
3ef31a97aa ECC now works properly with long paths 2016-03-18 03:15:05 +02:00
Aron Visontai
344c836cd9 Fix compilation when build path is long 
Also remove generated file Parser.cpp
 2016-03-16 21:56:08 -07: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
764cc874c9 Remove generated files 2016-03-14 02:55:58 +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
SLAwww
36177ed846 Merge pull request #18 from yamgent/master 
Delete text editor temp file
 2016-03-13 18:58:41 +02:00
SLAwww
6e9fbef44a Fixed error in Bison code 2016-03-13 18:56:18 +02:00
Tan Wang Leng
618c63f50a Delete text editor temp file 
A fellow contributor accidentally push an editor temp file. Diff utility shows no difference between this and the original DlgNumericAlpha.h file.
 2016-03-13 16:31:45 +08:00
SLAwww
b2745c617f Removed more generated files 2016-03-13 02:05:30 +02:00
SLAwww
fe24f3a2a4 Updated .gitignore and removed automatically generated files 2016-03-13 01:52:16 +02:00
Robert MacGregor
1a50ba665a Check for NULL return from malloc in es vertification code and print error if es verification fails 2016-03-12 17:36:50 -05:00
Robert MacGregor
9766df5f5b Forgot to close dangling file handles 2016-03-12 17:31:51 -05:00
Robert MacGregor
d69cb55c21 Add explicit 0-length check out of paranoia 2016-03-12 17:27:34 -05:00
Robert MacGregor
609d71437f Remove close/reopen logic for file handle and fix Ecc crash on empty 2016-03-12 17:20:41 -05:00
Robert MacGregor
9f50d3ef84 Performance fix Ecc 2016-03-12 16:45:43 -05:00
Robert MacGregor
cfefaf581a Fix for Ecc failing on empty files 2016-03-12 15:41:56 -05: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
zcaliptium
3b5fdcd03d Fix mistake in the Console Window 
No description
 2016-03-12 12:45:47 +03:00
Matt Lee
a4af93fa31 Add GPL header to files 2016-03-11 18:20:51 -06:00
zcaliptium
742d11a813 WorldEditor: FIX Remove wrong and useless conversion 
Because this is issue!
 2016-03-12 02:26:30 +03: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
a7af6eb20b Removing generated files 2016-03-11 16:47:14 +02:00
SLAwww
9d8b787be2 Uploading full engine sources 2016-03-11 15:57:17 +02:00