David Rowe
16346dd717
Fix some build warnings
2015-09-06 16:20:46 -07:00
Brad Hefta-Gaub
1df3a8f814
Merge pull request #5727 from jherico/marge
...
Procedural rendering for box & sphere entities
2015-09-05 12:43:21 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
Anthony Thibault
083c5b6738
Merge pull request #5721 from howard-stearns/default-avatar-for-animations
...
avatar animation defaults
2015-09-04 17:06:53 -07:00
Howard Stearns
086afc47b1
Avatar animations on by default. (Using the now old animation machinery.)
...
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
2015-09-04 14:24:37 -07:00
Brad Hefta-Gaub
21afafd4e6
fix hold action with zero offsetLength
2015-09-04 14:07:12 -07:00
Anthony J. Thibault
5882ec02d0
Merge branch 'master' into ajt/new-anim-system
2015-09-04 11:05:29 -07:00
Anthony J. Thibault
3f258c89b4
Fix transition from AG+Rig to AG only.
2015-09-04 11:03:59 -07:00
Andrew Meadows
5d40517edd
Merge pull request #5706 from sethalves/polyvox-again
...
Polyvox improvements
2015-09-04 10:32:36 -07:00
Seth Alves
1b92ae95d7
put glm:: before vec3
2015-09-04 09:41:53 -07:00
Seth Alves
8c3bea6d0d
Merge pull request #5713 from AndrewMeadows/flerovium
...
fix collision shape of avatars
2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a
Merge branch 'master' into ajt/new-anim-system
2015-09-04 09:27:02 -07:00
Seth Alves
72322c0270
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-04 09:12:32 -07:00
Brad Hefta-Gaub
762bed8223
Merge pull request #5715 from jherico/apu
...
Fix mirror to display on Oculus
2015-09-04 09:06:40 -07:00
Brad Hefta-Gaub
20bd14c8db
Merge pull request #5684 from rabedik/fxaa
...
Post-process anti-aliasing effect
2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
127271110c
Merge pull request #5714 from jherico/lisa
...
Magballs polish
2015-09-04 08:48:15 -07:00
Seth Alves
fff3da0cc3
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-04 07:17:01 -07:00
Raffi Bedikian
6b2897ca8f
Fix AA bugs with display plugins and mini-mirror
2015-09-03 23:11:53 -07:00
Brad Davis
4a28361e05
Fix mirror to display on Oculus
2015-09-03 22:12:21 -07:00
Brad Davis
0f70797ab4
Merge pull request #5711 from ZappoMan/fixEntityScriptIncludes
...
fix a bug in entity script includes and file based includes on windows
2015-09-03 21:21:42 -07:00
Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
Anthony J. Thibault
3716d5612b
Merge branch 'master' into ajt/new-anim-system
2015-09-03 19:20:06 -07:00
Anthony J. Thibault
dcecd7b73a
Added hysteresis to the state machine for turning and moving states.
...
This should help a bit with the jerkiness, as state transitions
occur less often due to noise or the user straddling the boundary
between two states.
2015-09-03 19:13:39 -07:00
Brad Hefta-Gaub
b0f239b89d
also make sure local file includes work for non-entity scripts
2015-09-03 19:06:26 -07:00
Andrew Meadows
16dfc39f5f
fix collision shape of avatars
2015-09-03 18:22:35 -07:00
Brad Hefta-Gaub
063320771c
fix a bug in entity script includes and file based includes on windows
2015-09-03 16:37:24 -07:00
Seth Alves
e12b7807ad
merge from upstream
2015-09-03 16:36:04 -07:00
Howard Stearns
41daea7d92
Merge pull request #5710 from sethalves/fix-stuck-avatars
...
Fix stuck avatars
2015-09-03 16:26:07 -07:00
Seth Alves
218521fc02
put AVATAR_MIN_ROTATION_DOT back to previous value
2015-09-03 16:08:46 -07:00
Seth Alves
0c8848a463
don't update _lastSendJointData if we didn't send
2015-09-03 15:41:40 -07:00
Brad Hefta-Gaub
3984dc9ecd
Merge pull request #5682 from jherico/bart
...
Add common vector constants to JS, add some missing Quat functionality
2015-09-03 14:51:02 -07:00
Anthony J. Thibault
85cb503152
Made Enable Anim Graph menu option dynamic.
...
It will load the anim graph when enabled and destroy
the anim graph when disabled.
2015-09-03 14:46:44 -07:00
Seth Alves
1071b98260
fix differential avatar-joint sending to work if more than 2 avatars are in the domain
2015-09-03 14:38:46 -07:00
Seth Alves
36ca789d92
fix differential avatar-joint sending to work if more than 2 avatars are in the domain
2015-09-03 14:08:04 -07:00
Brad Davis
8dc3905767
Add common vector constants to JS, add some missing quaternion functionality
2015-09-03 11:51:35 -07:00
Seth Alves
07b241c778
code review
2015-09-03 11:05:44 -07:00
Andrew Meadows
cd1dac50ad
Merge pull request #5687 from howard-stearns/delete-collision-sounds-after-use
...
Delete collision sounds (and their threads) after use.
2015-09-03 09:59:02 -07:00
Seth Alves
bb96ad1346
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-03 09:38:58 -07:00
Anthony J. Thibault
30264e9c3d
Added animation debug draw items to menu.
...
* Debug Draw Bind Pose - used to display the current avatar's bind pose
* Debug Draw Animation - used to display the current avatar's AnimGraph animation.
Currently does not work with old animation so it's only valid when Enable Anim Graph is true.
* Draw Mesh - used to hide or display the avatar mesh.
2015-09-02 21:04:29 -07:00
Anthony J. Thibault
471400e595
Fix for jerky behavior when positionDelta is zero.
...
This can occur with vsync disabled. Possibly due to two avatar updates occurring
within a single physics time-step.
2015-09-02 19:59:05 -07:00
Brad Davis
2901155a7b
Fix Oculus mirroring to window
2015-09-02 18:28:44 -07:00
Brad Davis
1f83d04423
Fix oculus crash on switching display plugin to something else
2015-09-02 18:28:43 -07:00
Brad Hefta-Gaub
b199e9e593
Merge pull request #5703 from jherico/marge
...
Support HTML colors in overlays
2015-09-02 17:58:44 -07:00
Anthony J. Thibault
de31b92fd5
Merge branch 'master' into ajt/new-anim-system
2015-09-02 17:53:56 -07:00
Anthony J. Thibault
46b3a7fd23
Improved default avatar.json state machine.
...
Now triggers 7 states.
Idle, WalkFwd, WalkBwd, StrafeLeft, StrafeRight, TurnLeft & TurnRight.
As well as variable speed walking to match current velocity.
2015-09-02 17:28:06 -07:00
Seth Alves
f20ce12091
Merge branch 'test-5685' of github.com:sethalves/hifi into polyvox-again
2015-09-02 16:30:55 -07:00
Seth Alves
f1bb7fb67f
Merge branch 'master' of github.com:highfidelity/hifi into polyvox-again
2015-09-02 16:30:48 -07:00
Seth Alves
2fe6e9c317
use AABox's ray intersection code rather than the goofed-up version that was here
2015-09-02 16:30:11 -07:00
