6dd85baedf
Merge branch 'refs/heads/topic/QJson'
2011-07-11 21:49:31 -04:00
3ddd7a279f
Remove the frame rate limiter from the mac builds.
2011-07-11 15:08:59 -04:00
b786c62da4
Remove our own frame rate limiter, since it will break (brake) vsync when monitor vsync is higher than rate limiter.
2011-07-11 20:44:37 +02:00
616c6c4086
Replace BSON with QJson.
2011-07-11 02:33:33 +02:00
54d749f094
Reformat lib/netplay/netlobby.*
2011-07-10 17:30:25 +02:00
f76e960f7d
Fix various build issues for both 'qtgame' and the bson /new lobby stuff
...
for MSVC.
Nothing here should break other platforms.
2011-07-08 21:51:16 -04:00
12676f77a8
Rename the .moc files so they do not clobber other things.
2011-07-08 21:00:15 -04:00
bbad94b1fc
Fix MinGW compile errors.
2011-07-08 20:42:30 +02:00
4c387a199b
Fix SSL errors on the Macs.
2011-07-08 20:35:23 +02:00
793c30a862
Merge branch 'bsonlobby' into master
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
2011-07-08 18:01:52 +02:00
ed753ff8c4
Fix Windows cross-build.
2011-07-05 02:43:43 +02:00
44235d4cb3
Moves the bson code to 3rdparty.
2011-07-04 22:56:35 +02:00
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
002983b6ae
Splits the cacert up, fixes ssl errors on systems without it.
2011-07-03 00:38:39 +02:00
c07093a209
Remove complaint when WzConfig fails to open file that does not exist for reading. This is
...
(unfortunately) what QSettings occasionally does to check if a file exists.
2011-07-02 14:30:51 +02:00
1ef935e646
Get the qtgame project working in the mac build.
2011-07-01 19:50:49 -04:00
4b8679b591
Fix mac compile errors and warnings.
2011-07-02 01:36:33 +02:00
d5001ccd54
Try again to fix mac/win compiles of qtgame
2011-07-02 01:21:23 +02:00
89a758f280
Fix platform macros for qtgame module. Should now compile on Mac/Windows too.
2011-07-02 01:05:17 +02:00
10a78a4a7e
Merge in qtgame project and make use of its trap cursor support.
2011-07-02 00:25:14 +02:00
be2c105b7a
Update build for Release builds & using STLport.
...
Update release builds to SSE2 + STLport.
2011-06-25 19:48:46 -04:00
b17aa1e7c8
Fix broken compile for MSVC
...
re: f02f606913
2011-06-20 22:27:41 -04:00
c4539a463e
Remove now unused functions to prevent future misuse.
...
Graphics functions should not be used for deterministic code.
2011-06-12 17:33:13 +00:00
f02f606913
Make a fixed point 3D affine transformation class and use it to do muzzle calculations.
...
Fixes #2724 .
2011-06-12 17:33:06 +00:00
94c94304fb
Simple cleanup of actionX|Y droid fields. Patch reviewed by stiv.
2011-06-12 16:24:48 +02:00
060345a5e4
Fix pitch and yaw of loaded units, when loading maps.
2011-06-12 13:41:47 +02:00
918594f00a
Do not assert fail when a value is not present in savegame ini loading vectors.
2011-06-11 19:15:28 +02:00
690b2ccfde
Fix MSVC project files that were broken after the miniupnc move.
2011-05-27 20:44:58 -04:00
10249e5095
Fix int overflow in radar blip drawing. Closes ticket:2731, reviewed by Safety0ff.
2011-05-22 14:37:53 +02:00
8aca9437a4
Add support for normal map loading. (Note that normal map rendering is still not supported by shaders.) Patch reviewed by Safety0ff.
2011-05-22 13:59:30 +02:00
9930be667e
Fix cross compile after the miniupnc move.
2011-05-22 04:32:13 +02:00
29bbd8fb3a
Move lib/netplay/miniupnpc to 3rdparty/miniupnc on autotools and ...
...
hopefully MSVC.
2011-05-22 04:10:04 +02:00
888720d38e
Move miniupnpc into 3rdparty and set up the xcode project.
2011-05-21 19:44:55 -04:00
a17c8a3a19
Final fix for the radix character.
2011-05-18 23:55:09 +02:00
4d21048973
Merge branch 't/master/sequencestuff'
2011-05-14 18:52:27 +02:00
2ef1cb2939
Use better (?) locale names.
...
Hopefully fixes #1778 .
2011-05-14 17:05:47 +02:00
b3c2fabf16
Scale the video subtitle font with the resolution used.
2011-05-13 22:55:17 +02:00
2d1b6aa05a
Remove dead code from fastplay
2011-05-08 14:10:48 +02:00
e4ff3366fc
Moves the Cacert root Cert into data/base.wz
2011-05-07 01:17:38 +02:00
2a637d009c
Make YUV to RGB conversion work on big endian as well.
...
Refs #816 .
2011-05-06 16:10:08 +02:00
46695905ac
Calculate the 50% scanlines with bit-fiddling.
2011-05-06 16:09:43 +02:00
f934b1bfc3
Add an option for scanlines when playing videos.
...
Shows either no, 50% dimmed or black scanlines. Disabled if the video texture
is too small (needs 2 * video height), or the video is shown so small that the
scanlines can't be noticed.
Refs #2095 , #2686 .
2011-05-04 23:47:08 +02:00
0eae4cfc9a
Optimize YUV to RGB conversion.
...
Refs #816 .
2011-05-04 23:47:08 +02:00
9c6eb54f54
Use quad instead of triangle strip to show videos.
2011-05-04 23:47:08 +02:00
730371881c
Make video display blurred instead of blocky.
2011-05-04 23:47:08 +02:00
2e5b58d213
Make sure to deallocate video texture.
2011-05-04 23:47:08 +02:00
36a2fe771c
Increase video texture size to 1024x1024.
...
Refs #2682 .
2011-05-04 23:46:44 +02:00
ae62ec9be5
Remove debug line.
2011-05-04 01:58:10 +02:00
3f868107f3
Fix dead keys on Mac OS-X, research by dak180.
...
Fixes #2676
2011-05-04 01:54:32 +02:00
199a6d3c27
Move GLEW out of the project, and put it into the dev-package instead.
2011-05-02 20:02:12 -04:00
f821332f97
Adds the configure option "--disable-ssl", fixes related errors.
2011-05-02 21:38:10 +02:00
de05a4fe5a
Adds a Login and a Logout Button.
2011-05-02 20:51:05 +02:00
5b61a53a60
Updates the "Multiplayer" Screen, thx cybersphinx for the proposal.
2011-05-02 20:01:30 +02:00
47b8a7c506
Fixes smaller bugs in netlobby.cpp
2011-05-02 19:29:37 +02:00
c973d67004
Fixes W_LABEL after f23a94d644.
2011-05-01 19:18:56 +02:00
f23a94d644
Add an Infotext to the login screen. This modifies lib/widget/label.*!
2011-05-01 16:35:14 +02:00
204eba3c3d
Replaces the games vector by a QList.
2011-05-01 07:56:22 +02:00
b2e54f49e3
Adds support for SSL encrypted connections to the lobby.
...
Changes config values "masterserver_*" to "lobby_*"
Uses QString instead of std::string for the lobby.
Fixes small lobby related bugs.
2011-05-01 05:11:41 +02:00
7005230d64
Uses QT for Networking.
2011-05-01 05:11:41 +02:00
421f46e526
Cleans a possible error after a delGame call, might fixes a yet unknown bug.
2011-05-01 05:11:41 +02:00
e66fa5ffb1
Moves the declaration of "lobbyclient" to netplay.cpp/h as it should not be part of the lobby library.
2011-05-01 05:11:41 +02:00
c7497bf005
Uses a namespace "Lobby" instead of that annoying "LOBBY_" prefixes.
2011-05-01 05:11:41 +02:00
739db7c881
Makes all LobbyClient function parameters const.
2011-05-01 05:11:41 +02:00
05acab78c0
Adds a nice error message when hosting failed, proposed by cybersphinx.
2011-05-01 05:11:41 +02:00
36576eac6d
Bumps netcode for NETJoinGame / NETallowJoining changes.
2011-05-01 05:11:41 +02:00
0960ad8927
Adds a login form for "Multiplay" -> "Join" -> "Lobby".
...
Fixes some login related stuff.
Adds a check for joining users.
2011-05-01 05:11:41 +02:00
c7441cad41
Optimizes the lobbyclient adds a new logging facility "LOG_LOBBY".
2011-05-01 05:11:41 +02:00
963bae58f4
Adds LOGIN support, you need to set "lobby_user" and "lobby_token" in your config as theres currently no GUI for that.
2011-05-01 05:11:41 +02:00
8b588a9501
Returns the error message instead of its code.
2011-05-01 05:11:41 +02:00
273d6381d3
Replaces Masterserver setter/getter with the ones from lobbyclient.
2011-05-01 05:10:08 +02:00
114f5a0d65
Silently tries to remove an existing game on the lobbyserver, supports 64bit ints for gameId.
2011-05-01 05:10:07 +02:00
062b864cb8
Removes GAMESTRUCT and SESSIONDESC, brakes savegames!
2011-05-01 05:10:07 +02:00
754e6c15c7
Uses Protocol V4 - BSON.
2011-05-01 05:10:07 +02:00
54fca60476
Embeds BSON from https://github.com/mongodb/mongo-c-driver - daba871.
2011-05-01 05:10:07 +02: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
2cb9d1e737
Fix glew cross compilation.
2011-04-20 16:28:41 +02:00
c80e14ca35
Use glew instead of GLee.
...
Not sure if 1.5.4 is actually the minimal version we need.
Conflicts:
configure.ac
lib/ivis_common/tex.h
lib/ivis_opengl/pieblitfunc.c
lib/ivis_opengl/piefunc.c
lib/ivis_opengl/piematrix.c
lib/ivis_opengl/screen.c
2011-04-20 16:28:41 +02:00
3481d2e0f6
Rip out our integrated GLee copy.
...
Conflicts:
po/update-po.sh
src/display3d.c
2011-04-20 16:28:41 +02:00
5867fea746
Fix header define for some Windows thing to match how it is done in master.
2011-04-18 22:53:06 +02:00
c32d791ae0
qt: Add some more vector types to WzConfig
2011-04-18 11:08:27 +02:00
dda501bf13
Merge remote branch 'origin/master' into qt
...
Conflicts:
data/base/script/text/cam1a.slo
lib/exceptionhandler/exceptionhandler.vcxproj
lib/exceptionhandler/exchndl.h
lib/framework/framework.vcxproj
lib/gamelib/gamelib.vcxproj
lib/iniparser/iniparser.vcxproj
lib/ivis_opengl/ivis_common.vcproj
lib/ivis_opengl/ivis_opengl.vcxproj
lib/netplay/netplay.vcxproj
lib/script/script.vcxproj
lib/sequence/sequence.vcxproj
lib/sound/sound.vcxproj
lib/widget/widget.vcxproj
macosx/README.BUILD.txt
macosx/Warzone.xcodeproj/project.pbxproj
src/Warzone2100.vcxproj
src/main.cpp
2011-04-17 23:17:24 +02:00
68b940da82
A bit early to check for OpenGL 4.x already, don't you think? Breaks with earlier versions of GLEW.
2011-04-17 22:10:42 +02:00
3f96f2e323
Partial revert of 1fe2cc8f4d
...
Use Glew's macros to check if the function is supported or not.
2011-04-17 15:45:44 -04:00
0af6d3fcef
Fix VS2k10 files for Qt
2011-04-17 15:42:14 -04:00
8f2ac8e0c8
Demote GLEW version message to LOG_3D/crashdumps.
...
Also remove a few spaces before colons.
2011-04-10 22:56:11 +02:00
df4e48ec16
qt branch: Kill off the over-engineered tagfile format. Replacing it with the more retro ini file format.
2011-04-06 22:06:17 +02:00
455553a54b
Fix misusing utf8 encoded string as local codepage encoded string in exception handler.
...
Closes #2607 .
2011-04-03 22:23:04 -04:00
49b78c1f80
Fix exchndl.cpp to work with recent versions of BFD.
...
Hopefully fixes #343 .
2011-04-03 22:23:04 -04:00
38088f37bc
Add Catalan translation by mecatxis.
...
Closes #2616 .
2011-04-03 21:44:57 +02:00
0372b01b80
House cleaning in campaign resource files. Removing unused directories. Adding an assert for them.
2011-04-03 13:57:48 +02:00
09c023a2d0
Actually remove GLee files.
2011-04-03 12:39:44 +02:00
8bc7aa208c
Add Hungarian translation by Mészáros Tamás.
...
Also sort the LANG_NAMEs.
2011-04-03 01:56:08 +02:00
de3be04ac5
Fix flickering due to face culling not being properly enabled.
2011-04-02 10:54:47 +02:00
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
1fe2cc8f4d
Use GLEW instead of GLee. Based on patch by cybersphinx.
2011-04-02 10:08:26 +02:00
d78a8eb8ad
Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load.
2011-04-01 20:31:15 +02:00
84e4bf40cf
Cleanup VS2k10 project files
2011-03-31 19:14:18 -04:00
0ee8b860f8
Merge remote branch 'origin/qt' into qtscript
2011-03-30 18:05:40 +02:00
f431fc08c7
Remove a file that wasn't in the project's frustum.
2011-03-26 00:48:32 -04:00
60099b70d6
Revert "Fix MMB use."
...
open ticket:2578
This reverts commit b3dcccba1d
2011-03-24 22:36:01 -04:00
1f5d94a564
Fix VS2k10 for Qt.
...
NOTE: All Qt headers *MUST* be before of the other headers, or else we get tons of conflicts
***
DO NOT CHANGE HEADER ORDER, unless you know what you are doing, it will fubar
other build systems!
****
close ticket:2570
2011-03-24 20:06:59 -04:00
b3dcccba1d
Fix MMB use.
...
fixes ticket:2578
Also add mouse button state to LOG_INPUT
2011-03-24 19:47:28 -04:00
23f318fe39
Merge branch 'master' into qt
...
Conflicts:
lib/exceptionhandler/exceptionhandler.vcproj
lib/framework/frame.h
lib/framework/framework.vcproj
lib/framework/input.h
lib/gamelib/gamelib.vcproj
lib/iniparser/iniparser.vcproj
lib/ivis_opengl/ivis_opengl.vcproj
lib/netplay/netplay.vcproj
lib/script/script.vcproj
lib/sequence/sequence.vcproj
lib/sound/sound.vcproj
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
src/Makefile.am
win32/Warzone2100.vcproj
2011-03-22 00:01:28 +01:00
fe4d13f335
Add Meta as alternative to Alt when giving scout orders.
2011-03-21 23:56:08 +01:00
e5a4039e8f
Fix Shift+Tab and ` keys.
...
Fixes ticket:2561.
2011-03-21 23:13:41 +01:00
12e1d13c6c
Part 2:
...
Fix overzealous BOOL->bool conversion
Structures *must* remain the same size, BOOL was initially cast as a int, and we would read/write values expecting 32bit values, needless to say, this caused issues. The same applies to varaiables that pretend to be a BOOL, and may indeed have been used as a bool, but again, the size is 32bits, not 1 byte.
Revert "fix [s]BOOLs bool by 4B0/\/\1|\|4710|\|" This reverts parts of commit a72c41aeec
2011-03-19 21:52:25 -04:00
405d03224c
Fix overzealous BOOL->bool conversion
...
Structures *must* remain the same size, BOOL was initially cast as a int,
and we would read/write values expecting 32bit values, needless to say,
this caused issues.
The same applies to varaiables that pretend to be a BOOL, and may indeed have
been used as a bool, but again, the size is 32bits, not 1 byte.
Revert "fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|"
This reverts parts of commit a72c41aeec
2011-03-19 18:40:25 -04:00
ccab8415fa
Add team-coloured blitting functions.
2011-03-18 19:18:48 +01:00
31502ccdce
Let us try this again, leave the never-interactive option for the lexers.
...
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in 2f780609c046bb88e5
2011-03-17 21:35:07 -04:00
ab118527f0
add guards
2011-03-17 21:35:06 -04:00
466374d15d
Populate some defines for MSVC (which we do nothing with anyway)
2011-03-17 21:35:03 -04:00
0d4378c96f
Add MSVC version guard, since this function is now included.
2011-03-17 21:35:02 -04:00
5cfd2e9dbe
Initial VS2k10 changes.
...
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
2011-03-17 21:35:00 -04:00
59309f5e59
Set a more sane FPS default limit of 60, rather than 30.
2011-03-15 21:17:21 +01:00
8c69f5dc19
Clean up jump propulsion code. Fix warning in audio test code. Ref warnings from ticket:2531
2011-03-15 18:50:03 +01:00
8ba7c625f0
Fix "bool|bool" instead of "bool|BOOL" in script lexer.
...
(Broke in a72c41aeec0136c86007739a97ccc9ed508c0283.)
2011-03-15 15:29:34 +01:00
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
a72c41aeec
fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\|
...
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
2011-03-13 12:32:24 +01:00
ad1fcb0c99
Remove some surviving “extern "C"”.
2011-03-13 10:30:13 +01:00
5ac26462f1
Fix use of uninitialized variable in exception handler.
2011-03-12 12:23:56 -05:00
ad4a33a789
Fix capitalization of winsock2.h, not sure if this include is still needed (not present in master).
2011-03-12 10:19:04 -05:00
c7d206b6e9
Now run save/load of script state
2011-03-12 14:47:45 +01:00
635643e101
Add openal cflags to sequence lib build, fixes linking with static openal-soft.
2011-03-02 22:36:11 -05:00
f1495ac6ef
Convert command line options to utf-8 and use unicode directory routines (Windows).
...
Closes #1066 .
2011-03-01 20:48:33 -05:00
676f453332
Do memset of NetPlay.games array, not MAX_PLAYERS elements of NetPlay.games.
...
MAX_PLAYERS was less than MaxGames, so it wouldn't memset too much, at least.
2011-02-28 20:06:30 +01:00
239eebec00
Remove GAME_SECONDARY in favour of GAME_DROIDINFO, which is sent more efficiently for multiple droids.
...
Instead of one message per droid, it sends one message for all droids, with the list of droids encoded as droid ID deltas.
2011-02-27 20:20:43 +01:00
cc150fc2f7
Exit if shaders are not supported, and revert "Hack in the team colour when shaders aren't supported."
...
This reverts commit e0617af5e6
2011-02-25 23:01:03 +01:00
a7730ccd15
Change "typedef struct {...} Blah;" into "struct Blah {...};".
...
Removed a few structs due to disuse.
2011-02-25 21:30:13 +01:00
dc4cf90ce5
Merge branch 'master' into qt
...
Conflicts:
lib/framework/input.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/screen.h
lib/widget/scrap.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
src/multiint.cpp
2011-02-25 18:59:41 +01:00
4a1b5fb543
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:50:54 +01:00
ae2ce18314
Bump year.
...
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
2011-02-25 18:45:27 +01:00
e0617af5e6
Hack in the team colour when shaders aren't supported.
...
Ugly, but better than nothing.
2011-02-20 22:10:12 +01:00
48ff5e55d2
Fix 2 cpp check warnings reported by pabs3.
2011-02-18 15:54:39 +01:00
733ab6e911
Fix compilation with C++0x compilers.
...
Can't use nullptr, until switching to C++0x.
2011-02-15 14:28:08 +01:00
577cbbf874
Fix weird logfile date due to Jan..Dec = 0..11 in struct tm.
2011-02-14 22:08:11 +01:00
5ea9d75ab2
qt branch: Soften font colours a bit to make them look more like master.
2011-02-06 22:41:27 +01:00
dc2385368c
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.cpp
lib/framework/frame.h
2011-02-05 18:44:00 +01:00
a236387ad1
Add missing include.
2011-02-05 18:35:56 +01:00
1db938cd0b
Set a window icon.
...
lib/framework/wz2100icon.h created from the 32x32 icon from
icons/warzone2100.ico by the Gimp's C code export.
Closes #2465 .
2011-02-05 18:23:00 +01:00
7b0316696e
Add cast to fix compilation with -Werror.
2011-02-05 18:00:39 +01:00
e7d17ecda0
exceptionhandler: print *exact* faulting instruction
...
Use the signal handler's `sigcontext` to find the exact stack frame and
instruction address where the fatal signal ocurred, then disassemble
those exact locations (rather than hoping the 4th frame is the offending
one).
Signed-off-by: Giel van Schijndel <giel@wz2100.net>
2011-02-05 16:47:34 +01:00
27741a2200
Merge branch 'master' into qt
...
Conflicts:
macosx/Warzone.xcodeproj/project.pbxproj
tests/astartest.c
2011-01-30 23:45:39 +01:00
9344462e92
Add abstract file system interface for Qt access to physfs data resource. Thanks to EvilGuru for the idea and review.
2011-01-30 23:39:22 +01:00
87c9f38dc3
Revert "Add guard to YY_NO_UNISTD_H definition."
...
This reverts commit f1ebbe6ebac046bb88e5
2011-01-30 01:40:53 -05:00
e86b70ade1
qt branch: Add application icon. Closes ticket:2465
2011-01-29 20:22:43 +01:00
abcd0a4109
Stop connecting to the lobbyserver when it doesn't accept the game
2011-01-27 12:19:35 +01:00
3137d042ea
Fix NETregisterServer connecting multiple times also fixes the requirement to reconnect to the lobby for updates
2011-01-25 04:14:08 +01:00
cead34eea3
Hack around some accumulated brokenness to make --selftest work again
2011-01-24 20:07:30 +01:00
f1ebbe6eba
Add guard to YY_NO_UNISTD_H definition.
...
Closes #2444 .
2011-01-24 13:09:16 -05:00
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
3d5f96f199
Fix memory leak when saving config.
...
Fixes ticket:2455.
2011-01-20 21:26:00 +01:00
c5a6f8b280
Fix valgrind warning due to use of inif->size instead of inif->n in loop.
...
Fixed by removing the inif->size and inif->n variables and using a std::vector instead.
2011-01-19 15:01:45 +01:00
82fbf17cff
Make team and colour of AIs visible to non-hosts.
...
Also, remove tooltip saying non-hosts can change AI difficulty levels.
2011-01-18 14:34:23 +01:00
038a3d5147
Remove remnants of the old iniparser.
2011-01-18 01:19:32 +01:00
64f1b6b895
Fix memory leaks reported by cppcheck
2011-01-18 00:36:49 +01:00
4fb9e61548
Remove unused TEXT_DISPLAY, improve format string consistency and remove weird casts.
2011-01-18 00:20:04 +01:00
f99d9b20cc
Make config file loading/saving less weird.
...
Changelog: Usernames such as "Meów" will no longer be truncated at the first unicode character to "Me" when restarting Warzone 2100.
2011-01-18 00:20:04 +01:00
8b49291b5d
Simplify NETbin interface.
...
Redundantly, the data length was redundantly sent twice, which was redundant.
2011-01-18 00:20:04 +01:00
c046bb88e5
Set never-interactive option in lexers so that Flex doesn't use isatty() function from unistd.
...
Define YY_NO_UNISTD_H when no unistd.h is detected.
Remove attempt to fix isatty error on Windows introduced in 2f780609
2011-01-15 13:39:51 -05:00
268574f8c0
Make sure host gets to join his own game.
2011-01-15 15:34:56 +01:00
971e5de351
Add open/close buttons to pregame dialog. Basic support in netcode added. Closes ticket:2435
2011-01-15 13:29:23 +01:00
6bd1ac3e08
Remove leftover lib/ivis_common/pietypes.h, noticed by dak180.
2011-01-14 21:16:19 +01:00
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
e46b08f8e1
Fix not sending player info for players 8+.
2011-01-13 16:40:34 +01:00
8248789dfd
Minor changes due to review by Per.
...
And also readded some changes that got lost from nexus.slo somehow.
2011-01-13 15:58:47 +01:00
f00b6149d9
Bump MAX_PLAYERS to allow 10 normal players + 1 scavenger player.
2011-01-13 15:58:46 +01:00
a3e5ea7276
Reduce dependence on MAX_PLAYERS == 8.
2011-01-13 15:58:46 +01:00
53aa5e55dc
Remove some dead code
2011-01-13 14:53:26 +01:00
02ca800a92
Insane AI now always starts with defenses. Lets see if people like this.
2011-01-09 18:22:21 +01:00
f263cf5103
Add GUI dialog for choosing which AI you want to play against. Move semperfi and dydo into main. Change difficulty
...
slider into four separate steps (Easy, Medium, Hard, Insane). Thanks to Cyp for review. For more info, see ticket:2435
2011-01-09 16:35:49 +01:00
9e9fc1ba5b
Misc fixes for ticket:2435 (cleanup, cosmetic) to reduce diffcount
2011-01-09 14:46:18 +01:00
96376b088e
Fix compilation with g++ 4.6.
...
Most of this just removes unused variables. Closes #2437 .
2011-01-08 18:23:01 +01:00
b72911f82f
Remove NetPlay.maxPlayers, since it was just a sometimes-correct copy of game.maxPlayers.
2011-01-08 15:49:30 +01:00
4af4b82004
Use Vector2i in MOVE_CONTROL.
2011-01-08 01:30:57 +01:00
7f5da6ad47
Use more of MAX_PLAYERS in the code rather than plain numbers. Define MAX_PLAYERS for scripts. From patch by Cyp.
2011-01-05 23:09:38 +01:00
4a34b821ad
Fix parts of UI that break if increasing MAX_FACTORY.
2011-01-04 22:32:52 +01:00
c4d4dcd73a
The colour chooser is now a proper button. The double-click kick is now gone (use the button). Kick button moved to team chooser.
...
The kick button is removed for single player and AIs and non-hosts (made no sense). The position chooser now allows you to click
on any other player to switch places. Removed broken ping symbol. Removed broken ranking symbol. Make sure we flush the connection
with the kick message before we cut it. Fix reception of kick message so that we do not crash when we do receive them. ticket:2435
2011-01-04 18:51:15 +01:00
734d52984d
Set bsocket = NULL when host drops, hopefully reduce the chance of crashing.
2011-01-01 23:24:25 +01:00
738a1fc38c
Strip "Class::" from "Class::myFunction" when compiling with MSVC, in syncDebug().
...
Other compilers don't add the "Class::".
2011-01-01 21:28:13 +01:00
c10886b7b1
Change (HANDLE)(HANDLE)hProcess to (HANDLE)hProcess
2011-01-01 14:17:16 -05:00
4ececd8e49
Fix a plethora of issues for MSVC builds
...
Rename MERGECOPY to MERGECOPYSYNC to prevent clobbering of a windows function named that.
2011-01-01 13:46:12 -05:00
1169f20b91
Merge branch 'master' of github.com:Warzone2100/warzone2100
...
* 'master' of github.com:Warzone2100/warzone2100: (41 commits)
Remove some unused legacy code from the old terrain renderer and TERRAIN_VERTEX.
Die, ivis_common, die\!
Remove some unnecessary oil resource hacks, including flattening to terrain. Please do not put oil resources on sloped ground. It looks stupid even when flattened.
Fix misspelling of 'guard tower' in PIE file name to match similar rename in wzgm.
Remove the unused specular parameter to pie_Draw3DShape. It was always WZCOL_BLACK.
Remove pietoaster
Define the default fog colour in the palette file instead of hard-coded.
Remove the "AI experience" code, which has not been used by the last four AI scripters. Existing savegames may be broken by this.
Inline pie_SetTranslucencyMode() and remove the entirely superfluous TRANSLUCENCY_MODE abstraction.
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
simplipie: Add warning when not all polygons in a mesh do not use the same number of frames for texture animation.
Merge the two variants of piestate.cpp; it too confusing to keep two files with the same name doing almost the same thing.
Slight optimization: Now we draw the entire model within the same glBegin .. glEnd pair.
Remove support for non-triangle polygons in model files.
simplipie: Fix error when fixing face culling and tessellation at the same time.
Tessellate features, effects and other models.
Tessellate components.
Tessellate all structure models.
simplipie: Fix missing space in frame animation directive print out.
simplipie: Add support for triangle tessellation
...
2011-01-01 12:29:17 -05:00
53242e1571
Remove some unused legacy code from the old terrain renderer and TERRAIN_VERTEX.
2011-01-01 16:29:49 +01:00
d2499aa9cc
Die, ivis_common, die\!
2011-01-01 14:51:53 +01:00
7bd5723715
Remove the unused specular parameter to pie_Draw3DShape. It was always WZCOL_BLACK.
2011-01-01 12:58:14 +01:00
724cd69882
Define the default fog colour in the palette file instead of hard-coded.
2010-12-31 23:42:21 +01:00
e27ac240be
Inline pie_SetTranslucencyMode() and remove the entirely superfluous TRANSLUCENCY_MODE abstraction.
2010-12-31 23:02:20 +01:00
67e9635f9f
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
2010-12-31 22:37:14 +01:00
1c0af54edf
Merge the two variants of piestate.cpp; it too confusing to keep two files with the same name doing almost the same thing.
2010-12-31 22:18:45 +01:00
2e6332ca8c
Slight optimization: Now we draw the entire model within the same glBegin .. glEnd pair.
2010-12-31 18:59:41 +01:00
88fe0bcb2e
Remove support for non-triangle polygons in model files.
2010-12-31 18:22:22 +01:00
7b7b2b8e0e
Fix a section-titling bug in the inifile code.
2010-12-30 21:17:18 +00:00
5362cf2217
Fix compilation under GCC 4.5.
...
Previously, _WZ_ASSERT_ARRAY_EXPR_FUNCTION would return NULL
((void *) 0) for a function with a declared return type of char.
2010-12-30 20:45:35 +00:00
5c4b81fa63
Make C++ WZ_ASSERT_STATIC_STRING a compile-time check without using typeid, make C++ WZ_ASSERT_ARRAY_EXPR work.
2010-12-30 00:58:55 +01:00
fca489ce42
Iniparser rewrite as per ticket #2012 .
...
This code completely replaces the old iniparser with a new,
cleaner API. All existing uses of the old code have been ported.
The Xcode and MSVC projects will require updating.
2010-12-29 21:17:12 +00:00
7d1e719e13
Remove hard-coded limit for number of polygons in models. This limit is now only relevant for delivery point, oil resource and wall models.
2010-12-29 12:46:10 +01:00
086a0fd4bc
Add new PIE flag 0x00001000 that specifies that the PIE model should not be stretched to fit to terrain.
2010-12-29 10:57:38 +01:00
4eed3bef79
Remove the now obsolete distinction between configurable FPS rates for MP and campaign. Up the maximum FPS to 500 from 200.
...
To change the max fps rate now change only the "framerate" line. Patch reviewed by Cyp.
2010-12-29 00:24:45 +01:00
aafe14fbc2
Add separate shader for models rendered for buttons to remove lighting effects from those.
...
Add support for per-pixel lighting. Patch reviewed by SafetyOff.
2010-12-28 23:35:57 +01:00
af59954767
Do not spend value resources shading the backsides of polygons or setting irrelevant GL states.
2010-12-27 16:53:13 +01:00
f5ea79ed3c
Enable OpenGL lighting controlled through the vertex shader. Added two new script functions setSunPosition an setSunIntensity.
...
Added a new PIE file directive MATERIALS that sets material properties for a mesh level. Original patch reviewed by SafetyOff.
2010-12-26 22:12:53 +01:00
e2c7c49a21
Merge branch 'master' of github.com:Warzone2100/warzone2100
...
* 'master' of github.com:Warzone2100/warzone2100:
Apply patch — kill some more warnings, and fix a few issues that Buginator found.
2010-12-24 20:02:10 -05:00
dak180
Per Inge Mathisen
Rene Jochum
Buginator
cybersphinx
safety0ff
Cyp
abomination
Giel van Schijndel
Freddie Witherden