Commit Graph

25 Commits (master)

Author SHA1 Message Date
vexed 2f217ab602 Merge branch 'bugfixes'
Conflicts:
	src/multiint.cpp
2013-10-27 21:15:49 -04:00
vexed 8f4adda206 Upgrade miniupnp to miniupnpc-1.8.20131007 *NOTE* mimiupnp source has been modified so we can compile it without errors!
Fix UPnP so it actually works on windows & linux & most likely mac.
Add more information about UPnP progress in console.

closes ticket:4095
2013-10-27 20:57:38 -04:00
vexed 623d9c7c3c Update GLM to 0.9.4.4
Changelog:
    Fixed slerp when costheta is close to 1 #65
    Fixed mat4x2 value_type constructor #70
    Fixed glm.natvis for Visual C++ 12 #82
    Added assert in inversesqrt to detect division by zero #61
    Fixed missing swizzle operators #86
    Fixed GLM natvis for VC11 #82
    Fixed GLM_GTX_multiple with negative values #79
    Fixed glm::perspective when zNear is zero #71
2013-08-10 20:30:38 -04:00
dak180 236dccb24d Merge branch 'bugfixes'
* bugfixes:
  Update ogg to 1.3.1 for the mac build.
  Eliminate a few warnings in 3rdparty code.
  Update the xcode project file to the 3.2 format.
  Fix ups.
  Update png to 1.5.17.
  Update to glew 1.10.0 for the mac builds.
2013-08-01 16:49:59 -04:00
dak180 c31cf2693e Fix ups.
* Add underscore.sty into 3rdparty
 * Use a quoted here doc in CS-ID
 * Try not to blowup quite so spectacularly building the docs without a network connection.
2013-07-22 15:08:34 -04:00
per fb6194e9cb Add the GLM math library (which is just a bunch of header files). 2013-02-18 20:00:09 +01:00
vexed e34e7e4e0c Seems time don't stop, so bump the year to 2013. 2013-01-16 15:34:57 -05:00
Per Inge Mathisen b2c7d45cee Also check if vertex array is supported on restoring GL state, not just saving it.
This removes OpenGL errors reported repeatedly, and closes ticket:3834.
2012-12-19 23:18:36 +01:00
cybersphinx 78a13deb19 QuesoGLC: Fix potential crash when some OpenGL features are disabled.
Closes #3818.
2012-12-11 15:17:23 +01:00
NanoTech 9c1bb0cf09 Add OS X help menu items for the man page and scripting docs. 2012-02-01 16:30:29 -06:00
cybersphinx 605076bf2d Disable compiler warnings for quesoglc. 2012-01-21 21:59:44 +01:00
cybersphinx d7adba90d4 Remove outdated win32 files from quesoglc. 2012-01-09 02:26:46 +01:00
cybersphinx 25d98aff42 Fix quesoglc Makefile.am. 2012-01-09 01:31:28 +01:00
safety0ff 9cb0afa9b8 Integrate QuesoGLC.
Since no fixed release is out at the moment, always use ours.

Closes #2828.
2012-01-08 22:53:42 +01:00
NanoTech f3d7b315a0 OS X: Make docs a valid Help bundle, add menu. 2012-01-05 17:41:49 -06:00
Cyp 8c7c110c24 qt-sdl: Fix input, mouse cursor, skirmish.
Now runs, and is at least a bit usable.
2011-12-15 19:30:26 +01:00
dak180 8e1c6578a1 Simplify SDL includes (especially for the mac build). 2011-12-15 13:17:43 -05:00
dak180 f6d963963c Adjust the xcode build to moves and additional files.
Some additional changes to set up support SDL for mac builds.
2011-12-12 09:40:49 -05:00
cybersphinx 2dbd06e9b1 Get rid of the unmaintained makefile.win32s.
Closes #2900.
2011-09-25 19:58:13 +02:00
Rene Jochum 616c6c4086 Replace BSON with QJson. 2011-07-11 02:33:33 +02:00
Rene Jochum 44235d4cb3 Moves the bson code to 3rdparty. 2011-07-04 22:56:35 +02:00
Rene Jochum e5de591615 Fix windows mingw builds 2011-05-23 19:21:00 +02:00
Rene Jochum 9930be667e Fix cross compile after the miniupnc move. 2011-05-22 04:32:13 +02:00
Rene Jochum 29bbd8fb3a Move lib/netplay/miniupnpc to 3rdparty/miniupnc on autotools and ...
hopefully MSVC.
2011-05-22 04:10:04 +02:00
dak180 888720d38e Move miniupnpc into 3rdparty and set up the xcode project. 2011-05-21 19:44:55 -04:00