James B. Pollack
d5a28565ce
end of day
2016-02-16 18:33:54 -08:00
James B. Pollack
af91a06897
cleanup
2016-02-16 17:26:18 -08:00
James B. Pollack
355f25bb8f
updatez
2016-02-16 17:25:56 -08:00
James B. Pollack
979c2feeb0
tiltmaze
2016-02-16 12:49:28 -08:00
Brad Hefta-Gaub
376c23f1a3
Merge pull request #7100 from imgntn/edit_props
...
Hide hyperlink property for web entities
2016-02-12 18:29:35 -08:00
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
48fe638312
Merge pull request #7104 from howard-stearns/update-orbitingSound
...
update-orbitingSound.js
2016-02-12 17:44:47 -08:00
Brad Hefta-Gaub
c699c828cd
Merge pull request #7092 from birarda/assets-abs-path
...
add setting to DS for asset path, handle absolute paths
2016-02-12 17:43:23 -08:00
Howard Stearns
9a3972c43f
wait for sound to download
2016-02-12 17:42:44 -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
Brad Davis
df225afd05
PR feedback
2016-02-12 16:25:46 -08:00
Brad Hefta-Gaub
df6437236e
some CR feedback
2016-02-12 16:13:12 -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
Howard Stearns
25671fbefe
Update orbitingSound.js to use a sample file that exists and setOptions function.
2016-02-12 16:01:23 -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
Andrew Meadows
2f2d1b5d22
Merge pull request #7076 from birarda/integrate-new-hrtf
...
use injector not mixed count for inactivity
2016-02-12 15:14:53 -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
James B. Pollack
c469fc6a29
hide hyperlink property for web entities
2016-02-12 14:30:21 -08:00
Chris Collins
3321265ae7
Merge pull request #7086 from howard-stearns/clear-away-on-buttons
...
Clear pause/away on controller button press
2016-02-12 12:56:42 -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
Andrew Meadows
31f9da2dcb
Merge pull request #7094 from sethalves/fix-attachment-manager
...
fix some things I broke yesterday
2016-02-12 09:40:52 -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
Seth Alves
94bc1764a8
fix auto-updating of adjustments to worn or equipped entities
2016-02-12 06:58:44 -08:00
Seth Alves
ca5525cc3f
if an entity already was near-picked, don't do a distance-to-center check on it.
2016-02-12 06:58:14 -08:00
Brad Hefta-Gaub
477dfe1b10
use std::unordered_map<> instead of std::unordered_set<>
2016-02-11 20:42:42 -08:00
Anthony J. Thibault
8bde897cee
Application: removed unused myAvatar local variable.
2016-02-11 18:14: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
Seth Alves
90d81bc17b
Merge pull request #7091 from jherico/overlayCrash
...
Prevent overlay cleanup from crashing the app
2016-02-11 16:26:07 -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
Stephen Birarda
27d338e81c
make any asset path relative to assets dir
2016-02-11 15:49:13 -08:00
