199a6d3c27
Move GLEW out of the project, and put it into the dev-package instead.
2011-05-02 20:02:12 -04:00
99394b816a
Fix unneeded rounding errors.
2011-04-29 09:47:07 +02:00
4793a6a645
Fixes keybindings for numpad keys, arrow keys are numpad on the mac.
2011-04-29 00:48:58 +02:00
f8cc92dfd7
Demote Asserts() to LOG_INFO from LOG_ERROR, to prevent some end-user confusion.
...
We have 956 lines of LOG_ERRORs currently.
2011-04-26 22:49:39 -04:00
ce10843e02
Add a FSAA menu option.
...
NOTE: It is impossible to tell what the max level the card (drivers) supports,
without actually testing for said level.
2011-04-26 22:41:49 -04:00
2769798d3d
saveConfig() omits some values from saving, what leads to certain values are reset to their default value. Initial patch by Fastdeath. Closes ticket 2670.
2011-04-26 22:51:35 +02:00
4c673ebb09
Rearrange init sequence so that QApplication is run before i18n init. Fixes ticket 2566.
2011-04-26 22:44:03 +02:00
140e707e5c
Fix autohell's builds for mingw32
...
--fix by pabs3.
2011-04-25 22:16:53 -04:00
75003517f9
This typo it brought to you by autohell'r'us, where the more difficult we can make it for the developer, the more they want to stick with us!
2011-04-25 21:38:21 -04:00
2536b5f89f
Might help if the copy & paste was what I wanted, not what it did. :P
...
Spotted by Safety0ff again.
2011-04-25 21:28:41 -04:00
a1bfd1f4c1
Fix {} to () spotted by Safety0ff.
2011-04-25 21:20:30 -04:00
fa91ccebb4
Only add the STATICLIB & _WIN32_WINNT defines for mingw builds
...
I would like to thank autohell for this commit.
2011-04-25 20:51:51 -04:00
1c9bdd6f1b
remove SDL flags, and add -D_WIN32_WINNT=0x0501
2011-04-25 20:06:37 -04:00
5829d0a7ae
MSVC fixes for miniupnp
2011-04-25 19:47:55 -04:00
4680765ea9
Add lib iphlpapi for miniupnp
...
Fix define to STATICBUILD
2011-04-25 19:47:54 -04:00
779fdd62bd
Revert "Include miniupnpc headers as C."
...
Didn't work.
This reverts commit 954b5ad05b
2011-04-25 23:49:02 +02:00
954b5ad05b
Include miniupnpc headers as C.
...
Should fix cross-compilation.
2011-04-25 22:55:53 +02:00
7bf96b20de
Merge branch 'master' of github.com:Warzone2100/warzone2100
2011-04-25 22:22:06 +02:00
380123f97c
Removes some includes from netplay.cpp as they are now in netsocket.h.
2011-04-25 22:10:49 +02: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
8c57afedd2
Bumps MaxGames to 18 as 18 will shown fine on two columns in GAMEFIND.
2011-04-25 20:40:09 +02:00
4feac21ecb
Moves per platform includes from netsocket.cpp to netsocket.h.
2011-04-25 20:39:11 +02:00
5eac7e75e6
Changes the way connections between clients and hosts are established, thereby removes the "GAMEFIND" screen from IP connections.
...
This is required for the later removeal of GAMESTRUCT and generaly cleansup code.
Before:
Client -> "list"
Server <- "1<GAMESTRUCT>
Client -> "join"
Client -> VERSION_MAJOR/MINOR
SERVER <- OK/WRONG/KICKED
After:
Client -> VERSION_MAJOR/MINOR
SERVER <- OK/WRONG/KICKED
2011-04-25 20:37:20 +02:00
b3106415ba
Replaces NETgameIsCorrectVersion with NETisCorrectVersion, removes NETgameIsCorrectVersion.
2011-04-25 20:35:05 +02:00
15b5b6a48f
Drops an incoming connection correct when the host is full, resolves a FIXME.
2011-04-25 20:33:27 +02:00
027229f5c9
Fixes client ip handling for the banlist.
2011-04-25 20:32:03 +02:00
86a92ed314
Rendering cleanup, by Safety0ff. Closes ticket 2664.
2011-04-25 12:30:30 +02:00
6adf3a7f70
Use -fno-strict-aliasing instead of -Wno-strict-aliasing for miniupnpc.
...
Fixes ticket:2666.
2011-04-25 11:46:19 +02:00
3f8cecb841
Merge branch 'master' into qt
...
Conflicts:
configure.ac
lib/ivis_opengl/Makefile.am
lib/ivis_opengl/glew/glew.vcxproj
lib/ivis_opengl/glew/glew.vcxproj.filters
lib/ivis_opengl/piedraw.cpp
lib/ivis_opengl/piemode.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/tex.cpp
lib/sequence/Makefile.am
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Glew-All.xcconfig
macosx/configs/QuesoGLC-All.xcconfig
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
src/texture.cpp
win32/libs/Makefile
win32/libs/glew/Makefile
win32/libs/glew/patches/glew_pkgconfig.diff
2011-04-25 00:51:13 +02:00
0fc0eeeb86
Fix optimized compile warnings. Remove unused GLee remains.
2011-04-25 00:32:57 +02:00
89063105fa
Actually start UPnP thread.
...
Closes #2631 .
2011-04-24 13:57:11 +02:00
657bb2d31b
Fix crash in MSVC when using QVariantList. Fix crash with effects with null IMDs. Patch by Buginator.
2011-04-24 10:08:30 +02:00
4e865bcb3c
Remove hack to circumvent physfs for writing ini files. Require physfs 2 or greater to circumvent
...
write corruption bug in physfs. Use utf-8 in file names in virtual filesystem.
2011-04-24 01:03:25 +02:00
8be8d0949f
Fix bugs in wzfs implementation.
2011-04-24 00:10:02 +02:00
768fbe40e4
Fix compile warning. This closes ticket:2659
2011-04-23 23:24:41 +02:00
65e2000db0
Remove unused variable gcc 4.6 doesn't like.
...
Closes #2659 .
2011-04-23 21:52:25 +02:00
25c2e2f540
Fix lib/netplay/miniupnpc/Makefile.am for renamed file.
2011-04-23 20:56:19 +02:00
845d628a4b
Add missing miniupnpc files.
2011-04-23 19:04:21 +02:00
d85bc38f5f
Reapply miniupnpc segfault fix.
...
Is included upstream for newer versions.
2011-04-23 15:41:29 +02:00
d180026116
Update miniupnpc to version 1.5.
...
Thanks to pabs for the needed changes to netplay.cpp (refs #2513 ).
2011-04-23 15:36:30 +02:00
583c318c2e
Remove unused files from lib/netplay/miniupnpc.
2011-04-23 15:32:01 +02:00
bbf4cb0587
qt branch: Rewrite config file handling to use WzConfig. Also removes unused option to disable
...
coloured mouse cursors, and the old "registry" code. Qt virtual physfs filesytem initialization
move to the main function, since it is now needed earlier.
2011-04-21 12:58:51 +02:00
fec754abd7
Reapply 635643e101 which got lost in the mix...
...
Add openal cflags to sequence lib build, fixes linking with static openal-soft.
2011-04-21 01:33:28 +00:00
45c61b0b54
Only check for OpenGL 4 support if GLEW supports it.
2011-04-21 00:56:08 +00:00
4f0296e801
Remove redundant info from the crashdumps.
2011-04-20 17:15:40 +02:00
bd28224a27
Partial revert of 1fe2cc8f4d
...
Use Glew's macros to check if the function is supported or not.
(cherry picked from commit 3f96f2e323
2011-04-20 17:11:20 +02:00
f312fd3e7d
Demote GLEW version message to LOG_3D/crashdumps.
...
Also remove a few spaces before colons.
2011-04-20 17:11:04 +02:00
777d50cd59
Remove more GLee related files
2011-04-20 16:44:10 +02:00
720caa8c31
Add omitted word to comment about inclusion order of glew.h.
2011-04-20 16:28:42 +02:00
be2feff7aa
Remove redundant glu.h inclusions (taken care of by framework/opengl.h -> GL/glew.h -> glu.h).
2011-04-20 16:28:41 +02:00
Buginator
Cyp
Rene Jochum
Per Inge Mathisen
cybersphinx
safety0ff