Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:01:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33666 commits 25 branches 0 tags 1.1 GiB
Commit graph

3725 commits

Author SHA1 Message Date
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
James B. Pollack
7a7b16f0a2 wall targets 2015-10-07 18:16:58 -07:00
ericrius1
efc2dfb68f Added grab far events for non physical objects 2015-10-07 18:06:37 -07:00
David Rowe
131b4ed004 Merge branch 'master' into 20699 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
	libraries/entities/src/ParticleEffectEntityItem.cpp
 2015-10-07 15:08:07 -07:00
Brad Hefta-Gaub
7a85e5b7a7 rename frameIndex to currentFrame 2015-10-07 13:02:58 -07:00
Brad Hefta-Gaub
ef054ffc6d Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
 2015-10-07 11:27:50 -07:00
Brad Hefta-Gaub
6eeb64b032 CR feedback 2015-10-07 11:23:24 -07:00
Eric Levin
f01d4dde42 Merge pull request #6003 from imgntn/basketball_rack 
[Scripts] Basketball rack
 2015-10-07 10:59:20 -07:00
David Rowe
4624649b1b Sanitize particle properties, fix crashes 2015-10-07 08:57:55 -07:00
Brad Hefta-Gaub
05fd62ac51 Merge pull request #6009 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-07 01:43:10 -07:00
Brad Davis
eff5a4c395 Picking fixes in the HMD 2015-10-06 22:56:48 -07:00
Brad Davis
19fb4e92a6 Enabling programmatic access to the IPD scale 
Conflicts:
	interface/src/Application.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/scripting/HMDScriptingInterface.cpp
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:08:17 -07:00
James B. Pollack
7aab34975f code quality 2015-10-06 17:08:51 -07:00
Brad Hefta-Gaub
34fa5b43fc Merge pull request #5991 from imgntn/knockover_blocks 
[Scripts] Test Block Spawner for Blockers Game
 2015-10-06 17:03:29 -07:00
Brad Hefta-Gaub
0e5f4bc4c9 Merge pull request #5983 from ericrius1/lightFixes 
Light fixes in toybox
 2015-10-06 17:02:17 -07:00
James B. Pollack
4788480186 reset balls if they move too far 2015-10-06 16:48:34 -07:00
Brad Hefta-Gaub
016bf4011d cleanup 2015-10-06 16:07:36 -07:00
Atlante45
76e0006732 Remove forgotten cursorVisible 2015-10-06 15:58:35 -07:00
Brad Hefta-Gaub
be79101a93 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-06 15:20:37 -07:00
James B. Pollack
cda1b418ae cleanup 2015-10-06 11:29:41 -07:00
James B. Pollack
5f2112b8a5 finish rack and add to master script, reorganize all bball related scripts 2015-10-06 11:28:36 -07:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Eric Levin
0afaf84e2a Merge pull request #5979 from imgntn/ping_pong_gun 
[Script] Updates to Ping Pong Gun
 2015-10-06 09:47:53 -07:00
James B. Pollack
152fdb8112 physical rack 2015-10-06 09:44:00 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
James B. Pollack
6cc3077d67 end of day 2015-10-05 18:29:35 -07:00
James B. Pollack
1b241ea05e Update createTestBlocks.js 2015-10-05 18:13:51 -07:00
James B. Pollack
41b2f82be5 midway 2015-10-05 17:43:44 -07:00
Brad Hefta-Gaub
a554f3afb7 Merge pull request #5996 from cozza13/20701 
CR for Job #20701 - Create a menu for HMD stereo and mono eye switching/
 2015-10-05 17:22:36 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Chris Collins
c0a881ec52 added the correct call 
added the correct call
 2015-10-05 15:37:04 -07:00
Chris Collins
1e01d6bd8f Add the ability to switch between mono and stereo in HMD 
Add the ability to switch between mono and stereo in HMD
 2015-10-05 15:30:53 -07:00
