Brad Hefta-Gaub
7189f766a2
more hacking
2016-12-13 20:56:41 -08:00
Brad Hefta-Gaub
a7750501c6
first cut at adding view frustum support to avatar mixer
2016-12-13 18:58:11 -08:00
samcake
9155f11b3d
Merge pull request #9190 from jherico/test_mode
...
Add test mode to interface
2016-12-12 15:37:05 -08:00
Brad Davis
2a43f5fbef
Add test mode to interface
2016-12-12 14:51:11 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Bradley Austin Davis
3fcd45a236
Optimized method for transforming axis aligned bounding boxes
2016-12-08 10:59:14 -08:00
Brad Hefta-Gaub
b97012fc97
Merge pull request #9137 from jherico/msvc2015
...
Fixes for building on MSVC 2015 / Qt 5.8
2016-12-06 10:25:16 -08:00
Anthony J. Thibault
89ae3b3d6e
Revert "Merge pull request #8691 from highfidelity/out-of-body-experience"
...
This reverts commit efe9571ab8333e9ec7f4
2016-12-05 15:18:03 -08:00
Brad Davis
5cbf7588ac
Fixes for building on MSVC 2015 / Qt 5.8
2016-12-02 14:58:09 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Andrew Meadows
2bbe2be516
fix spelling: physcis --> physics
2016-12-01 10:50:10 -08:00
Brad Davis
a98e49c892
Fix build errors
2016-11-29 14:02:15 -08:00
Brad Davis
3b07e31eab
Working on OpenGL debuggability
2016-11-29 13:15:56 -08:00
samcake
9031e65aa5
Merge and fix the bug!!!
2016-11-16 19:12:56 -08:00
Chris Collins
44b2b090df
Merge pull request #9010 from samcake/orange
...
Improve Input Stage Format switching in GL45Backend
2016-11-16 14:00:17 -08:00
Ryan Huffman
75eafbb349
Add docs to Paths
2016-11-16 12:11:32 -08:00
Andrew Meadows
6bb3dd6830
Merge hifi/master into hifi/out-of-body-experience
2016-11-14 15:08:04 -08:00
samcake
b888af15e4
Fix merge
2016-11-14 11:15:27 -08:00
samcake
a05e42138c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-14 09:58:12 -08:00
Seth Alves
9868ddd602
global/static QStrings in plugins appear to cause crashes during shutdown
2016-11-13 10:22:14 -08:00
Clément Brisset
e38da75115
Merge pull request #9053 from huffman/feat/whitelist-ac-ip
...
Add AC ip address whitelist to domain server
2016-11-11 15:03:21 -08:00
Ryan Huffman
e1466c0d47
Fix NULL -> nullptr
2016-11-11 10:21:58 -08:00
samcake
00addcad9e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-10 17:57:34 -08:00
Chris Collins
5b91c8f32b
Merge pull request #8984 from sethalves/fix-setLocalJointRotation-name
...
fix names of model-entity joint setters
2016-11-10 13:39:14 -08:00
samcake
cab699464e
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-07 17:31:06 -08:00
Seth Alves
c8a654a915
Merge pull request #9006 from Atlante45/logging
...
Logging improvements
2016-11-07 13:35:13 -08:00
Andrew Meadows
ccdf383151
Merge hifi/master into hifi/out-of-body-experience
2016-11-07 08:24:26 -08:00
samcake
f274ef1a59
Merging back with upstream and trying to fix counter for them to be more stable
2016-11-04 16:56:03 -07:00
samcake
e12040a98a
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-11-04 14:54:18 -07:00
Brad Hefta-Gaub
2684aed523
Merge pull request #8995 from AndrewMeadows/avoid-zero-quaternion
...
normalize quaternions submitted to C++ from JS
2016-11-04 14:34:42 -07:00
Atlante45
ae29fe8ab2
Logging improvements
2016-11-04 14:26:19 -07:00
Seth Alves
727fe4bc21
Merge branch 'master' of github.com:highfidelity/hifi into fix-setLocalJointRotation-name
2016-11-04 10:04:56 -07:00
Andrew Meadows
4b623f72c3
compute correct volume for ellipsoid
2016-11-03 18:05:50 -07:00
Andrew Meadows
0d2cec290d
use convexHull for ellipsoidal "spheres"
2016-11-03 17:56:38 -07:00
Andrew Meadows
3ed3a74b7d
oops, don't forget to remove the sqrt
2016-11-03 17:08:42 -07:00
Andrew Meadows
c9c0b9ebc4
tighten rejection of zero-length quaternions
2016-11-03 17:01:09 -07:00
Andrew Meadows
757ec5fff4
normalize quaternions submitted from scriptland
2016-11-03 16:02:39 -07:00
Seth Alves
339d6a55cf
getLocalJointRotation getLocalJointTranslation, started on getLocalJointTranslation getLocalJointRotation
2016-11-03 10:06:07 -07:00
samcake
6926cd274c
Merge with upstream
2016-11-02 18:15:08 -07:00
samcake
3c777bb079
Clenaing up the detection phase to get all the iformation from DXGI
2016-11-02 12:29:51 -07:00
Seth Alves
844cc03dcb
fix names of model-entity joint setters
2016-11-02 10:24:01 -07:00
samcake
49f1590e01
Start detecting all the gpus
2016-11-01 16:51:57 -07:00
samcake
861944ba71
Try uing DXGI on windows instead of com
2016-11-01 11:12:47 -07:00
samcake
a23bbd1e4e
Trying to extend the memory counter
2016-10-31 16:40:15 -07:00
Seth Alves
f47aeae2a7
stop passing bare pointers to EntityTreeRenderer all around
2016-10-27 10:10:22 -07:00
Andrew Meadows
38e4ac0ae9
Merge master into out-of-body-experience
2016-10-26 16:59:31 -07:00
Seth Alves
3903a51062
fix a couple of crash-on-exits
2016-10-25 13:58:48 -07:00
Brad Hefta-Gaub
da0d1f1f13
Merge pull request #8896 from ZappoMan/i5SandboxHeartbeat
...
actually make the RunningMarker run on a different thread
2016-10-25 08:47:06 -07:00
Brad Hefta-Gaub
4cb693315f
CR feedback
2016-10-25 08:31:23 -07:00
Chris Collins
9846614468
Merge pull request #8879 from AndrewMeadows/show-physics-stats
...
add Bullet profile info to PerformanceTimer stats
2016-10-25 06:29:27 -07:00
