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
James B. Pollack
a9ad18ec80
cleanup, comments, and consolidation.
2015-09-03 20:42:56 -07:00
Brad Davis
c8069ba73c
Working on magballs polish
2015-09-03 20:09:54 -07:00
Howard Stearns
c0fec44f32
Menu item to switch between threaded and not (without restart!).
2015-09-03 19:34:25 -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
James Pollack
1e9bac8dee
add create wand script, add offset to bubble spawn point so that it is at the end of the wand
2015-09-03 17:42:41 -07:00
James Pollack
cf0d236174
silence logging statements for now
2015-09-03 16:50:37 -07:00
James Pollack
80c18c227e
Attach the wand.js script to an entity and then move it around to make bubbles. Customize bubble behavior with bubble.js - make sure to update the path reference in wand.js
2015-09-03 16:42:14 -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
David Rowe
341e1dcf68
Add particleTest.js script to demo / test entity particle properties
2015-09-03 14:55:09 -07:00
David Rowe
2bc2582797
Fix missing entity property gets for velocity and acceleration spread
2015-09-03 14:55:09 -07:00
David Rowe
45ff118249
Add new radiusSpread entity particle property
2015-09-03 14:55:08 -07:00
Brad Davis
a8b5336e02
Merge pull request #5709 from ZappoMan/breakdanceToy
...
next wave of breakdance work
2015-09-03 14:55:04 -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
Brad Hefta-Gaub
cfdd1cd977
Merge pull request #5707 from ericrius1/grabMod
...
added userData manipulations to grab script
2015-09-03 14:46:38 -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
Brad Hefta-Gaub
44c554895d
next wave of breakdance work
2015-09-03 14:33:25 -07:00
ericrius1
ebe5818c84
relative path
2015-09-03 14:09:01 -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
Howard Stearns
32eb51d0fa
Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates
2015-09-03 13:55:57 -07:00
Howard Stearns
d53c1d0fba
Change default avatar collision sound.
...
Note that this only used when Interface.ini does not already have a setting, and the empty string is a valid setting.
To reset to default, either delete Interface.ini or the line in it that begins with collisionSoundURL=, or just set
Interface|Edit->Preferences->Avatar collision sound URL to
https://hifi-public.s3.amazonaws.com/sounds/Collisions-otherorganic/Body_Hits_Impact.wav
2015-09-03 13:22:04 -07:00
Andrew Meadows
a701ae0553
Merge pull request #5686 from jherico/homer
...
Use a constant log file
2015-09-03 12:03:06 -07:00
Brad Davis
8dc3905767
Add common vector constants to JS, add some missing quaternion functionality
2015-09-03 11:51:35 -07:00
ericrius1
fa42334430
added userData manipulations to grab script
2015-09-03 11:30:44 -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
Brad Davis
70ffe10057
Use a constant log file and rollover accumulated logs to a new file based on startup, time or size
2015-09-02 21:56:58 -07:00
Brad Hefta-Gaub
25673831c2
Merge pull request #5689 from jherico/lisa
...
Adding 'web3d' overlay type
2015-09-02 21:31:38 -07:00
Brad Hefta-Gaub
01b6bbe40f
Merge pull request #5697 from jherico/maggie
...
Fix oculus crash on switching display plugin to something else
2015-09-02 21:23:38 -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 Hefta-Gaub
e6f43d3dd7
Merge pull request #5702 from ericrius1/newGrab
...
update hydra grab to grab near and far objects, and removed grabbing…
2015-09-02 18:43:41 -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 Davis
b6ef2e314f
Adding 'web3d' overlay type
2015-09-02 18:25:49 -07:00
Brad Hefta-Gaub
0b12812ea4
Merge pull request #5705 from jherico/apu
...
OmniTool first pass
2015-09-02 18:16:03 -07:00
Brad Davis
5717b77837
Updating magballs to omnitool
2015-09-02 18:14:21 -07:00
Brad Davis
ea415071b4
OmniTool first pass
2015-09-02 18:14:13 -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