Brad Hefta-Gaub
8c8e83dc8e more debugging on animation.running 2015-10-05 14:17:12 -07:00
Seth Alves
7f8411d947 reference count grabs on an entity 2015-10-05 14:15:38 -07:00
James B. Pollack
daf97b0b9d header fixes 2015-10-05 14:12:18 -07:00
James B. Pollack
839301bf05 remove cleanup to make blocks persistent 2015-10-05 13:41:20 -07:00
Seth Alves
635c83dad1 reset gravity and ignore-for-collisions after grabs have released 2015-10-05 13:39:01 -07:00
James B. Pollack
e528125af2 add test blocks for blockers game 2015-10-05 13:38:48 -07:00
James B. Pollack
43f69a0be9 initial knockover blocks 2015-10-05 13:23:19 -07:00
James B. Pollack
1ba31a840a Merge branch 'master' into knockover_blocks 2015-10-05 13:09:15 -07:00
Seth Alves
7f84e882c5 attempt to keep ignoreForCollisions the same before and after grab 2015-10-05 13:06:39 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
James B. Pollack
65ae811c9c make ping pong balls bigger and slower, change out gun model and adjust tip calculations, increase volume, add to master reset script 2015-10-05 11:16:55 -07:00
James B. Pollack
588a256304 Merge branch 'master' into ping_pong_gun 2015-10-05 10:54:21 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
ZappoMan
6f86b0f550 particle fixes 2015-10-04 15:23:17 -07:00
Brad Hefta-Gaub
accdd8c86a add animation properties to edit properties 2015-10-02 19:15:24 -07:00
Seth Alves
a42bb5f533 Merge pull request #5981 from ericrius1/sprayCanFix 
No longer removing non-existent entities from spray paint can; color …
 2015-10-02 17:56:51 -07:00
Seth Alves
26310d8ce4 kill gravity in near-held objects 2015-10-02 17:54:09 -07:00
Brad Hefta-Gaub
abdd9a6da4 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 17:28:06 -07:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
ericrius1
38a66bc915 syntax fixes 2015-10-02 16:53:13 -07:00
Howard Stearns
a5a7c16466 Merge pull request #5789 from highfidelity/revert-5777-revert-5769-edit-js-adjustment 
edit.js adjustment
 2015-10-02 16:28:54 -07:00
ericrius1
1ac1fcaf69 Light switches work properly now; no extra lights 2015-10-02 16:17:54 -07:00
ericrius1
e6e60e5e7a Lights should now only be created once at start of running reset master script, no matter how many people there are in the room 2015-10-02 15:58:32 -07:00
James Pollack
1ff5f11e29 merge 2015-10-02 15:56:39 -07:00
James Pollack
9427ba1a5a ping pong gun 2015-10-02 15:56:26 -07:00
Brad Hefta-Gaub
02536a5ab9 remove animationSettings from particles, add isEmitting 2015-10-02 14:17:01 -07:00
Seth Alves
a737b4024d Merge branch 'master' of github.com:highfidelity/hifi into fix-action-deletes 2015-10-02 13:57:24 -07:00
Brad Hefta-Gaub
e6fb587a8c Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-02 13:04:14 -07:00
Brad Hefta-Gaub
328467e019 Merge pull request #5909 from imgntn/particle_explorer 
[Scripts] Particle Explorer
 2015-10-02 12:40:36 -07:00
ericrius1
0497de47ea No longer removing non-existent entities from spray paint can; color tweaks to paint stream 2015-10-02 12:40:14 -07:00
James Pollack
1c6e833028 cleanup weird function formatting, remove unused code, improve spacing for logical units 2015-10-02 12:31:55 -07:00
Seth Alves
c0e8b02a2f fix what happens when a distance grab is blocked because someone else already has it 2015-10-02 12:25:34 -07:00
Brad Hefta-Gaub
9bb2ada0a7 Merge pull request #5964 from ericrius1/sprayPaint 
Added closePaint script and removed no longer used spray paint scripts
 2015-10-02 12:21:00 -07:00
