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
SLAwww
d8424a3042
Merge branch 'RocketersAlex-fixstuff'
2016-03-31 01:54:24 +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
282ae65d9f
Update .gitignore
2016-03-25 17:28:31 +02:00
SLAwww
9373dd28a1
Merge branch 'zcaliptium-FixReallyStupidTypos'
2016-03-25 16:18:13 +02: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
zcaliptium
c0a1b7bdf7
.gitignore
2016-03-18 12:56:52 +03:00
SLAwww
2b742dbdbe
Update README.md
2016-03-18 03:20:10 +02: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
SLAwww
83bb896e89
Update README.md
2016-03-17 02:37:43 +02: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
