c68c95c456
If it is both a git and a hg repo prefer git.
...
Fixes #2672 .
2011-04-27 02:47:02 -04: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
1b684c1d15
Fix stuff that got lost in the merge.
2011-04-25 18:23:44 -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
7106d9ddc9
Update translations.
2011-04-25 21:32:37 +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
b4ad9f00b5
Add the missing MiniUPnPc files.
2011-04-25 11:03:30 -04:00
4054041fc4
Add a bunch of new scripting functions for QtScript.
2011-04-25 16:07:50 +02:00
9be9b6bc2a
Some script related cleanup.
2011-04-25 15:16:49 +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
f410eee215
Add '-Wno-strict-aliasing' when compiling C files such as miniupnpc.c.
2011-04-25 11:29:56 +02:00
7696079995
Remove sktech.slo from POTFILES.in
2011-04-25 11:13:36 +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
c130ed0cab
Add some comments to terrain renderer.
...
Closes #2349 .
2011-04-24 17:09:51 +00:00
90c91165b2
Update NSIS with Russian translation by forum member Terminator.
2011-04-24 14:44:56 -04:00
8919334d9b
Fix initial power level and starting techs for players > 8. Also clean up script responsible for this.
2011-04-24 16:15:48 +02:00
ce4d83c972
Turns out sk*tech.*lo are entire superfluous, as their job is already done better by rules.slo
2011-04-24 16:00:54 +02:00
89063105fa
Actually start UPnP thread.
...
Closes #2631 .
2011-04-24 13:57:11 +02:00
ca6f8840e2
Convert the message savegame to ini format.
2011-04-24 11:50:17 +02:00
b3be4b17d4
Make Qt treat all C strings from Warzone as UTF-8 by default. Closes ticket:2657
2011-04-24 11:34: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
4e0523e939
Change the link order so the right png is used.
2011-04-23 21:10:22 -04:00
3a6b4c5e16
Remove QuesoGLC from the xcode project.
2011-04-23 19:34:21 -04:00
f2f727d0db
Make MiniUPnPc an external framework.
2011-04-23 19:27:54 -04:00
c716957cf6
No more tagfile.cpp.
2011-04-23 19:27:16 -04: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
dak180
Buginator
Per Inge Mathisen
cybersphinx
Rene Jochum
Cyp
safety0ff