James B. Pollack
8c4abd2a2d
Merge pull request #6847 from howard-stearns/tribbles
...
tribbles
2016-01-16 18:28:58 -08:00
James B. Pollack
28f1a86527
Merge pull request #6821 from ericrius1/whiteboardFix
...
Some fixes to whiteboard to get rid of gaps between lines and jagged …
2016-01-16 18:19:33 -08:00
James B. Pollack
3631db4e2d
Merge pull request #6845 from howard-stearns/render-matrix
...
render test script
2016-01-16 18:16:49 -08:00
Howard Stearns
1985aa9d77
Drops a bunch of "tribbles" (small spheres) in front of you.
...
They edit change color at 60hz and jump randomly at an average 1hz for 30 seconds, and then dissapear after 60 seconds.
Useful for testing the load of physical objects.
2016-01-16 13:26:39 -08:00
Howard Stearns
994d13df5a
A test script to confirm that the specified edit rate can be achieved for the specified number of objects.
2016-01-16 11:32:19 -08:00
Howard Stearns
63db6d0f72
A script to test rendering load by creating a rectangular matrix of the specified objects, with no physical or entity changes after creation, either in front of you or overhead.
2016-01-16 11:17:13 -08:00
Philip Rosedale
210b3ba1ec
Merge pull request #6819 from sethalves/grab-script-fixes
...
grab script fixes
2016-01-15 09:40:57 -08:00
Philip Rosedale
c5556b1c29
Merge pull request #6841 from ericrius1/diceOverlay
...
added dice icon back to dice.js script
2016-01-14 17:49:04 -08:00
ericrius1
d4491a9ec2
added dice icon back to dice.js script
2016-01-14 17:13:07 -08:00
Brad Hefta-Gaub
a70adc8a57
Merge pull request #6823 from jherico/tool_window
...
Tool window in QML
2016-01-14 16:56:27 -08:00
Philip Rosedale
a8d13cb947
Merge pull request #6831 from hyperlogic/tony/squeeze-hands-part-deux
...
Simplify grab animation logic
2016-01-14 15:49:00 -08:00
Anthony J. Thibault
75b3523c33
Simplify grab animation logic
...
Moved all animation control out of the handControllerGrab.js script and back into
squeezeHands.js
Deleted old hydra/squeezeHands.js to avoid confusion.
Added new sqeezeHands.js script to the default scripts.
2016-01-13 17:57:51 -08:00
U-GAPOS\andrew
3aa1837e07
disable collisions between arrow and bow
...
(the bow is currently kinematic while held)
2016-01-13 16:57:51 -08:00
Brad Davis
b6272b7824
Migrate tool window to overlay/QML
2016-01-13 15:40:37 -08:00
ericrius1
061cf5021c
Don't clean up whiteboard on script shutdown
2016-01-12 19:31:43 -08:00
ericrius1
9dae425bfd
Some fixes to whiteboard to get rid of gaps between lines and jagged lines
2016-01-12 19:28:41 -08:00
Seth Alves
699431a9ab
testing something with chris
2016-01-12 17:27:36 -08:00
Seth Alves
1128982e65
pull grab script changes over from another branch
2016-01-12 17:16:56 -08:00
Andrew Meadows
c52c543ab8
use strings for JS collisionGroup API
2016-01-12 15:11:27 -08:00
Andrew Meadows
00e5d040a2
use collision masks to prevent grab-bootstrap
2016-01-12 15:10:18 -08:00
Howard Stearns
d1a72e8d63
Merge pull request #6807 from hyperlogic/tony/grab-script-hand-animation
...
Move hand animation control into grab script
2016-01-12 13:02:59 -08:00
Howard Stearns
38b0fd2747
Merge pull request #6806 from PhilipRosedale/energybar
...
Energybar example script and test script for scaling
2016-01-12 09:36:14 -08:00
Philip Rosedale
3fdfa1b624
simpler loop
2016-01-11 17:49:46 -08:00
Philip Rosedale
40aecf3bf4
I was told there would be no math
2016-01-11 17:36:12 -08:00
Brad Hefta-Gaub
ddd9b0826b
Merge pull request #6798 from ericrius1/menuTweaks
...
separating out marketplace icon from edit toolbar and making directory icon from directory.js movable and persistent
2016-01-11 12:20:12 -08:00
Anthony J. Thibault
3d8f8e5618
Set WANT_DEBUG_STATE to false
2016-01-11 10:39:27 -08:00
Anthony J. Thibault
8f78a0624c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-11 10:16:51 -08:00
Philip Rosedale
b8565358ff
Added basic energy bar example
2016-01-11 09:16:33 -08:00
ericrius1
8182372e02
Made drag selection area bigger for marketplace and directory icons. Added marketplace.js to default scripts
2016-01-11 08:39:34 -08:00
Philip Rosedale
e4855b7595
Script that drops different kinds of entities near you
2016-01-10 15:34:46 -08:00
ericrius1
a66bc791a3
directory.js - icon is now movable and persistent
2016-01-08 16:33:51 -08:00
ericrius1
7e7424ec2b
Removed marketplace icon from edit menu
2016-01-08 16:22:10 -08:00
ericrius1
b3f19ef4d6
separating out marketplace
2016-01-08 16:08:43 -08:00
Anthony J. Thibault
4c1ad6900d
handControllerGrab.js: removed previous animationStateHandler
...
Which was conflicting with the new HandAnimationBuddy animationStateHandler
2016-01-08 11:28:02 -08:00
Brad Hefta-Gaub
b9068d0738
fix selectAudioDevice.js to honor new menu spec
2016-01-08 11:22:21 -08:00
Brad Hefta-Gaub
fb484584e4
fix edit.js to honor new menu spec
2016-01-08 11:21:55 -08:00
Anthony J. Thibault
cac19b8579
grab animation work
...
Hand animations now have 5 states:
* idle
* open
* grasp
* point
* farGrasp
The handControllerGrab.js script now chooses one of these five animations, based on the state of the HandController object.
Also, removed hand trigger AnimVar setting from C++ Rig class.
2016-01-07 19:36:57 -08:00
Anthony J. Thibault
c2736cb68c
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-07 16:58:10 -08:00
Anthony J. Thibault
5d19de76ab
Added avatarAttachmentTest.js script
2016-01-07 16:15:24 -08:00
Brad Hefta-Gaub
a78d5274e7
Merge pull request #6780 from jherico/z_order
...
Address some z-ordering issues in overlay windows
2016-01-06 20:08:52 -08:00
Anthony J. Thibault
1251be1b2b
Merge branch 'master' into tony/grab-script-hand-animation
2016-01-06 16:26:56 -08:00
Anthony J. Thibault
b42fe22e03
Fixing bad line ending.
2016-01-06 16:26:16 -08:00
Seth Alves
01c9de4f9d
Merge pull request #6771 from ericrius1/directDistanceGrab
...
Squeezing bumper while distance grabbing now brings object to your hand in all cases
2016-01-06 15:30:23 -08:00
ericrius1
1f6e45d135
Fix for close grab jumping
2016-01-06 15:10:53 -08:00
ericrius1
67f4c250fd
Search sphere goes away on far to near grab
2016-01-06 14:59:31 -08:00
ericrius1
cb03eda6d1
Instant far to near grabbing now works by using the bumper, or equip, button
2016-01-06 13:37:26 -08:00
Brad Hefta-Gaub
6ac8d081dc
include debug log in collision example
2016-01-06 13:02:07 -08:00
Brad Hefta-Gaub
d4e039ea7a
include debug log in collision example
2016-01-06 13:00:50 -08:00
Brad Hefta-Gaub
a5f618ef33
include debug log in collision example
2016-01-06 12:54:14 -08:00
Brad Davis
1b82200ecb
Address some z-ordering issues in overlay windows
2016-01-06 10:58:56 -08:00
