Andrew Meadows
6fb4e1f622
oops, need to update angularVelocity after damping
2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7
do not zero small velocities for non-bullet case
2015-01-05 12:01:09 -08:00
Andrew Meadows
21b2d14956
converting existing JS scripts to use new damping
...
Old formula the scripts were using: v *= damping
So a value of 0.999 was "little damping" and a value of 0.001 was "very strong damping",
but now that is reversed.
New formula: v *= (1 j- damping)^dt
A damping value of 0.001 now means "very little damping"
and a value of 0.999 means "very strong damping".
2015-01-05 11:25:15 -08:00
Andrew Meadows
3b7770f405
change meaning of damping to agree with bullet
...
0 = no damping
1 = 100% damping
The new formula is: velocity *= (1 - damping)^dt
2015-01-05 11:23:01 -08:00
Andrew Meadows
d032eab0de
merge upstream/master into andrew/inertia
2015-01-05 09:19:37 -08:00
Andrew Meadows
30200ef7eb
add damping to ObjectMotionState
2015-01-05 09:17:46 -08:00
Philip Rosedale
315b932445
Merge pull request #4038 from ZappoMan/hydraHands
...
Make Hydra hands go neutral when resting on base.
2015-01-04 12:31:59 -08:00
Brad Hefta-Gaub
89e499a78f
only active sixsense palms
2015-01-04 12:26:30 -08:00
Philip Rosedale
218ae9c9d8
Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity
2015-01-04 12:12:57 -08:00
Philip Rosedale
a01ab38f1b
Merge pull request #4029 from Atlante45/new_glm_fix
...
Fix compile error with new glm version
2015-01-04 11:26:37 -08:00
Philip Rosedale
e16fa465f6
Merge pull request #4037 from highfidelity/revert-4015-master
...
Revert "Hydra hands deactivate when placed back on controller base"
2015-01-03 21:15:14 -08:00
Philip Rosedale
fefcdfa9f6
Revert "Hydra hands deactivate when placed back on controller base"
2015-01-03 21:03:23 -08:00
Philip Rosedale
9837521fc6
Merge pull request #4033 from ZappoMan/bugFix
...
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 16:13:58 -08:00
ZappoMan
139f96c8b0
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977
Merge pull request #4032 from Atlante45/uninitialized_entity_members
...
Initialize entities' _locked and _script
2015-01-02 14:01:55 -08:00
Philip Rosedale
1563b7ea0a
Merge pull request #4031 from samcake/tot
...
Simpler shadows only casted by the Avatar + make it work with lighlmpped surfaces
2015-01-02 13:52:33 -08:00
Atlante45
022beff569
Initialize entities' _locked and _script
2015-01-02 12:37:00 -08:00
Sam Gateau
0169d82fff
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-02 12:16:17 -08:00
Sam Gateau
46ab4833be
applying the shadowing improvment to the cascaceded path shader and cleaning the code
2015-01-02 12:12:41 -08:00
Philip Rosedale
90cf9acef1
Merge pull request #4030 from huffman/220-position
...
Update inWorldTestTone.js to play in front of avatar
2015-01-02 11:48:48 -08:00
Ryan Huffman
cf04c3313a
Update inWorldTestTone.js to play in front of avatar
2015-01-02 11:43:41 -08:00
Sam Gateau
fe371730e3
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-02 11:30:16 -08:00
Sam Gateau
24d39f4453
refining the shadowing
2015-01-02 11:29:54 -08:00
Sam Gateau
ef7c002237
Improving the shadow effect with lightmaps
2015-01-02 10:31:34 -08:00
Philip Rosedale
8fb0ed17b7
Merge pull request #4028 from huffman/disable-camera-tool
...
Disable camera tool temporarily
2015-01-02 09:35:04 -08:00
Andrew Meadows
0d3e78fdb8
modify extrapolation behavior when bullet enabled
...
Allows Bullet to specify an object as "at rest"
by setting velocity to zero.
Also, moved velocity damping above position integration
to get the same order of operations as Bullet.
2014-12-31 16:32:09 -08:00
Atlante45
b1f0ec8dfb
Fix compile error with new glm version
2014-12-31 15:49:56 -08:00
Ryan Huffman
50bbeae30b
Disable camera tool temporarily
2014-12-31 15:40:11 -08:00
Sam Gateau
02949dbc5a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2014-12-31 10:59:42 -08:00
Philip Rosedale
bd88e0f38d
Merge pull request #4026 from ZappoMan/entityScriptsAndEvents
...
evaluate entity scripts in a sandbox before constructing
2014-12-31 10:44:55 -08:00
Brad Hefta-Gaub
eaa6d4455d
Merge pull request #4024 from samcake/temp1
...
Moving deferred lighting shaders from the resource folder to embedded source in the executable
2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa
Merge pull request #4007 from AndrewMeadows/inertia
...
Bullet physics part 1
2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub
d47b0a33ea
Merge pull request #3995 from huffman/camera-display
...
Camera tool - orientation + mode display
2014-12-31 10:32:31 -08:00
Ryan Huffman
7478b631da
Move write lock in Overlays::overlayDrawOnChanged to encompass reads
2014-12-31 10:16:29 -08:00
Ryan Huffman
5caec4dea5
Update overlays to handle updates in drawOnHUD after creation
2014-12-31 10:15:15 -08:00
ZappoMan
eb28efa648
evaluate entity scripts in a sandbox before constructing
2014-12-31 09:58:18 -08:00
Sam Gateau
e1a295fb37
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f
Merge pull request #4023 from PhilipRosedale/master
...
Torso twists to follow head, fix bug with head rotations
2014-12-31 08:01:39 -08:00
Philip Rosedale
104f7b7576
make formula more readable
2014-12-30 20:34:12 -08:00
Sam Gateau
ae6ccf1a7d
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-12-30 17:56:08 -08:00
Sam Gateau
4fb9e9c775
cleaning the code
2014-12-30 17:55:49 -08:00
Sam Gateau
8d95639416
moving the deferrered shaders from the resource folder to built-in the executable
2014-12-30 17:43:52 -08:00
Sam Gateau
37017d0c16
moving the deferrered shaders from the resource folder to built-in the executable
2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a
only twist own body, remove unused head functions
2014-12-30 17:02:53 -08:00
Philip Rosedale
98cbb2355f
Merge branch 'master' of https://github.com/worklist/hifi
2014-12-30 17:00:38 -08:00
samcake
20d66d201e
Merge pull request #4020 from ZappoMan/gpuStreamizing
...
Improvements to GeometryCache::renderQuad()
2014-12-30 16:49:16 -08:00
Philip Rosedale
4f06c271c0
Merge pull request #4022 from ZappoMan/animationFrameIndex
...
fix one more case of animaiton stutter
2014-12-30 15:47:19 -08:00
Philip Rosedale
4e31d7a650
Merge pull request #4021 from ZappoMan/removeHair
...
Haircut at Philip's request
2014-12-30 15:41:53 -08:00
Philip Rosedale
b76f5bf272
Merge branch 'master' of https://github.com/worklist/hifi
2014-12-30 15:41:06 -08:00
Ryan Huffman
3bfc298349
Remove extraneous getDrawonHUD call
2014-12-30 15:31:08 -08:00
