Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,232 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

317 Commits (dc1c7ca57db1cb02446e77edde7eaf0a26c19fb7)

Author SHA1 Message Date
vexed 5694a6fded Remove broken old-1.10 mod Update NSIS for the removal 2012-02-19 16:48:33 -05:00
cybersphinx dfaadbc5d2 qtscript: Add an html target using hevea for the docs. 2012-02-10 22:39:38 +01:00
cybersphinx 411e4acda3 Fix libvorbis linking. 
Possibly fixes #2962.
 2012-02-07 18:42:34 +01:00
vexed ac550acd58 Revert the new bsonlobby. 
Closes #3040.

Revert "Remove bson from project files."

This reverts commit 5c24f7b716.

Conflicts:

	lib/netplay/netlobby.h
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj

Revert "Merge branch 'refs/heads/topic/QJson'"

This reverts commit 6dd85baedf, reversing
changes made to 7d349eb214.

Conflicts:

	Makefile.am
	lib/netplay/netlobby.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Makefile.am
Revert "Fix various build issues for both 'qtgame' and the bson /new lobby stuff"

This reverts commit f76e960f7d.

Conflicts:

	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/gamelib/gtime.cpp
	lib/netplay/netplay.vcxproj
	lib/netplay/netplay.vcxproj.filters
	src/Warzone2100.vcxproj
	win32/Warzone2100.sln

Revert "Fix SSL errors on the Macs."

This reverts commit 4c387a199b.

Revert "Merge branch 'bsonlobby' into master"

This reverts commit 793c30a862, reversing
changes made to 5fa33b7209.

Conflicts:

	data/makefile.win32
	lib/netplay/netlobby.cpp
	lib/netplay/netlobby.h
	lib/netplay/netplay.cpp
	lib/widget/label.cpp
	macosx/Warzone.xcodeproj/project.pbxproj
	po/POTFILES.in
	src/configuration.cpp
	src/frontend.h
	src/multiint.cpp
 2012-01-08 23:10:26 +01:00
safety0ff 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
cybersphinx 0b361bd393 Remove BACKEND_QT/SDL defines from config.h. 2011-12-30 23:25:15 +01:00
cybersphinx af98153dc0 Default to SDL backend. 2011-12-30 14:05:28 +01:00
cybersphinx 93493f9b1d Always create both lib/qtgame and lib/sdl makefiles. 
Fixes make distcheck.
 2011-12-17 23:18:55 +01:00
Per Inge Mathisen 0ee5bb3547 sdl backend now compiles and links, but doesn't yet run (missing mainloop) 2011-12-13 18:44:21 +01:00
Per Inge Mathisen 8f047f71fd Fix qt-backend compilation. Add forgotten file. 2011-12-13 18:21:57 +01:00
Per Inge Mathisen fa5e6c73d3 sdl backend now actually compiles (but does not yet link). 2011-12-13 15:39:42 +01:00
Per Inge Mathisen 063fc63629 Initial build system for qt/sdl-backend switcher 2011-12-11 15:30:54 +01:00
Per Inge Mathisen 2ce5cc6777 Check for physfs 2 2011-11-09 18:46:26 +01:00
cybersphinx 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
cybersphinx 8ec7e2cab4 Add note about a2x being from asciidoc. 2011-09-05 22:05:23 +02:00
Per Inge Mathisen 23b4d3e8a1 Add map/tools to ordinary build system. 2011-07-28 01:32:09 +02:00
vexed ebc8976dc1 Bring back quesoGLC to Warzone. 
This renders the text much faster than what Qt offers, and also fixes issues with Vsync being ON, on windows.

patch fixes by Safety0ff

closes ticket:2824

This patch basically reverts:
828c0f72ae
Revert 9e29aa5210 which reverted the removal of QuesoGLC, to start
    working on fixing the font rendering with Qt.

NOTE: On some systems, there is a assertion failure with FcFini().
We could fix the issue by doing a embed of quesoGLC in our repo, or hope the fontconfig
guys fix the issue upstream.
See ticket:2824 for more discussion on this issue.
 2011-07-17 13:15:15 -04:00
Rene Jochum 616c6c4086 Replace BSON with QJson. 2011-07-11 02:33:33 +02:00
safety0ff 600952d5d1 Suppress windows console. 2011-07-09 01:35:57 +00:00
Rene Jochum 793c30a862 Merge branch 'bsonlobby' into master 
Conflicts:
	macosx/Warzone.xcodeproj/project.pbxproj
 2011-07-08 18:01:52 +02:00
