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
65e2000db0
Remove unused variable gcc 4.6 doesn't like.
...
Closes #2659 .
2011-04-23 21:52:25 +02:00
02b8c3e412
Add the missing MiniUPnPc files and make MiniUPnPc an external framework.
2011-04-23 15:46:56 -04: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
b32fe20e07
Fix two typos in the German translation.
...
Closes #2623 , refs #2654 .
2011-04-23 18:58:14 +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
435f352672
Build the index.
2011-04-21 22:23:25 -04:00
6ded3d1064
Explicitly define the architectures.
2011-04-21 22:04:08 -04:00
81f96c22b5
Generate pnglibconf.h properly.
2011-04-21 22:01:52 -04:00
914b44949f
Fix some left-over logging
2011-04-21 16:00: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
83a603174e
Remove dead code (qt branch only)
2011-04-21 10:54:06 +02:00
ad2350233c
Remove unused --cheat switch (when removing functionality, please remove ALL associated code, too!)
2011-04-21 10:24:29 +02:00
ab3f4dfbfa
Remove dead code and fix some crazy indentation in game.cpp
2011-04-21 10:11:50 +02:00
89e46f3007
Remove now unused code in game.cpp
2011-04-21 10:02:32 +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
1d7bb2fd96
Fix the incredible brokenness in the mac build resulting from a botched rebasing.
...
This is why rebasing should generally be considered evil especially when it involves files that do not merge; in short, do not do this.
This goes double when the changes you are rebasing do not actually work yet.
2011-04-20 16:32:27 -04: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
b8696df659
Remove extra mingw glew configuration code since patch for glew takes care of this.
2011-04-20 16:28:42 +02:00
366ae73a30
Embed glew into quesoglc.
2011-04-20 16:28:41 +02:00
2855175eff
Don't hardcode the sourcebase path in the quesoglc patch.
2011-04-20 16:28:41 +02:00
Per Inge Mathisen
Cyp
safety0ff
Buginator
cybersphinx
dak180