ceb339939e
Avoid doing extra game state updates if the game state updates are somehow slower than graphical updates.
2011-12-18 16:53:58 +01:00
a5ad6ef0e9
Simplify game time logic.
2011-12-18 15:17:05 +01:00
7e3c8e4f4e
Remove DROID::sMove.ebit[XY], use gameTimeAdjustedAverage instead.
2011-12-17 18:21:52 +01:00
700bb7a56e
Merge branch 'master' into qt-sdl
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
2011-12-17 16:02:26 +01:00
675ddce69e
Rename the generic wzapp_c.h to wzapp.h.
...
The _c was a leftover from the good old days, when this was written in C and everyone used RFC 1149.
2011-12-12 00:07:02 +01:00
e50368114d
Allow multiple logical updates per rendered frame.
...
Allows maintaining game speed when the GPU can't keep up.
2011-12-11 16:10:05 +01:00
063fc63629
Initial build system for qt/sdl-backend switcher
2011-12-11 15:30:54 +01:00
e5d7318b0c
Speed boosts (for the mac build times).
...
Also PBXBuildRules simplification.
2011-12-04 14:23:43 -05:00
41515b089b
More fixes to the MSVC build system
2011-11-08 21:41:58 -05:00
de28a736ef
Updates for the red headed stepsister.
...
Refs #2936 .
2011-11-08 14:01:40 +01:00
8581c9a29f
Use automake's builtin lex/yacc handling.
...
Original patch by cazfi
(http://forums.wz2100.net/viewtopic.php?p=88749#p88749 ).
Refs #2936 .
2011-11-08 14:01:06 +01:00
b780ec8d25
power: Spend all power at start of construction, instead of during.
2011-11-07 21:10:37 +01:00
2dbd06e9b1
Get rid of the unmaintained makefile.win32s.
...
Closes #2900 .
2011-09-25 19:58:13 +02:00
f31e223626
Fix all builds, they should now all compile assuming everything is set up correctly.
...
You have both Debug & Release builds, using MS's STL, and the you have Debug & Release builds using STLport.
The STLport version is prefered.
2011-09-03 00:21:40 -04:00
9ecba718a4
Revert "Remove a direct src include from lib/gamelib."
...
This reverts commit e32c1f0e89
2011-07-20 21:42:22 +02:00
e32c1f0e89
Remove a direct src include from lib/gamelib.
2011-07-20 12:06:13 +02:00
f76e960f7d
Fix various build issues for both 'qtgame' and the bson /new lobby stuff
...
for MSVC.
Nothing here should break other platforms.
2011-07-08 21:51:16 -04:00
be2c105b7a
Update build for Release builds & using STLport.
...
Update release builds to SSE2 + STLport.
2011-06-25 19:48:46 -04:00
690b2ccfde
Fix MSVC project files that were broken after the miniupnc move.
2011-05-27 20:44:58 -04:00
4c68d121d6
Don't uselessly include static libraries in other static libraries.
...
Saves ~40 MB of diskspace when building.
2011-04-25 21:33:53 +02:00
1f5d94a564
Fix VS2k10 for Qt.
...
NOTE: All Qt headers *MUST* be before of the other headers, or else we get tons of conflicts
***
DO NOT CHANGE HEADER ORDER, unless you know what you are doing, it will fubar
other build systems!
****
close ticket:2570
2011-03-24 20:06:59 -04:00
23f318fe39
Merge branch 'master' into qt
...
Conflicts:
lib/exceptionhandler/exceptionhandler.vcproj
lib/framework/frame.h
lib/framework/framework.vcproj
lib/framework/input.h
lib/gamelib/gamelib.vcproj
lib/iniparser/iniparser.vcproj
lib/ivis_opengl/ivis_opengl.vcproj
lib/netplay/netplay.vcproj
lib/script/script.vcproj
lib/sequence/sequence.vcproj
lib/sound/sound.vcproj
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
src/Makefile.am
win32/Warzone2100.vcproj
2011-03-22 00:01:28 +01:00
31502ccdce
Let us try this again, leave the never-interactive option for the lexers.
...
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in 2f780609c046bb88e5
2011-03-17 21:35:07 -04:00
5cfd2e9dbe
Initial VS2k10 changes.
...
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
2011-03-17 21:35:00 -04:00
e689ad51d5
Merge remote branch 'origin/master' into qt
...
Conflicts:
configure.ac
lib/exceptionhandler/exceptionhandler.h
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.cpp
lib/framework/input.h
lib/ivis_opengl/pieclip.h
lib/ivis_opengl/screen.cpp
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/console.cpp
src/console.h
src/frontend.cpp
win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
2011-03-13 22:31:19 +01:00
a72c41aeec
fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
...
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
2011-03-13 12:32:24 +01:00
a7730ccd15
Change "typedef struct {...} Blah;" into "struct Blah {...};".
...
Removed a few structs due to disuse.
2011-02-25 21:30:13 +01:00
4a1b5fb543
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:50:54 +01:00
ae2ce18314
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
dc2385368c
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.cpp
lib/framework/frame.h
2011-02-05 18:44:00 +01:00
87c9f38dc3
Revert "Add guard to YY_NO_UNISTD_H definition."
...
This reverts commit f1ebbe6ebac046bb88e5
2011-01-30 01:40:53 -05:00
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
64f1b6b895
Fix memory leaks reported by cppcheck
2011-01-18 00:36:49 +01:00
c046bb88e5
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
...
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in 2f780609
2011-01-15 13:39:51 -05:00
28f9830a63
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.h
lib/ivis_common/Makefile.am
lib/ivis_common/piestate.cpp
lib/ivis_common/pietypes.h
lib/ivis_opengl/imd.h
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/piestate.h
lib/ivis_opengl/pietypes.h
lib/sound/audio.h
lib/sound/sound.vcproj
lib/sound/track.h
lib/widget/editbox.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
2011-01-14 19:26:55 +01:00
e46b08f8e1
Fix not sending player info for players 8+.
2011-01-13 16:40:34 +01:00
d2499aa9cc
Die, ivis_common, die\!
2011-01-01 14:51:53 +01:00
67e9635f9f
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
2010-12-31 22:37:14 +01:00
e8d5913372
Apply patch — kill some more warnings, and fix a few issues that Buginator found.
2010-12-25 00:38:06 +01:00
23d5dcd5dd
Remove extern "C" {} from most places, due to longer being needed.
2010-12-21 17:20:48 +01:00
91ee0f7655
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.h
lib/framework/types.h
lib/widget/editbox.cpp
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-Debug.xcconfig
2010-12-21 03:59:22 +01:00
c95692c05b
Update *.vcproj files from ticket:2421.
...
And removed extern "C" {} from some headers, apparently Windows can't handle extern "C" consistently.
2010-12-20 04:25:01 +01:00
36484909d6
Try to fix Windows exception handler and makefiles.
2010-12-20 01:07:12 +01:00
bd6b96315b
Merge branch 'cpp' into qtcpp
...
Conflicts:
lib/framework/Makefile.am
lib/framework/frame.cpp
lib/framework/framework.vcproj
lib/framework/input.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/textdraw.cpp
lib/widget/Makefile.am
lib/widget/editbox.cpp
lib/widget/scrap.cpp
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/main.cpp
src/makefile.win32
2010-12-19 16:51:27 +01:00
80cc971b61
Merge remote branch 'origin/master' into qt
...
Fixed gameTime → realTime in lib/framework/wzapp.cpp, since the menus were messed up due to interpreting everything as a double-click.
Conflicts:
lib/framework/debug.c
lib/framework/input.c (became wzapp.cpp)
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/ivis_opengl/textdraw.c
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/display.c
src/main.cpp
src/terrain.c
2010-12-17 00:36:10 +01:00
12e8e5bc80
Rename *.lex.c to *.lex.cpp and *.tab.c to *.tab.cpp.
2010-12-16 23:28:56 +01:00
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
a2cd7b0592
Make everything compile successfully with g++, without -fpermissive.
2010-12-16 23:24:40 +01:00
2bcb709cf4
Move broken dependency hack out of most Makefile.am's, except the for the root.
2010-12-16 23:14:38 +01:00
bf38eb51ea
Add branch switching hack to remaining Makefile.am files.
2010-12-06 00:19:30 +01:00
Cyp
Per Inge Mathisen
Per Inge Mathisen
dak180
vexed
cybersphinx
Rene Jochum
Buginator
abomination
safety0ff