Stephen Birarda
320429fd1e
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-17 14:15:05 -07:00
Stephen Birarda
4758dd2a53
correct locking races in SendQueue/Connection cleanup
2015-09-17 14:13:24 -07:00
Brad Hefta-Gaub
58e0625192
Merge pull request #5824 from jherico/marge
...
Debug Oculus plugin for performance testing
2015-09-17 11:46:26 -07:00
Brad Hefta-Gaub
5549f4ec40
Merge pull request #5821 from ericrius1/paintCan
...
Paint can tweaks
2015-09-17 11:37:44 -07:00
Ryan Huffman
f099e17f43
Merge pull request #5823 from birarda/master
...
guard a perpetual AC domain connection if the NL thread is locked
2015-09-17 09:40:52 -07:00
Stephen Birarda
fb38fd05ed
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-09-17 09:37:29 -07:00
Brad Davis
5ba6242bda
Support a debug oculus plugin for performance testing
2015-09-16 19:55:57 -07:00
Howard Stearns
5eef0e21ad
Merge pull request #5826 from AndrewMeadows/ik-repairs-000
...
prevent initial bad IK targets for hands
2015-09-16 18:49:46 -07:00
Seth Alves
da74d4b1e1
Merge pull request #5830 from ZappoMan/entityScriptsReload
...
add reload all support for entity scripts
2015-09-16 17:09:07 -07:00
Brad Hefta-Gaub
b645d99412
CR feedback
2015-09-16 17:07:12 -07:00
Andrew Meadows
e1fc1900ab
remove IK 'flutter' bug
2015-09-16 17:02:12 -07:00
Andrew Meadows
d4ea661aca
cleanup whitespace
2015-09-16 17:02:12 -07:00
Andrew Meadows
9a86fc2e62
build local list of IK targets every frame
2015-09-16 17:02:12 -07:00
Andrew Meadows
089c719612
minor cleanup
2015-09-16 17:02:12 -07:00
Howard Stearns
e9265ebec2
Merge pull request #5828 from hyperlogic/tony/anim-bug-fixes
...
AnimController bug fixes and rename to AnimManipulator
2015-09-16 16:59:41 -07:00
Brad Hefta-Gaub
2021a15527
fix white space
2015-09-16 16:54:21 -07:00
Brad Hefta-Gaub
fa6396bbfa
fix white space
2015-09-16 16:53:20 -07:00
Brad Hefta-Gaub
7840f122dc
add reload all support for entity scripts
2015-09-16 16:46:46 -07:00
Brad Hefta-Gaub
009633f281
Merge pull request #5829 from samcake/HMDLightingBug
...
Fixing the disappearing local lights
2015-09-16 16:19:21 -07:00
Sam Gateau
882ca5d6c0
Fix the lights not rendering roperly
2015-09-16 15:57:35 -07:00
Anthony J. Thibault
5aeebba90e
Renamed AnimController to AnimManipulator, Removed offsets on IK targets
2015-09-16 15:49:47 -07:00
Brad Hefta-Gaub
0a41ab2f41
Merge pull request #5827 from jherico/homer
...
fix ScriptEngine location property
2015-09-16 15:19:54 -07:00
Anthony J. Thibault
fae4b08eb0
AnimController Node Bug fixes
...
AnimController: proper support for alpha
AnimController: bug fix for translation.
AnimOverlay: renamed local var when building hand boneSets from head to hand.
2015-09-16 15:11:53 -07:00
Brad Davis
cbb8bee962
Trying to fix ScriptEngine location property
2015-09-16 15:00:24 -07:00
ericrius1
bbf6e8b599
using relative paths for entity scripts
2015-09-16 13:52:29 -07:00
Sam Gateau
e995b20220
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-16 13:46:52 -07:00
Seth Alves
4711c18f36
Merge pull request #5822 from birarda/missing-jl-agent
...
add back the missing JurisdictionListener to headless Agent
2015-09-16 13:02:20 -07:00
Stephen Birarda
cc8ad868b8
don't parent DS timer to object in another thread
2015-09-16 12:27:57 -07:00
Stephen Birarda
500a96ee7c
guard perpetual AC domain connection if NL thread locked
2015-09-16 12:25:03 -07:00
Stephen Birarda
229e73f88c
protect the agent from null timers in avatar stop
2015-09-16 11:52:05 -07:00
Stephen Birarda
bca00db4a8
use unique_ptr for Agent ScriptEngine
2015-09-16 11:48:15 -07:00
Stephen Birarda
5df7ce7424
fix for missing jurisdiction listener in Agent
2015-09-16 11:43:54 -07:00
Philip Rosedale
b968911fcc
Merge pull request #5820 from kencooke/audio-fix
...
fix audio int16_t to float scaling
2015-09-16 10:26:36 -07:00
Stephen Birarda
13728a7a96
Merge pull request #5806 from Atlante45/as_caching
...
Asset Server caching
2015-09-16 10:06:40 -07:00
Anthony Thibault
2141eadfa8
Merge pull request #5816 from howard-stearns/stability
...
Get rid of avatar tilt
2015-09-16 10:05:15 -07:00
ericrius1
0b21cc1777
paint can tweaks
2015-09-16 09:59:35 -07:00
Sam Gateau
a6ca9f88cc
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-16 09:52:32 -07:00
Ken Cooke
def24a15ad
fix audio int16_t to float scaling
2015-09-16 09:00:41 -07:00
Atlante45
88d073b4ac
More disk cache debug info
2015-09-16 15:20:48 +02:00
Atlante45
dd0244b15d
Added a couple comments
2015-09-16 15:17:15 +02:00
Atlante45
9678e70444
Asset caching
2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a
Enum coding standard
2015-09-16 15:17:14 +02:00
Howard Stearns
9fa20207ab
Merge pull request #5818 from hyperlogic/tony/left-hand-point-and-grab
...
Updated left hand point and grab State Machine and animations
2015-09-15 19:35:41 -07:00
Philip Rosedale
2846381396
Merge pull request #5817 from sethalves/hand-controller-adjustment
...
if the intersection distance is small, use grab-mode rather than distant-grab-mode
2015-09-15 18:41:42 -07:00
Brad Davis
f35ffd2ab7
Merge pull request #5814 from samcake/HMDLightingBug
...
Fixing HMD and stereo lighting bug
2015-09-15 18:10:26 -07:00
Sam Gateau
08546fcc08
Merge branch 'master' of https://github.com/highfidelity/hifi into HMDLightingBug
2015-09-15 18:07:26 -07:00
Sam Gateau
80d25a68b6
Bringing back the eyeView per side to the deferred transform stack
2015-09-15 18:05:15 -07:00
Anthony J. Thibault
70f5835278
Updated left hand point and grab State Machine and animations
2015-09-15 18:00:13 -07:00
Sam Gateau
5410bc0945
FIx the review comment and trying to fix the simple stereo display plugin projection and eye view matrix
2015-09-15 17:48:55 -07:00
Stephen Birarda
62de828493
Merge pull request #5815 from ZappoMan/entityServerCrashes
...
couple of entity server corner cases
2015-09-15 17:21:36 -07:00