ericrius1
4b62048fb1 more light changes 2015-10-02 12:12:36 -07:00
Seth Alves
880d92ee64 try to fix double-distance-grabbing lockout 2015-10-02 11:46:48 -07:00
Seth Alves
5b970e6b1a try to fix double-distance-grabbing lockout 2015-10-02 11:43:19 -07:00
ericrius1
0d599458e6 Merged from toybox 2015-10-02 11:34:07 -07:00
James Pollack
55178cdc91 Merge remote-tracking branch 'upstream/master' into particle_explorer 2015-10-02 11:31:14 -07:00
James Pollack
2533bfd2ad initial 2015-10-02 11:30:56 -07:00
Brad Hefta-Gaub
5a0ff4b1a2 Merge pull request #5841 from ericrius1/toybox 
Toybox master reset script
 2015-10-02 11:27:43 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -07:00
ericrius1
4dd2cf9cf5 Moved master reset script into new directory called unpublished scripts and changed relative pathing 2015-10-02 11:09:43 -07:00
ericrius1
51887a76e1 refactoring lights to fix problem with piling up 2015-10-02 11:02:19 -07:00
James Pollack
c6fa132dc2 cleanup 2015-10-02 10:44:26 -07:00
James Pollack
82828fdd14 reduce gravity and gun force so ball goes through less objects 2015-10-02 10:41:49 -07:00
James Pollack
d1cbcf5554 roll back to full width window and set a min for emitRate so interface doesnt crash 2015-10-02 10:32:08 -07:00
ericrius1
f6c888599e Fixed a bug where particles weren't moving with can. 2015-10-02 10:22:48 -07:00
James Pollack
ea20fc9786 hack for it to work as a tool window 2015-10-02 10:08:10 -07:00
ericrius1
9f5a3066b8 changed masterResetEntity back to masterReset 2015-10-02 10:07:43 -07:00
ericrius1
71fe9b216c Removed extraneous masterReset script, and extra call to lightSwitches in correct script 2015-10-02 10:02:28 -07:00
ericrius1
a6df6c53f1 fixed more syntax errors 2015-10-02 09:55:41 -07:00
ericrius1
36f7bba87e Fixed some syntax errors, tweaked cat script so doesn't meow while it's already meowing 2015-10-02 09:53:30 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
James B. Pollack
7c9d7ffefd single sysytem particle explorer with one way bindings is feature complete 2015-10-01 23:49:33 -07:00
James B. Pollack
d1432c51d5 Merge branch 'master' into particle_explorer 2015-10-01 21:21:52 -07:00
James Pollack
4b1b53e189 end of dat 2015-10-01 19:01:10 -07:00
James B. Pollack
a3c91b12b9 Update cat.js 2015-10-01 18:56:38 -07:00
James B. Pollack
0ce6a305bd Update cat.js 2015-10-01 18:52:08 -07:00
James Pollack
6131875f67 set whichhand to null on release 2015-10-01 18:49:07 -07:00
James B. Pollack
d0e079ee9d Update cat.js 
add globals, lint the code
 2015-10-01 18:46:32 -07:00
James B. Pollack
55d20e9d4c Update cat.js 2015-10-01 18:41:24 -07:00
James B. Pollack
59c1c7ee6a Update masterReset.js 
remove file versioning
 2015-10-01 18:40:12 -07:00
James B. Pollack
f200fcdfa2 Update cat.js 2015-10-01 18:35:34 -07:00
James B. Pollack
6cc2df9052 Update cat.js 
hook into isPlaying for sounds
 2015-10-01 18:34:22 -07:00
James B. Pollack
3565d96ffb Update sprayPaintCan.js 
add a header, cleanup
 2015-10-01 18:21:15 -07:00
James B. Pollack
54a51e6b8b Update and rename masterResetEntity.js to masterReset.js 
remove reference to 'entities' in the file name since this script does more than that.  also update the header file.
 2015-10-01 18:19:36 -07:00
