Brad Davis
b5cba79f0c
Merge pull request #7095 from ZappoMan/hmdHacking
...
Various bug fixes in related to HMD overlay support
2016-02-12 17:50:42 -08:00
Brad Hefta-Gaub
e003fe5f4b
Merge pull request #7081 from zzmp/fix/mini-mirror-ao
...
Disable AO in mini mirror
2016-02-12 17:37:45 -08:00
Andrew Meadows
6baf181453
Merge pull request #7093 from hyperlogic/tony/input-poses-in-avatar-space
...
Controller Pose values are relative to Avatar.
2016-02-12 17:13:36 -08:00
Brad Hefta-Gaub
d85a8a4fb9
Merge pull request #7103 from jherico/render-rate
...
Don't drop to half the vsync rate when we can't keep up
2016-02-12 17:11:03 -08:00
Andrew Meadows
33d49fecaf
Merge pull request #7085 from kencooke/master
...
Added AVX detection for Mac/Linux
2016-02-12 16:50:36 -08:00
Chris Collins
8317914070
Merge pull request #7097 from jherico/menuCleanup
...
Don't leave user data pointers around in objects after deletion
2016-02-12 16:12:20 -08:00
Brad Hefta-Gaub
1c2096bc30
remove some unrelated whitespace changes
2016-02-12 16:09:51 -08:00
Brad Davis
908e153c36
Don't drop to half the vsync rate when we can't keep up
2016-02-12 15:57:27 -08:00
Eric Levin
921674b952
Merge pull request #7101 from ZappoMan/fixDoublePreload
...
fix error in preload logic
2016-02-12 15:35:59 -08:00
Brad Hefta-Gaub
98aaf02030
Merge pull request #7098 from zzmp/fix/model-texture-delta
...
Update NetworkMaterial maps when changing textures
2016-02-12 15:16:17 -08:00
Brad Hefta-Gaub
9160758af7
make sure forced reload still works
2016-02-12 15:09:50 -08:00
Brad Hefta-Gaub
550b9a98b1
fix error in preload logic
2016-02-12 14:45:55 -08:00
Zach Pomerantz
d21f9d555a
Update NetworkMaterial maps when changing textures
2016-02-12 12:37:07 -08:00
Brad Davis
28f3e8ba9c
Don't leave user data pointers around in objects after deletion
2016-02-12 12:07:23 -08:00
Anthony Thibault
7d400623be
Merge pull request #7096 from howard-stearns/fix-lookAt
...
Fix Quat.lookAt
2016-02-12 12:01:19 -08:00
Andrew Meadows
1e29faf365
Merge pull request #7090 from ZappoMan/fixOctreeBag
...
move back to unordered_set so that OctreeElementBag will handle uniqueness
2016-02-12 11:22:46 -08:00
Brad Hefta-Gaub
1160ecb335
improvements in HMD UI behavior
2016-02-12 10:51:33 -08:00
samcake
ef92a52777
Merge pull request #7051 from zzmp/feat/graphics-dialog
...
Move graphics settings to a new dialog
2016-02-12 10:46:00 -08:00
Howard Stearns
80baa5ce18
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-lookAt
2016-02-12 10:39:31 -08:00
Howard Stearns
874f74de04
Fix Quat.lookAt
2016-02-12 10:38:50 -08:00
Seth Alves
5659589ea1
Merge pull request #7088 from birarda/offline-domain
...
fix STUN failover for offline machines
2016-02-12 09:16:20 -08:00
Zach Pomerantz
d516e9da78
Only run AO in DEFAULT_RENDER_MODE
2016-02-12 09:01:54 -08:00
Brad Hefta-Gaub
477dfe1b10
use std::unordered_map<> instead of std::unordered_set<>
2016-02-11 20:42:42 -08:00
Zach Pomerantz
232f06e175
Avoid unnecessary TaskConfig dtor
2016-02-11 17:29:18 -08:00
Anthony J. Thibault
111ed65bf8
Controller Pose values are relative to Avatar.
...
Pass a InputCalibrationData to each inputPlugin and inputDevice.
This contains the most up sensorToWorldMatrix, avatarMat and hmdSensorMatrix.
Each input plugin can use this data to transform it's poses into Avatar space
before sending it up the chain.
This fixes a bug in the handControllerGrab.js script that relied on the hand controller
rotation/positions being in the avatar frame.
2016-02-11 17:18:01 -08:00
Ken Cooke
aef770fcba
fix typo
2016-02-11 16:39:23 -08:00
Ken Cooke
a712222370
fix typos
2016-02-11 16:33:13 -08:00
Ken Cooke
8a49c4b833
use cpuid.h on both GCC and Xcode
2016-02-11 16:09:04 -08:00
James B. Pollack
2889bdd8b2
Merge pull request #7083 from ZappoMan/fixDoublePreload
...
handle two corner cases where preload would get called twice
2016-02-11 16:08:43 -08:00
Andrew Meadows
b6456889ef
Merge pull request #7050 from Atlante45/fix/audio-stats
...
Fix audio stats
2016-02-11 15:56:45 -08:00
Ken Cooke
c4b09c3603
not supported by Clang
2016-02-11 15:15:50 -08:00
Seth Alves
89b85f3a78
Merge pull request #7087 from AndrewMeadows/crash-fix
...
yet another attempt to avoid physics crashes
2016-02-11 14:58:57 -08:00
Brad Hefta-Gaub
26ab1bdac4
move back to unordered_set so that OctreeElementBag will handle uniqueness
2016-02-11 14:50:18 -08:00
Stephen Birarda
a6ba8dd8e5
fix null STUN server socket check in LNL
2016-02-11 14:14:16 -08:00
Andrew Meadows
2b91a31919
check for nullptr to avoid crashes
2016-02-11 13:53:01 -08:00
Chris Collins
c6bc91f8b2
Merge pull request #7084 from jherico/toolTabs
...
Allow closed tabs to delete properly
2016-02-11 13:20:20 -08:00
Chris Collins
ca15638463
Merge pull request #7080 from ZappoMan/fixPersistMono
...
add support for persisting the mono preview mode option
2016-02-11 13:03:49 -08:00
Ken Cooke
27494e54c5
use the correct macro for detecting GCC
2016-02-11 12:58:23 -08:00
Zach Pomerantz
d0f3ad75b8
Nest Persistent in Config to compile on nix
2016-02-11 10:27:32 -08:00
Brad Davis
2ee1f18e06
Allow closed tabs to delete properly
2016-02-11 10:27:24 -08:00
Chris Collins
a4afa03fe5
Merge pull request #7077 from sethalves/clean-up-grab-signaling
...
Clean up grab signaling + various fixes
2016-02-11 10:20:56 -08:00
Zach Pomerantz
a7778daed2
Change graphics dialog to persisted dropdowns
2016-02-11 10:15:13 -08:00
Zach Pomerantz
84197e5eb2
Add persistent render engine configuration file
2016-02-11 10:00:44 -08:00
Zach Pomerantz
66e1d9668c
Add ComboBox preference
2016-02-11 10:00:44 -08:00
samcake
99e9b3ecdd
Merge pull request #7043 from zzmp/fix/render-ui
...
Revamp the render engine ui
2016-02-11 09:57:51 -08:00
Atlante45
51168a8a29
Explicitely cast to float
2016-02-11 09:35:31 -08:00
Brad Hefta-Gaub
a40a562db2
handle two conner cases where preload would get called twice
2016-02-11 09:33:52 -08:00
Clément Brisset
c3218a3af9
Merge pull request #7069 from AndrewMeadows/another-crash-fix
...
Fix crash when propagating simulation ownership on deleted objects
2016-02-11 09:29:08 -08:00
Zach Pomerantz
3bace3cdbb
Rework the qml for brevity
2016-02-11 08:48:01 -08:00
Zach Pomerantz
86412c1890
Fix default debug buffer size
2016-02-11 08:47:59 -08:00