cybersphinx 27cabaedfd Check for Xrandr header. 2011-07-05 21:23:44 +02:00
cybersphinx ed753ff8c4 Fix Windows cross-build. 2011-07-05 02:43:43 +02:00
Rene Jochum 44235d4cb3 Moves the bson code to 3rdparty. 2011-07-04 22:56:35 +02:00
Rene Jochum 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
Per Inge Mathisen 10a78a4a7e Merge in qtgame project and make use of its trap cursor support. 2011-07-02 00:25:14 +02:00
cybersphinx 61a31770c1 Make sure configure fails when no compiler is found. 
Closes #2756.
 2011-05-28 03:03:48 +02:00
Rene Jochum 9930be667e Fix cross compile after the miniupnc move. 2011-05-22 04:32:13 +02:00
Rene Jochum 29bbd8fb3a Move lib/netplay/miniupnpc to 3rdparty/miniupnc on autotools and ... 
hopefully MSVC.
 2011-05-22 04:10:04 +02:00
cybersphinx e18bb5a884 Make docs generation properly depend on a2x and wkhtmltopdf availability. 2011-05-14 18:29:15 +02:00
cybersphinx 2de0d56ee8 Add quickstartguide to the build system. 
"make dist" now works and includes the built html and pdf versions.
 2011-05-14 18:10:06 +02:00
Rene Jochum f821332f97 Adds the configure option "--disable-ssl", fixes related errors. 2011-05-02 21:38:10 +02:00
Rene Jochum 54fca60476 Embeds BSON from https://github.com/mongodb/mongo-c-driver - daba871. 2011-05-01 05:10:07 +02:00
Buginator 4680765ea9 Add lib iphlpapi for miniupnp 
Fix define to STATICBUILD
 2011-04-25 19:47:54 -04:00
Cyp 6adf3a7f70 Use -fno-strict-aliasing instead of -Wno-strict-aliasing for miniupnpc. 
Fixes ticket:2666.
 2011-04-25 11:46:19 +02:00
Cyp f410eee215 Add '-Wno-strict-aliasing' when compiling C files such as miniupnpc.c. 2011-04-25 11:29:56 +02:00
Per Inge Mathisen 71ad7a8742 Various cross-compile and win32 stuff needed for glew. From patches by Safety0ff and cybersphinx. Untested. 2011-04-02 10:19:08 +02:00
Per Inge Mathisen 1fe2cc8f4d Use GLEW instead of GLee. Based on patch by cybersphinx. 2011-04-02 10:08:26 +02:00
Per Inge Mathisen d78a8eb8ad Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load. 2011-04-01 20:31:15 +02:00
Per Inge Mathisen 0ee8b860f8 Merge remote branch 'origin/qt' into qtscript 2011-03-30 18:05:40 +02:00
Cyp 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
cybersphinx 0af9d47a34 Call autorevision.sh instead of compiling and running the C++ autorevision. 2011-03-07 01:18:18 +01:00
safety0ff 509fe7bb83 Use WIN32_LIBS instead of IBERTY_LIBS when configuring libbfd. 
Fixes statically linking libbfd. Closes #2514.
 2011-03-04 12:43:00 -05:00
Cyp 92db46314f Remove -Wc++-compat, since everything that will be C++ is now already C++. 2011-03-03 17:51:22 +01:00
safety0ff bfe900b78e Use QuesoGLC's pkg-config file for build configuration. 
Closes #2458.
 2011-02-26 14:38:04 -05:00
Per Inge Mathisen c1f1c3e31d Initial test of qtscript 2011-01-23 22:30:57 +01:00
Cyp d39112244b Merge remote branch 'origin/master' into qt 
Conflicts:
	lib/framework/frame.h
	src/main.cpp
 2011-01-22 23:05:36 +01:00
cybersphinx e8a065f6a0 Use empty CXXFLAGS by default, not whatever autoconf thinks we should use. 2011-01-18 19:53:37 +01:00
cybersphinx 53ae8b198c Revert "Force -O0 to the end of the flag list to override autohell's default -O2" 
This reverts commit e65751e43b.
 2011-01-18 19:53:37 +01:00
Per Inge Mathisen e65751e43b Force -O0 to the end of the flag list to override autohell's default -O2 2011-01-18 17:59:55 +01:00
Cyp 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