James B. Pollack
6523a057a8 Update lightSwitchHall.js 
fix header file
 2015-10-01 18:18:27 -07:00
James B. Pollack
cfb9728fdb Update doll.js 
remove some unused code
 2015-10-01 18:17:35 -07:00
James B. Pollack
9098585e2f Update cat.js 
remove a lot of unused code and add flag for whether cat is already meowing so that it doesn't start another one until its done.  unfortunately i dont know how to read the audio isplaying state so we have to use a lame timeout
 2015-10-01 18:14:08 -07:00
James B. Pollack
b352ab4736 Update lightSwitchGarage.js 
fix header and spacing issues
 2015-10-01 18:04:37 -07:00
James Pollack
7f841b3828 prevent most other-hand accidental firing 2015-10-01 17:55:47 -07:00
ericrius1
d0be47bae9 fix merge 2015-10-01 17:22:12 -07:00
ericrius1
bf9a948ca9 Merge branch 'master' into toybox 2015-10-01 17:17:12 -07:00
ericrius1
407b6b8158 Fixed bug in spray paint where sometimes would not spray 2015-10-01 16:10:29 -07:00
ericrius1
0fb51a6777 got rid of unneeded light test code 2015-10-01 15:56:16 -07:00
ericrius1
cdb249c6ff original master script 2015-10-01 15:53:28 -07:00
James Pollack
32d9dc72d2 Merge branch 'master' into particle_explorer 2015-10-01 15:52:49 -07:00
ericrius1
25e25726d5 only lights 2015-10-01 15:43:25 -07:00
James Pollack
dfab1fc685 Fix merge conflicts and lint the conflict code 2015-10-01 15:32:22 -07:00
James Pollack
8e2c1a6b17 Add ping pong ball gun, add basketball hoop, reduce gate gravity, lint code 2015-10-01 15:22:45 -07:00
ericrius1
e1b720d338 Moved some functions to utils, fixed formatting 2015-10-01 15:18:44 -07:00
Seth Alves
716ebf487f Merge pull request #5952 from imgntn/ping_pong_gun 
[Scripts] Ping Pong Gun
 2015-10-01 15:06:48 -07:00
James B. Pollack
4a7e3c66bd Update createPingPongGun.js 
use relative paths
 2015-10-01 15:05:25 -07:00
James Pollack
7bcb4e4ae3 Merge branch 'master' into ericrius1-toybox 2015-10-01 14:59:54 -07:00
ericrius1
55c6b9d9c4 Added collision sound to blocks 2015-10-01 14:57:03 -07:00
Brad Hefta-Gaub
5e8e15091a Merge pull request #5970 from sethalves/allow-double-near-grab 
allow more than one near-grab on an object
 2015-10-01 14:47:03 -07:00
ericrius1
5aef7475d6 Sound position updates every frame based on new position of can 2015-10-01 14:42:51 -07:00
Brad Hefta-Gaub
a2463cbf68 Merge pull request #5972 from Atlante45/fix_currentAPI 
Fix currentAPI.js
 2015-10-01 14:41:56 -07:00
Brad Hefta-Gaub
17402c697a Merge pull request #5935 from imgntn/basketball_hoop 
[Scripts] Basketball hoop
 2015-10-01 14:40:55 -07:00
