c1b29c1f5e
Portable Warzone fixes for windows.
...
Fix windows paths.
Windows portable icon by forum member Duda.
Portable header & welcome images from forum member Aubergine.
Image fixes supplied by Berg.
Note: In configure stage (Windows only!), you can specify --enable-portable [default no] to
create a portable installer. (That is, everything is self-contained in the directory
you install Warzone 2100 to. It will *not* use any other directory on the system.)
If you pass --with-videos [default no], then it will add the videos with the portable
installer and looks for the video file in \opt\sequences.wz
FIXME: Need: RUSSIAN, GERMAN, DUTCH, tranlations fixes for the warzone2100.nsi file.
2013-08-10 19:20:18 -04:00
8748895bc5
identity: Add libcrypto to configure.ac/Makefile.am.
...
Apparently needs to be explicitly linked, for the buildbot.
2013-06-05 09:26:15 +02:00
545832358b
Convert functions.txt to handle upgrades from within javascript and research.ini.
...
hackChangeMe() can no longer take -1, instead add new receiveAllEvents(bool) function
for that purpose. Campaign upgrades are not yet converted. All 'Power' settings in
ini files are changed, since they used meaningless values, to 'PowerLevel' with 0..2
values that correspond to button settings.
2013-05-05 13:34:59 +02:00
64c2fde0dd
Merge branches 'bugfixes' and 'widget'
...
Conflicts:
src/ingameop.cpp
src/intelmap.cpp
2013-03-15 08:50:10 +01:00
70e849c9a4
widget: Convert power level choice to a MultichoiceWidget.
2013-03-14 11:08:41 +01:00
20317c2a6f
Out of tree builds ? Who needs them. :P
...
refs: 372eff6693
2013-02-17 20:50:09 -05:00
372eff6693
Simplify build process by getting rid of bison/flex dependencies.
...
Fixes both MSVC and autotools (automake 1.12+).
Revert "Abort autogen.sh when automake 1.12+ is found."
This reverts commit 978ed8f1f9
2013-02-17 20:15:15 -05:00
eb21e8e847
qtscript: Add debug window showing globals, triggers and labels.
2013-02-02 15:53:03 +01:00
1193559f53
Merge branch 'bugfixes'
...
* bugfixes:
Make configure fail if it doesn't find flex.
Update the default layout for CS-ID.xcconfig.
Emit warnings on improperly / unsigned frameworks.
Do not rely on the default Designated Requirements.
stats: Prevent double-counting of wins/losses.
stats: Use actual number of games played when drawing medals.
stats: Actually save stats, so players aren't stuck with the pacifier forever.
Prevent updating autorevision.h's timestamp when its contents haven't changed
Prevent out-of-bounds array access
map2preview: handle unknown tilesets
Conflicts:
src/multiint.cpp
2013-01-07 15:27:58 +01:00
3042d5872a
Prevent updating autorevision.h's timestamp when its contents haven't changed
...
Signed-off-by: Giel van Schijndel <me@mortis.eu>
2013-01-04 10:30:10 +01:00
1214196633
Remove the E3 demo code.
2012-11-16 14:16:59 +01:00
182e884552
Rename autorevision.tmp to src/autorevision.cache.
...
Also remove another stray backslash, now make distcheck should work
again.
2012-10-30 17:35:58 +01:00
e8c7ff603a
Fix the last two commits.
2012-10-28 17:09:33 +01:00
83c7199392
Use the latest version of autorevision.
...
From https://github.com/Autorevision/autorevision
2012-10-28 11:17:35 -04:00
addcb20ff0
Explain how the cursor system works a bit better, and make it easier to edit these blasted things.
...
Created a external file called cursorselection, that can be loaded into a spreadsheet for easy editing.
2012-02-28 22:39:41 -05:00
19be9fc3b7
Don't remove autorevision.h on make clean, take 2.
...
Seems 13fba992e7
2012-02-28 14:56:36 +01:00
13fba992e7
Don't remove autorevision.h on make clean.
...
Otherwise building from a tarball fails after make (dist)clean.
2012-02-26 04:15:11 +01:00
411e4acda3
Fix libvorbis linking.
...
Possibly fixes #2962 .
2012-02-07 18:42:34 +01:00
26cfcb8d0d
Remove redundant dependency for version.o.
...
Prevents autorevision.h from being built twice.
2012-02-01 03:44:12 +01:00
2f84b60214
Remove --self-test command line option, as it was not maintained properly over a very long time.
2012-01-21 17:02:08 +01:00
ac550acd58
Revert the new bsonlobby.
...
Closes #3040 .
Revert "Remove bson from project files."
This reverts commit 5c24f7b7166dd85baedf7d349eb214f76e960f7d4c387a199b793c30a8625fa33b7209
2012-01-08 23:10:26 +01:00
9cb0afa9b8
Integrate QuesoGLC.
...
Since no fixed release is out at the moment, always use ours.
Closes #2828 .
2012-01-08 22:53:42 +01:00
545eb5c272
Convert research message data to ini file format.
2012-01-07 19:14:34 +01:00
cde2208ca5
Move template-related code to separate file.
2011-12-18 00:23:51 +01:00
cc662f9ac9
Most SDL functions reimplemented.
2011-12-13 17:26:01 +01:00
063fc63629
Initial build system for qt/sdl-backend switcher
2011-12-11 15:30:54 +01:00
3be85b0aa6
Make the src/autorevision.h target phony.
...
Else "make dist" from a clean source tree fails.
Refs #2936 .
2011-11-08 14:01:23 +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
cd6bb3d66e
Workaround for linking with ld.bfd.
...
Ubuntu (and possibly others) still have the old ld.bfd as default
instead of ld.gold, and that fails to recognize the -lz option when it
comes too early. So just add it to the end again.
2011-10-16 05:14:58 +02:00
616c6c4086
Replace BSON with QJson.
2011-07-11 02:33:33 +02:00
44235d4cb3
Moves the bson code to 3rdparty.
2011-07-04 22:56:35 +02:00
f4017eda50
Merge remote-tracking branch 'upstream/master' into bsonlobby
...
Conflicts:
configure.ac
lib/netplay/Makefile.am
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
2011-07-03 01:04:50 +02:00
10a78a4a7e
Merge in qtgame project and make use of its trap cursor support.
2011-07-02 00:25:14 +02:00
29bbd8fb3a
Move lib/netplay/miniupnpc to 3rdparty/miniupnc on autotools and ...
...
hopefully MSVC.
2011-05-22 04:10:04 +02:00
54fca60476
Embeds BSON from https://github.com/mongodb/mongo-c-driver - daba871.
2011-05-01 05:10:07 +02:00
1fe2cc8f4d
Use GLEW instead of GLee. Based on patch by cybersphinx.
2011-04-02 10:08:26 +02:00
d5b95fe0cc
Remove iniparser remains from src/Makefile.am.
2011-04-02 03:32:48 +02:00
0ee8b860f8
Merge remote branch 'origin/qt' into qtscript
2011-03-30 18:05:40 +02: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
109685fb90
Fix autorevision call in out-of-tree builds.
...
Adapted from a patch by Quix0r, closes #2536 .
2011-03-17 18:41:10 +01:00
133b1fcbcd
Fix autorevision.h make dependencies.
2011-03-13 20:29:04 -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
cce4f76dfc
Proper dependencies for rebuilding of version.o.
2011-03-09 23:29:41 +01:00
c024ef4df2
Beautify.
2011-03-09 23:29:41 +01:00
e50b650c6c
Just run autorevision unconditionally.
2011-03-09 23:29:41 +01:00
adc6999799
Make autorevision.h generation more robust (though uglier).
2011-03-09 02:06:34 +01:00
34d9c07b63
Make sure autorevision.h is up to date.
...
Use a temporary file so the timestamp isn't updated when the file hasn't changed.
2011-03-09 00:39:14 +01:00
0af9d47a34
Call autorevision.sh instead of compiling and running the C++ autorevision.
2011-03-07 01:18:18 +01:00
c1f1c3e31d
Initial test of qtscript
2011-01-23 22:30:57 +01: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
vexed
Cyp
per
cybersphinx
Giel van Schijndel
dak180
safety0ff
Per Inge Mathisen
Rene Jochum