Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 10:17:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions2
22472 commits 71 branches 56 tags 1.2 GiB
Commit graph

22472 commits

Author SHA1 Message Date
Stephen Birarda
ea88518a44 handle debug/release for multi-config on WIN32 2015-02-26 09:57:56 -08:00
Stephen Birarda
621df1f66b remove win requirement of msbuild for bullet 2015-02-26 09:50:21 -08:00
Stephen Birarda
53f265bca2 Merge branch 'master' of github.com:highfidelity/hifi 2015-02-25 17:49:02 -08:00
Stephen Birarda
f8627c8233 fix handling for vc12 externals 2015-02-25 17:48:26 -08:00
Andrew Meadows
7b68916010 Merge pull request from ZappoMan/hangOnExit 
BUG FIX: Hang on exit
 2015-02-25 17:02:26 -08:00
ZappoMan
05d7d47045 some cleanup 2015-02-25 16:32:48 -08:00
ZappoMan
b03928cec7 some cleanup 2015-02-25 16:31:43 -08:00
ZappoMan
af43ba3444 used a registered quad for the audio box since its color constantly changes 2015-02-25 15:21:24 -08:00
ZappoMan
5eecb6a837 correctly delete glbuffers 2015-02-25 14:44:10 -08:00
Stephen Birarda
db7bfc1e6e Merge pull request from birarda/master 
look directly in Xcode app for 10.9 SDK
 2015-02-25 14:04:41 -08:00
Stephen Birarda
a7a9ede744 handle an SDK in Xcode beta 2015-02-25 13:53:57 -08:00
Stephen Birarda
e0d31f6e61 remove extra added spaces 2015-02-25 13:52:14 -08:00
Stephen Birarda
994c0386d3 cleanup command that looks for SDK 2015-02-25 13:50:59 -08:00
Stephen Birarda
d24287f627 look in Xcode application for 10.9 SDK 2015-02-25 13:48:28 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Stephen Birarda
1c2606c6db fail out if windeployqt is not found 2015-02-25 13:12:37 -08:00
Stephen Birarda
a9fcde6265 fix two typos in BUILD guides 2015-02-25 13:07:52 -08:00
ZappoMan
912b851eb7 remove crufty references to QGLWidget 2015-02-25 12:54:34 -08:00
ZappoMan
d1e648b392 remove unused references to QGLWidget* parent in Overlay and Overlays 2015-02-25 12:34:38 -08:00
Brad Hefta-Gaub
e7b36166ec Merge pull request from huffman/fix-repeat-captured-keys 
Make KeyEvent objects equal even if they have differing isAutoRepeat val...
 2015-02-25 12:24:19 -08:00
Brad Hefta-Gaub
6d237f3f79 Merge pull request from huffman/fix-plane-pick 
Fix plane pick
 2015-02-25 12:23:45 -08:00
ZappoMan
a89691fc66 switch GLCanvas back to being owned by Application 2015-02-25 12:11:35 -08:00
Stephen Birarda
33b0fd24a6 don't call copy dll step for scribe 2015-02-25 11:02:05 -08:00
ZappoMan
e66f12f958 add shutdown short circuiting to datagram processor 2015-02-25 10:56:08 -08:00
Stephen Birarda
66ab2ba9f9 fix for flipped conditional for dll fixup 2015-02-25 10:44:02 -08:00
Stephen Birarda
fd8240669b fix for windeployqt for executables 2015-02-25 10:39:44 -08:00
Ryan Huffman
660d9ad499 Make KeyEvent objects equal even if they have differing isAutoRepeat values 2015-02-25 10:28:45 -08:00
Ryan Huffman
c499352ad8 Update billboard and planar overlays to use new findRayRectangleIntersection signature 2015-02-25 10:27:11 -08:00
Ryan Huffman
14ec9b431e Update findRayRectangleIntersection to set out variable distance 2015-02-25 10:26:44 -08:00
Clément Brisset
b1e46c1bc8 Merge pull request from ZappoMan/crashonexit 
Fixes to various Crashes on shutdown
 2015-02-25 08:47:36 -08:00
ZappoMan
e87df0017a code review feedback 2015-02-25 08:26:54 -08:00
Clément Brisset
880c8f370f Merge pull request from birarda/master 
pass 10.9 SDK as CMAKE_OSX_SYSROOT
 2015-02-25 06:41:28 -08:00
Brad Hefta-Gaub
97e2e65cb3 Merge pull request from AndrewMeadows/bispinor 
lower threshold for ignoring rotation updates
 2015-02-24 20:13:22 -08:00
Brad Hefta-Gaub
0f4e098a61 Merge pull request from huffman/edit-ray-improvement 
Fix BillboardOverlay::findRayIntersection
 2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub
8c26be49d7 Merge pull request from huffman/edit-off-on-domain-change 
Turn editEntities off on domain change
 2015-02-24 20:11:39 -08:00
Brad Hefta-Gaub
8b47de3150 Merge pull request from Seefo/master 
Cleaned up warnings on Windows
 2015-02-24 20:08:56 -08:00
Brad Hefta-Gaub
9ded2699e2 Merge pull request from thoys/20364 
CR for Job  - Add toggle to turn off sounds in notifications.js
 2015-02-24 20:06:57 -08:00
ZappoMan
f1017f8a5d simplify waitTillDoneRunning 2015-02-24 17:45:22 -08:00
ZappoMan
310654831c clean up comments remove dead code 2015-02-24 17:34:19 -08:00
Andrew Meadows
0456cb298f lower threshold for ignoring rotation updates 
one hundred fold smaller
 2015-02-24 17:16:00 -08:00
ZappoMan
eab09eaf28 removed extra debugging 2015-02-24 17:15:58 -08:00
ZappoMan
25ae001d3b removed extra debugging 2015-02-24 17:05:44 -08:00
Ryan Huffman
eb21b74439 Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection 2015-02-24 17:01:24 -08:00
Ryan Huffman
be7959bbcd Fix BillboardOverlay findRayIntersection implementation 2015-02-24 17:00:55 -08:00
Ryan Huffman
03b10b6cb0 Add findRayRectangleIntersection 2015-02-24 17:00:30 -08:00
ZappoMan
9dcea38b2b tweak some debugging 2015-02-24 16:23:39 -08:00
ZappoMan
89f7f2da2e don't do idle process and painting if we're shutting down the application 2015-02-24 15:57:34 -08:00
ZappoMan
8757600a5e ifdef around massive debug output 2015-02-24 15:57:13 -08:00
ZappoMan
ca432a415f Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit 2015-02-24 15:33:41 -08:00
Stephen Birarda
e7e7323ff0 pass 10.9 SDK as CMAKE_OSX_SYSROOT 2015-02-24 15:00:41 -08:00