ericrius1
7ee26c5d4a tweaked settings 2015-10-01 14:26:22 -07:00
James Pollack
861aa91572 shoot out of the right end of the gun 2015-10-01 12:27:45 -07:00
James Pollack
d2f4b6e9f0 add / remove controller listener methods 2015-10-01 12:21:56 -07:00
ericrius1
290659b9f6 increased lifetime 2015-10-01 11:46:37 -07:00
James Pollack
a4105eb321 add color pickers 2015-10-01 11:34:02 -07:00
Atlante45
d0bec38603 Fix currentAPI.js 2015-10-01 11:30:50 -07:00
Brad Hefta-Gaub
aca25bd76e connect up AnimationPropertyGroup to AnimationLoop 2015-10-01 11:05:16 -07:00
ericrius1
ef5ad9eeb3 Laser stays visible when further away from surfaces 2015-10-01 11:02:22 -07:00
Seth Alves
2700529b33 lower action lifetime 2015-10-01 10:41:43 -07:00
Seth Alves
d4f954a0e2 allow more than one near-grab on an object 2015-10-01 10:25:30 -07:00
ericrius1
191a4740a3 laser color matches paint color 2015-10-01 09:50:58 -07:00
ericrius1
2899962d43 can now cycle colors with 4 and 2 buttons on hydra 2015-09-30 17:14:17 -07:00
ericrius1
3592b78b2b less points per line 2015-09-30 16:35:43 -07:00
ericrius1
e516281da8 Added closePaint script and removed no longer used spray paint scripts 2015-09-30 16:15:52 -07:00
James Pollack
c55d627e9b Different model, different sounds, release interval 2015-09-30 16:12:27 -07:00
Seth Alves
91965db5ab increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:07:22 -07:00
Seth Alves
cd2a1542e0 increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:05:16 -07:00
Seth Alves
4e057e5ada increase action lifetime to be more forgiving of clock skew. remove code that makes avatar a ghost while holding something 2015-09-30 16:03:54 -07:00
James Pollack
3cdb4e7186 importing 2015-09-30 14:23:11 -07:00
Seth Alves
dd0a16df04 don't leave search state if we intersect something that someone else is already grabbing 2015-09-30 14:19:59 -07:00
Seth Alves
b417abc3de try again on string startswith 2015-09-30 14:16:07 -07:00
Seth Alves
c27766facb move string startswith to utils.js 2015-09-30 14:07:23 -07:00
Seth Alves
f746a970de don't grab something if someone else is already grabbing it 2015-09-30 14:03:10 -07:00
Seth Alves
b34ea6ded4 store action lifetime as an expires integer 2015-09-30 13:46:23 -07:00
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
James Pollack
8fc696c5f8 add ability to explort particle settings in nice format for interface 2015-09-30 12:41:08 -07:00
James Pollack
57d5418231 export just particle settings in interface compatible format 2015-09-30 12:27:51 -07:00
James Pollack
0865f94106 magic numbers 2015-09-30 11:31:33 -07:00
James Pollack
8bdf428f41 First version of ping pong gun 2015-09-30 11:21:51 -07:00
ericrius1
c03a9ddd58 Added fire to master script 2015-09-30 11:14:18 -07:00
James Pollack
ecad7f34f6 moar 2015-09-30 10:58:21 -07:00
Seth Alves
898e3917e3 improve actionInspector.js 2015-09-30 10:57:52 -07:00
James Pollack
99fbed6143 mostly working 2015-09-30 10:49:47 -07:00
Seth Alves
96d0df49e4 script to display entity-action details in an overlay 2015-09-30 10:41:39 -07:00
James Pollack
c3dfea4712 initial files 2015-09-30 10:26:24 -07:00
ericrius1
2b84c90f9d merged master hand controller 2015-09-30 10:18:13 -07:00
James B. Pollack
402fd44cff header file cleanup 2015-09-29 21:27:55 -07:00
James B. Pollack
80a457eb14 cleanup the main.js file for distribution 2015-09-29 19:47:00 -07:00
James B. Pollack
47b410df93 version 0.1 of particle explorer for distribution 2015-09-29 19:44:15 -07:00
ericrius1
00cab85a11 Removed whiteboard from reset script 2015-09-29 18:33:31 -07:00
ericrius1
259391a40b Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 18:32:56 -07:00
ericrius1
ba17225c19 Remove hand control script from PR 2015-09-29 18:32:52 -07:00
James Pollack
d4cc3994f4 add some 2 way bindings for settings sanity check 2015-09-29 17:47:41 -07:00
Eric Levin
68615e171a Update masterResetEntity.js 2015-09-29 17:40:05 -07:00
James Pollack
d0f20bfa63 working particle explorer w00t! 2015-09-29 17:01:10 -07:00
Brad Davis
166d267022 Merge pull request #5942 from ZappoMan/flickeringLightScript 
Change the update rate of the flickering light to 30hz
 2015-09-29 16:20:24 -07:00
