Commit Graph

327 Commits

Author SHA1 Message Date
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
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
dceb552265 Update .gitignore AGAAAAAAIN! 2016-03-14 02:57:22 +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
44b3236906 Merge pull request #19 from megaserg/patch-1
Make Github recognize *.es files as C++
2016-03-13 18:59:23 +02: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
Sergey Serebryakov
c0d372051b Make Github recognize *.es files as C++
Adding an override as described on https://github.com/github/linguist
2016-03-13 04:41:47 -07: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
db1ad823ce Added another Visual Studio file to gitignore 2016-03-13 01:57:46 +02:00
SLAwww
11db0d533a Added more generated files to gitignore 2016-03-13 01:55:29 +02:00
SLAwww
fe24f3a2a4 Updated .gitignore and removed automatically generated files 2016-03-13 01:52:16 +02:00
SLAwww
0a3be0bca5 Merge pull request #16 from Ragora/EccFixBase
Remove close/reopen logic for file handle and fix Ecc crash on empty
2016-03-13 01:00:29 +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