Philip Rosedale
7387d6e5f1
Merge pull request #6869 from imgntn/pistolfix
...
Make Pistol Quieter and Minor Adjustments
2016-01-21 11:15:07 -08:00
ericrius1
5132406d37
Test script for lod testing
2016-01-21 10:51:15 -08:00
James B. Pollack
e63e509835
Update createPistol.js
2016-01-21 09:33:38 -08:00
Chris Collins
5dc1eb986e
Merge pull request #6874 from imgntn/fixgrabparticlesystems
...
Remove Particle Search Beams from Grab Script and Create / Destroy Systems on Demand
2016-01-21 09:25:11 -08:00
Seth Alves
311e0cee67
Merge pull request #6820 from AndrewMeadows/collision-mask
...
use "collidesWith" instead of "collisionMask"
2016-01-21 09:13:34 -08:00
Eric Levin
0cfd9e429a
Merge pull request #6872 from imgntn/messageTests
...
Add Messaging Tests and Organize
2016-01-21 09:05:23 -08:00
James B. Pollack
c2b5dfdfe6
clear sphere
2016-01-20 16:09:37 -08:00
James B. Pollack
6f1ea9a3d3
cleanup
2016-01-20 15:20:59 -08:00
James B. Pollack
53b4a509f7
remove particle search beams and create / destroy systems on demand
2016-01-20 14:17:32 -08:00
James B. Pollack
a57ccdd0e8
messages
2016-01-20 13:37:58 -08:00
James B. Pollack
b91e5c27e1
Update createPistol.js
2016-01-20 10:45:40 -08:00
James B. Pollack
8d3468265f
make pistol collision sound quieter, other adjustments
2016-01-20 10:44:02 -08:00
Brad Hefta-Gaub
55093aafea
Merge pull request #6826 from kevinmthomas-carpool/LoadScriptFromEntityFix
...
Fixed entity script loading functionality for the jsstreamplayer.
2016-01-19 13:14:43 -08:00
Andrew Meadows
4a91ed3d66
fix bad conflict resolution
2016-01-19 11:42:29 -08:00
Andrew Meadows
d990482c0a
use collidesWith for bow.js workaround
2016-01-19 11:42:29 -08:00
Andrew Meadows
db77f22a61
use "collidesWith" instead of "collisionMask"
...
but make "collisionMask" work for those who want it
2016-01-19 11:41:22 -08:00
Seth Alves
8ba800fda8
Merge pull request #6851 from AndrewMeadows/collisionless2
...
namechange "ignoreForCollisions" to "collisionless"
2016-01-19 11:33:55 -08:00
Brad Hefta-Gaub
e15c7f089e
Merge pull request #6850 from sethalves/various-fixes
...
Various fixes
2016-01-19 10:15:46 -08:00
Brad Hefta-Gaub
15899558aa
Merge pull request #6842 from AlessandroSigna/vrShop
...
Vr shop
2016-01-19 09:39:28 -08:00
Andrew Meadows
48374ef5bc
more ignoreForCollisions to collisionless
2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819
namechange ignoreForCollisions --> collisionless
2016-01-19 09:06:17 -08:00
Seth Alves
9428da61cf
fix property name typo
2016-01-18 14:31:55 -08:00
Seth Alves
823428290d
Merge branch 'master' of github.com:highfidelity/hifi into various-fixes
2016-01-18 13:26:45 -08:00
Seth Alves
94bafb4a1e
Merge pull request #6832 from AndrewMeadows/no-collisionsWillMove
...
namechange collisionsWillMove --> dynamic
2016-01-18 11:51:59 -08:00
Seth Alves
8b6e89a5c4
fix stopFarTrigger entity method call. re-add code to keep more than one distance grab per object from happening
2016-01-18 11:13:33 -08:00
Seth Alves
d8dceade2e
Merge pull request #6833 from PhilipRosedale/searchChoice
...
Choice of hand ray pick or head pick
2016-01-18 11:03:30 -08:00
AlessandroSigna
737a00a2cb
Typo fixed
2016-01-18 16:20:32 +01:00
Philip Rosedale
9b3155188d
Squeeze a little to search, a lot to grab
2016-01-17 19:10:40 -08:00
Philip Rosedale
23a8d57ca2
Always show search ray
2016-01-17 14:14:00 -08:00
Philip Rosedale
588719a4c2
merge conflict fix
2016-01-17 13:07:55 -08:00
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
Andrew Meadows
c1a1cbf718
fix typo
2016-01-16 15:55:10 -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
Andrew Meadows
84282d0114
final repairs after rebase
2016-01-15 15:28:26 -08:00
Andrew Meadows
e763c055b3
more namechanges in JS scripts
2016-01-15 15:24:46 -08:00
Andrew Meadows
29a52bf0ba
namechange collisionsWillMove --> dynamic
2016-01-15 15:23:52 -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
AlessandroSigna
41e6dd48e0
Overlay manager exposing findRayIntersection
2016-01-14 18:27:17 -08:00
AlessandroSigna
e4501e3a8f
Added cart, cash, inspect and readme
2016-01-14 18:23:39 -08:00
EdgarPironti
40279c8fc5
Item, Review, Shop and Vendor scripts.
2016-01-14 18:20:40 -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
Philip Rosedale
30199106ec
Choice of hand ray pick or head pick
2016-01-13 20:47:05 -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