Seth Alves
472ff89f48 rearrange when avatar collisions are adjusted 2015-09-29 15:52:38 -07:00
Brad Hefta-Gaub
67823b79d5 change additional lifetime to 60 seconds to avoid processing hiccups 2015-09-29 15:48:46 -07:00
Brad Hefta-Gaub
90afeb4ce1 more debugging 2015-09-29 15:45:29 -07:00
ericrius1
d8e7da7b73 added painting to whiteboard 2015-09-29 15:43:59 -07:00
ericrius1
648fb7cb8c Merge branch 'master' into toybox 2015-09-29 15:40:46 -07:00
Seth Alves
8f2f14c9e5 keep track of state of avatar-collisions menu-item with global variables rather than per object ones 2015-09-29 15:30:24 -07:00
Seth Alves
2ba686ed89 cleanups 2015-09-29 15:11:52 -07:00
Seth Alves
d554eb8db9 avatar collisions are off during a grab 2015-09-29 15:09:25 -07:00
Brad Hefta-Gaub
f83eae4d42 more debugging 2015-09-29 14:45:24 -07:00
Seth Alves
b1a133e55c working on disabling avatar collisions during grab 2015-09-29 14:38:47 -07:00
Brad Hefta-Gaub
07515ce710 Merge pull request #5918 from PhilipRosedale/master 
Throw held objects with velocity from fingertip
 2015-09-29 14:37:44 -07:00
unknown
006650f23b Fix for PR comments 2015-09-29 14:34:23 -07:00
James Pollack
b9a83be4d3 cleanup 2015-09-29 14:31:13 -07:00
James B. Pollack
bbc32cdd1e Merge pull request #5937 from ericrius1/grabFix 
releaseGrab event now triggered for non physical entities
 2015-09-29 14:25:59 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
ericrius1
7681d8d77d fixed commenting 2015-09-29 14:05:57 -07:00
ericrius1
644687f330 releaseGrab event now triggered for non physical entities 2015-09-29 14:04:03 -07:00
Seth Alves
e9dd165b1d try calling updateMotionBehaviorFromMenu 2015-09-29 14:00:22 -07:00
ericrius1
a1f922721a Merge branch 'toybox' of https://github.com/ericrius1/hifi into toybox 2015-09-29 13:57:20 -07:00
ericrius1
81c5d0c388 more whiteboard work 2015-09-29 13:57:17 -07:00
Seth Alves
f7b34f63c1 try calling updateMotionBehaviorFromMenu 2015-09-29 13:40:54 -07:00
Brad Hefta-Gaub
6a01c10453 more debug 2015-09-29 13:35:16 -07:00
Brad Hefta-Gaub
9c199b23a2 more debug 2015-09-29 13:32:28 -07:00
Brad Hefta-Gaub
4abb251728 more debug 2015-09-29 13:28:45 -07:00
James Pollack
cbd55ddba6 Add the hoop 2015-09-29 13:24:49 -07:00
Seth Alves
49da3c5034 disable avatar collisions while holding something 2015-09-29 13:24:03 -07:00
James B. Pollack
3bbc809710 Merge pull request #5930 from ericrius1/grabFix 
Setting hand data for close grab of non physical objects
 2015-09-29 13:17:21 -07:00
James Pollack
26554c5ac3 whitespace 2015-09-29 13:13:50 -07:00
Brad Hefta-Gaub
fdb9455540 debug 2015-09-29 13:12:55 -07:00