James B. Pollack
9a3a87eedf
improve velocity calculations for wand
2015-09-18 10:03:21 -07:00
James B. Pollack
8a7798fcd7
disable bubble particle burst until i know the right for an entity to watch and see if it is deleted.
2015-09-17 22:00:44 -07:00
James B. Pollack
5ac084ad4f
Randomize bubble gravity, code cleanup
2015-09-17 20:57:07 -07:00
James B. Pollack
df0b9e7dbb
refactor bubble wand to prevent duplicate bubbles
2015-09-17 15:59:19 -07:00
James B. Pollack
75df4e96e8
cleanup
2015-09-16 18:48:06 -07:00
James B. Pollack
a8fe3b3edd
keep the bubble with the wand, make the wand smaller
2015-09-16 18:08:56 -07:00
James B. Pollack
9aa2067e3e
cleanup unused reset stuff
2015-09-16 17:26:18 -07:00
James B. Pollack
e1e567b1b5
remove mouth mode
2015-09-16 17:09:54 -07:00
James B. Pollack
3e7cc7d6eb
remove sounds from bubble
2015-09-16 17:02:52 -07:00
James B. Pollack
5ab8f19257
fix merge leftovers
2015-09-16 16:42:23 -07:00
James B. Pollack
c2d5483da6
Merge branch 'bubblewand_hotfix_2' of https://github.com/imgntn/hifi into bubblewand_hotfix_2
2015-09-16 16:32:23 -07:00
James B. Pollack
455ed27c2b
pre-test with eric
2015-09-16 16:26:09 -07:00
James B. Pollack
f3c1ca8220
Merge remote-tracking branch 'highfidelity/master'
2015-09-16 10:59:39 -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
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
James Pollack
37f45b57ff
wand updates
2015-09-15 18:40:54 -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
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
Brad Hefta-Gaub
54972515dc
make sure timer is owned
2015-09-15 17:04:40 -07:00
Sam Gateau
8ab96fe907
Bringin back full screen for stereo mode
2015-09-15 17:02:30 -07:00
Seth Alves
f7193dbb97
if the intersection distance is small, use grab-mode rather than distant-grab-mode
2015-09-15 16:55:51 -07:00
Sam Gateau
f00e3829f1
Cleaning for PR
2015-09-15 16:54:04 -07:00
Brad Hefta-Gaub
0aed08a006
more robust handling of readConfiguration
2015-09-15 16:52:15 -07:00
Howard Stearns
f6b5f3925a
Place head at requested position in all modes. (At least, until we can figure out how to get underpose position cleanly without tilt.)
2015-09-15 16:43:52 -07:00
Brad Hefta-Gaub
4a24a3767b
couple of entity server corner cases
2015-09-15 16:17:05 -07:00
Brad Hefta-Gaub
22b979a663
couple of entity server corner cases
2015-09-15 16:02:22 -07:00
Howard Stearns
848bb4fccb
Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines
...
Added point and grab support to the AnimGraph
2015-09-15 15:47:19 -07:00
Ryan Huffman
8c3d8bc7de
Merge pull request #5809 from birarda/phrc
...
timing fixes for default time_point on windows
2015-09-15 15:29:30 -07:00
Sam Gateau
7b8e11e01c
Debugging, looking good, no ready for final lighting
2015-09-15 15:22:45 -07:00
Anthony J. Thibault
f13c839f4a
Removed comment
2015-09-15 15:19:11 -07:00
Stephen Birarda
8454cb916c
avoid branching by using %= operator
2015-09-15 15:15:26 -07:00
Anthony J. Thibault
1948829ca8
Improved state machine for right hand.
...
The hand state machine has the following features
* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.
Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
2015-09-15 15:09:08 -07:00
Sam Gateau
dc8756e465
Need to pull master, just updated all the deferred shaders to use scribe func declare blocks to avoid long shaders... didn;t validate the current clip to eye position evaluation
2015-09-15 14:40:23 -07:00
Philip Rosedale
e04f89280d
Merge pull request #5812 from sethalves/grab-controller-adjustment
...
Grab controller adjustment
2015-09-15 13:29:07 -07:00
Brad Davis
4c0a21f3d2
Merge pull request #5811 from ZappoMan/scriptEngineCleanup
...
Rework the ScriptEngine shutdown process, Fix crash in AC Scripts
2015-09-15 13:23:40 -07:00
Brad Hefta-Gaub
016a5e5f0a
cleanup comments
2015-09-15 11:52:07 -07:00
Brad Hefta-Gaub
41caa36038
removed some debug code
2015-09-15 11:50:10 -07:00
Seth Alves
e650e40388
try harder to have line rezzed when it's needed. don't ignore entities that are too close when doing line intersection
2015-09-15 11:32:56 -07:00
Brad Hefta-Gaub
bdae3e420b
fix crash in AC
2015-09-15 11:24:04 -07:00
