Brad Davis f7a2513f26 Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/CMakeLists.txt interface/src/Application.cpp interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/MyAvatar.h tests/ui/src/main.cpp		2015-07-30 12:55:22 -07:00
..
airHockey.js	Restored indentatioN	2015-07-08 16:53:55 -07:00
billiards.js	Use collisionSoundURL for billiards.js, instead of the global collision event.	2015-05-25 17:12:36 -07:00
cleanupChessboards.js	More Script updates	2015-01-06 22:32:45 -08:00
clonedOverlaysExample.js	More Script updates	2015-01-06 22:32:45 -08:00
grabHockey.js	less bad behavior when dragging across horizon	2015-05-18 23:09:08 -07:00
hitEffect.js	can toggle hit effect on and off from a script	2015-07-20 12:02:01 -07:00
hydraGrabHockey.js	added support for both right and left hydras for hydra scripts, and made picking accurate	2015-05-14 17:00:40 -07:00
make-dummy.js	Baseline versions of fight club scripts.	2015-07-07 14:41:03 -07:00
planky.js	editMode on and off switch by clicking the COG, proper removal of planks when rows/columns removed	2015-07-22 10:21:13 +02:00
playChess.js	interface decides on entityIDs rather than bouncing a temporary id through the entity server	2015-05-19 14:25:23 -07:00
satellite.js	Clean up formatting for satellite.js	2015-07-28 13:01:20 -07:00
spaceInvadersExample.js	Update spaceInvaders to use per-entity collision handlers.	2015-05-25 17:16:35 -07:00
sword.js	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-20 15:22:19 -07:00