2dbd06e9b1
Get rid of the unmaintained makefile.win32s.
...
Closes #2900 .
2011-09-25 19:58:13 +02:00
4d589a95b3
Settable screen resolution on Mac OS X.
...
Also, only show resolutions available for
the main window's screen.
2011-09-23 22:38:01 -06:00
28b31b22d6
Set a window title.
2011-09-22 00:32:36 -06:00
118a58b070
Include wzapp.h.qwth/qtgame.h.qwth from the right Makefile.ams.
2011-09-15 23:54:15 +02:00
7b13a1e0fa
Remove stray backslash.
2011-09-15 23:19:38 +02:00
30a429ce0d
Make sure that Mac builds work from the tarball.
2011-09-15 12:29:26 -04:00
b30d3ae526
cocoa_wrapper, macosx_screen_resolutions: Move to EXTRA_DIST
2011-09-14 21:38:44 -06:00
03681c62a4
Fix typo in lib/qtgame/Makefile.am.
2011-09-14 19:05:50 -06:00
a9925074c7
Move cocoaAppendAvailableScreenResolutions to lib/qtgame.
2011-09-14 17:09:48 -06:00
6feee75494
Fix compilation of OS X screen resolution code with the 10.5 SDK.
2011-09-14 16:43:29 -06:00
5efce67461
Add cocoa_wrapper.* to lib/framework/Makefile.am
2011-09-13 15:35:42 -06:00
5eadd17340
Detect available screen resolutions on Mac OS X.
2011-09-12 01:09:40 -06:00
9a72ebd45f
Really don't include moc'ed files in the tarballs.
...
Really fixes #2846 .
2011-09-07 21:15:05 +02:00
b6112ae391
Remove some unused code
2011-09-03 21:26:20 -04:00
f31e223626
Fix all builds, they should now all compile assuming everything is set up correctly.
...
You have both Debug & Release builds, using MS's STL, and the you have Debug & Release builds using STLport.
The STLport version is prefered.
2011-09-03 00:21:40 -04:00
0e50bcb29e
update MSVC project files
2011-09-02 22:52:47 -04:00
16c8d06caf
Fix number pad on non-macs.
2011-09-02 18:46:50 +02:00
86c9451525
Show planned structure blueprints to allies.
2011-09-02 18:35:01 +02:00
f282cc289c
Fix some warn-unused-result warnings.
...
Wasn't compiling with -Werror.
2011-09-02 12:07:18 +02:00
a22282c755
'Finnish' in Finnish is not 'tanska'. Thanks to _A-.
2011-08-26 01:09:12 +02:00
d3e213ee66
Don't include moc'ed files in the tarballs.
...
Closes #2846 .
2011-08-04 22:36:12 +02:00
a899f46775
Add the map tools to the xcode project.
2011-07-30 00:39:56 -04:00
0b36f7d0de
Simplify frame redraw mechanism. Add a new paint event instantly instead of using a QTimer to redraw. Suggested by Safety0ff. Closes ticket:2842
2011-07-27 23:09:35 +02:00
08d2bae4e5
Use Ctrl-V instead of Tab to paste in input boxes.
...
Closes #2830 .
2011-07-27 16:06:25 +02:00
9ecba718a4
Revert "Remove a direct src include from lib/gamelib."
...
This reverts commit e32c1f0e89
2011-07-20 21:42:22 +02:00
cffdfa6144
Remove a direct src include from lib/sequence.
2011-07-20 12:17:27 +02:00
e32c1f0e89
Remove a direct src include from lib/gamelib.
2011-07-20 12:06:13 +02:00
3ff588daab
Remove another direct src include from the exceptionhandler.
2011-07-20 11:44:24 +02:00
0486acf35a
Update the version to match the last build we released.
2011-07-19 21:59:29 -04:00
78af6cf247
Removes a include from src in lib/exceptionhandler/dumpinfo.cpp.
2011-07-20 03:28:49 +02:00
f2e506e6dd
Update MSVC builds to use SSL by default.
...
NOTE: You must compile openSSL first, then point Qt to that, and then compile Qt.
2011-07-19 20:39:36 -04:00
4479bf7e30
Update .gitignore, and some MSVC project file changes.
2011-07-19 20:33:44 -04:00
f35bcccdee
For commit ebc8976dc1
...
the wrong stash was used. Reapplying missing part of patch.
closes ticket:2824
Revert "Speed up text rendering for console messages by rendering to pixmaps instead of re-rendering the strings themselves for every display frame."
This reverts commit aaedaabf60
2011-07-19 20:23:27 -04:00
866aeb950b
Make swapinterval.cpp independant of glew, this fixes issues caused by accessing glew vars before glew is initiliazed.
...
Closes #2826 .
2011-07-18 21:06:20 +00:00
c10d9ef8d4
Let's try another way to handle the trap cursor support for windows.
...
Closes ticket:2813
2011-07-18 20:42:58 -04:00
2cb5bab031
Lobby: set the right authentication flag on logouts.
2011-07-18 21:50:46 +02:00
8b8d2b676a
Bring back scaled fonts as were in commit b3c2fabf16
...
re: commit ebc8976dc1
2011-07-17 14:53:47 -04:00
9357171481
Bring back QuesoGLC for the mac builds.
...
X11 (Apple's official version for 10.6) is not required to be installed to run the game.
Refs #2824 .
2011-07-17 14:10:27 -04:00
ebc8976dc1
Bring back quesoGLC to Warzone.
...
This renders the text much faster than what Qt offers, and also fixes issues with Vsync being ON, on windows.
patch fixes by Safety0ff
closes ticket:2824
This patch basically reverts:
828c0f72ae9e29aa5210
2011-07-17 13:15:15 -04:00
f8e1c75a48
Update framework project files for this commit.
...
d51379938d#2823 .
2011-07-17 13:10:16 -04:00
022ab30a92
Fix a possible buffer overrun in netlobby
2011-07-16 13:11:56 +02:00
d726117be9
Remove lib/framework/configfile.*. Closes #2823 .
2011-07-14 23:11:18 +02:00
608da2ed7c
Remove the unused wz2100.icon.h file. Refs #2823 .
2011-07-14 23:10:54 +02:00
d51379938d
Remove old cursor code. Refs #2823 .
2011-07-14 23:10:35 +02:00
3971d661c7
Update qtgame project files for MSVC.
2011-07-13 22:34:41 -04:00
c394a15fda
Add swap interval control to QtGame. There's no longer any need to restart to change vsync settings.
...
Refs #2815 .
2011-07-13 21:00:31 +00:00
620589928a
Fix Mingw-cross-env compile errors, fixes #2820 . Thx to Safety0ff.
2011-07-13 20:25:21 +02:00
c6edf9fbf4
Revert the multiline feature from the label widget as it breaks updates. ...
...
fixes #2818 .
2011-07-13 12:42:14 +02:00
5c24f7b716
Remove bson from project files.
...
Add qjson to include path & libs. (Yes, we now require qjson, see 2646b4211d48f61fddb4bc2c5d1ac9d20e8201b2 )
**REMOVE** bastardization of the normal operators with the alternative operator
representations--requires special header file & should NEVER be used
in our code. die, alternative operator representations, die!
Make a note for NO_SSL default builds (MSVC only)
2011-07-12 21:07:58 -04:00
f4ec6ca3b2
Remove SDL_framerate.cpp/.h from project file.
...
see b786c62da4
2011-07-12 21:07:58 -04:00
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
cybersphinx
NanoTech
dak180
Per Inge Mathisen
vexed
Cyp
Rene Jochum
safety0ff
Rene Jochum
Buginator