Rene Jochum
380123f97c
Removes some includes from netplay.cpp as they are now in netsocket.h.
2011-04-25 22:10:49 +02:00
Rene Jochum
8c57afedd2
Bumps MaxGames to 18 as 18 will shown fine on two columns in GAMEFIND.
2011-04-25 20:40:09 +02:00
Rene Jochum
4feac21ecb
Moves per platform includes from netsocket.cpp to netsocket.h.
2011-04-25 20:39:11 +02:00
Rene Jochum
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
Rene Jochum
b3106415ba
Replaces NETgameIsCorrectVersion with NETisCorrectVersion, removes NETgameIsCorrectVersion.
2011-04-25 20:35:05 +02:00
Rene Jochum
15b5b6a48f
Drops an incoming connection correct when the host is full, resolves a FIXME.
2011-04-25 20:33:27 +02:00
Rene Jochum
027229f5c9
Fixes client ip handling for the banlist.
2011-04-25 20:32:03 +02:00
dak180
b4ad9f00b5
Add the missing MiniUPnPc files.
2011-04-25 11:03:30 -04:00
Per Inge Mathisen
4054041fc4
Add a bunch of new scripting functions for QtScript.
2011-04-25 16:07:50 +02:00
Per Inge Mathisen
9be9b6bc2a
Some script related cleanup.
2011-04-25 15:16:49 +02:00
Per Inge Mathisen
86a92ed314
Rendering cleanup, by Safety0ff. Closes ticket 2664.
2011-04-25 12:30:30 +02: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
7696079995
Remove sktech.slo from POTFILES.in
2011-04-25 11:13:36 +02:00
Per Inge Mathisen
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
Per Inge Mathisen
0fc0eeeb86
Fix optimized compile warnings. Remove unused GLee remains.
2011-04-25 00:32:57 +02:00
safety0ff
c130ed0cab
Add some comments to terrain renderer.
...
Closes #2349 .
2011-04-24 17:09:51 +00:00
Buginator
90c91165b2
Update NSIS with Russian translation by forum member Terminator.
2011-04-24 14:44:56 -04:00
Per Inge Mathisen
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
Per Inge Mathisen
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
cybersphinx
89063105fa
Actually start UPnP thread.
...
Closes #2631 .
2011-04-24 13:57:11 +02:00
Per Inge Mathisen
ca6f8840e2
Convert the message savegame to ini format.
2011-04-24 11:50:17 +02:00
Per Inge Mathisen
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
Per Inge Mathisen
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
dak180
4e0523e939
Change the link order so the right png is used.
2011-04-23 21:10:22 -04:00
dak180
3a6b4c5e16
Remove QuesoGLC from the xcode project.
2011-04-23 19:34:21 -04:00
dak180
f2f727d0db
Make MiniUPnPc an external framework.
2011-04-23 19:27:54 -04:00
dak180
c716957cf6
No more tagfile.cpp.
2011-04-23 19:27:16 -04:00
Per Inge Mathisen
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
Per Inge Mathisen
8be8d0949f
Fix bugs in wzfs implementation.
2011-04-24 00:10:02 +02:00
Per Inge Mathisen
768fbe40e4
Fix compile warning. This closes ticket:2659
2011-04-23 23:24:41 +02:00
cybersphinx
65e2000db0
Remove unused variable gcc 4.6 doesn't like.
...
Closes #2659 .
2011-04-23 21:52:25 +02:00
dak180
02b8c3e412
Add the missing MiniUPnPc files and make MiniUPnPc an external framework.
2011-04-23 15:46:56 -04:00
cybersphinx
25c2e2f540
Fix lib/netplay/miniupnpc/Makefile.am for renamed file.
2011-04-23 20:56:19 +02:00
cybersphinx
845d628a4b
Add missing miniupnpc files.
2011-04-23 19:04:21 +02:00
cybersphinx
b32fe20e07
Fix two typos in the German translation.
...
Closes #2623 , refs #2654 .
2011-04-23 18:58:14 +02:00
cybersphinx
d85bc38f5f
Reapply miniupnpc segfault fix.
...
Is included upstream for newer versions.
2011-04-23 15:41:29 +02:00
cybersphinx
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
cybersphinx
583c318c2e
Remove unused files from lib/netplay/miniupnpc.
2011-04-23 15:32:01 +02:00
dak180
435f352672
Build the index.
2011-04-21 22:23:25 -04:00
dak180
6ded3d1064
Explicitly define the architectures.
2011-04-21 22:04:08 -04:00
dak180
81f96c22b5
Generate pnglibconf.h properly.
2011-04-21 22:01:52 -04:00
Per Inge Mathisen
914b44949f
Fix some left-over logging
2011-04-21 16:00:01 +02:00
Per Inge Mathisen
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
Per Inge Mathisen
83a603174e
Remove dead code (qt branch only)
2011-04-21 10:54:06 +02:00
Per Inge Mathisen
ad2350233c
Remove unused --cheat switch (when removing functionality, please remove ALL associated code, too!)
2011-04-21 10:24:29 +02:00
Per Inge Mathisen
ab3f4dfbfa
Remove dead code and fix some crazy indentation in game.cpp
2011-04-21 10:11:50 +02:00
Per Inge Mathisen
89e46f3007
Remove now unused code in game.cpp
2011-04-21 10:02:32 +02:00
safety0ff
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
safety0ff
45c61b0b54
Only check for OpenGL 4 support if GLEW supports it.
2011-04-21 00:56:08 +00:00