Brad Davis
9b81842850
Merge branch 'master' into homer
...
Conflicts:
assignment-client/src/octree/OctreeSendThread.cpp
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTree.cpp
libraries/entities/src/EntityTreeElement.cpp
libraries/entities/src/EntityTreeElement.h
libraries/entities/src/EntityTreeHeadlessViewer.cpp
libraries/entities/src/RecurseOctreeToMapOperator.cpp
libraries/octree/src/Octree.h
libraries/physics/src/EntityMotionState.cpp
2015-09-11 16:31:18 -07:00
Seth Alves
f51f17b267
Merge pull request #5775 from ericrius1/paintCan
...
Paint can
2015-09-11 12:34:44 -07:00
ericrius1
0a46db60ac
spawning particles on grab and deleting on release, with a lifetime, for better cleanup of particles
2015-09-11 12:01:01 -07:00
ericrius1
eabdd1f4d9
quick fix for particles hanging around
2015-09-11 11:33:21 -07:00
ericrius1
6e46e3d3b6
cleanup for paintcan
2015-09-11 11:24:53 -07:00
ericrius1
1991ba0eba
absolute path for now- just for testing purposes before merge
2015-09-11 09:37:03 -07:00
Brad Davis
92eeb564fe
PR comments
2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d
Fixing some entity race condition crashes
2015-09-10 20:43:41 -07:00
ericrius1
7969fb64ce
tweaking distance threshold
2015-09-10 17:08:52 -07:00
Seth Alves
94dc86833f
Revert "edit.js adjustment"
2015-09-10 17:01:11 -07:00
ericrius1
a1fd867c09
timer fix for reset
2015-09-10 16:46:25 -07:00
ericrius1
510e253575
switching to hosted script for testing
2015-09-10 16:26:57 -07:00
ericrius1
66e4acf651
trying to move to instant reset
2015-09-10 16:21:57 -07:00
Sam Gateau
ae03d32a84
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2015-09-10 15:55:42 -07:00
Sam Gateau
3bf0f388eb
Make the flashlight grab frame work correctly
2015-09-10 15:39:54 -07:00
Philip Rosedale
5955228652
Merge pull request #5769 from sethalves/edit-js-adjustment
...
edit.js adjustment
2015-09-10 15:36:35 -07:00
Philip Rosedale
93261976c0
Merge pull request #5763 from hyperlogic/tony/squeeze-hands-improvements
...
Improvements to squeezeHands.js
2015-09-10 15:34:52 -07:00
Sam Gateau
d0592d562c
Make the flashlight grab frame work correctly
2015-09-10 15:30:50 -07:00
Seth Alves
698ccc6fb0
don't change camera when edit.js is activated. don't highlight entites I mouse-hover over.
2015-09-10 13:48:36 -07:00
Sam Gateau
38fcb80135
FIx bad relative path
2015-09-10 09:52:52 -07:00
Howard Stearns
d7c1c7593a
Merge pull request #5761 from ZappoMan/preventIncludeRecusion
...
prevent Script.include() from including the same file multiple times
2015-09-10 09:22:55 -07:00
Brad Hefta-Gaub
1aa3c746a6
Merge pull request #5762 from samcake/punk
...
Adding the flashlight toy script
2015-09-10 09:15:22 -07:00
Brad Hefta-Gaub
edf889a4c8
Merge pull request #5756 from ericrius1/grabChanges
...
added lifetime to pointer, default grab behavior now honors objects i…
2015-09-10 09:14:11 -07:00
Brad Hefta-Gaub
f45e182d33
fix CR feedback, add examples
2015-09-10 09:06:56 -07:00
ericrius1
66a4ff752c
cleaning up lifetime calc
2015-09-10 09:01:51 -07:00
ericrius1
9ba681dd7f
fixed way lifetime on pointer entity is updated
2015-09-10 08:59:05 -07:00
samcake
e647bfc19b
Update flashlight.js
...
modify the path to be relative
2015-09-09 22:41:09 -07:00
Anthony J. Thibault
839047e583
Improvements to squeezeHands.js
...
* Account for controller dead spot. This helps us to see first few frames of the opening animation
and the last few frames of the closing animation
* Added a small amount of smoothing on the triggers
* Fixed bug when controllers were closed quickly and the animation frame was never getting set,
because frame and lastFrame were equal.
* Changed animation urls to Ozan's latest.
2015-09-09 21:46:35 -07:00
Sam Gateau
0a0a9805f6
Fixing the url behavior
2015-09-09 18:11:00 -07:00
Sam Gateau
8360fceadf
Fixing the url behavior
2015-09-09 18:09:52 -07:00
Sam Gateau
6aebda86f4
Creating the flashlight script files
2015-09-09 17:24:20 -07:00
Brad Hefta-Gaub
0023016447
Merge pull request #5757 from ZappoMan/breakdanceToy
...
added some debugging to breakdance toy
2015-09-09 14:56:08 -07:00
Brad Hefta-Gaub
62bf6c7c6f
added some debugging to breakdance toy
2015-09-09 14:55:39 -07:00
Brad Hefta-Gaub
ec93fc1b05
added some debugging to breakdance toy
2015-09-09 14:24:52 -07:00
ericrius1
5025030726
added lifetime to pointer, default grab behavior now honors objects initial position and rotation
2015-09-09 14:24:30 -07:00
Brad Hefta-Gaub
6866c288b0
Merge pull request #5754 from ZappoMan/breakdanceToy
...
fix breakdance toy
2015-09-09 12:42:10 -07:00
Brad Hefta-Gaub
427ed8807b
fix breakdance toy
2015-09-09 12:41:59 -07:00
Ryan Downe Karpf
9c71d5fd4d
Merge pull request #5750 from ZappoMan/boombox
...
lower volume
2015-09-09 09:30:29 -07:00
Brad Hefta-Gaub
b0329a58a6
lower volume
2015-09-09 09:29:31 -07:00
Brad Davis
75a05ff15d
Reduce logging spam in omniTools/magBalls
2015-09-08 20:56:54 -07:00
Brad Hefta-Gaub
ae8c3a19ed
Merge pull request #5746 from imgntn/bubblewand_hotfix_1
...
Run cleanup when createWand.js ends; Don't delete bubbles on collision (for now)
2015-09-08 18:18:36 -07:00
Brad Hefta-Gaub
ece8addf81
fix issue with default scripts
2015-09-08 18:08:30 -07:00
James Pollack
66b6d5178f
Cleanup wand when createWand.js script ends
2015-09-08 17:25:39 -07:00
Brad Hefta-Gaub
0612ee498d
Merge pull request #5742 from ericrius1/defaultGrab
...
handControllerGrab.js is active by default
2015-09-08 16:49:03 -07:00
Brad Davis
ec566a63fc
Merge pull request #5736 from ZappoMan/breakdanceToy
...
Breakdance Toy - better positioning on puppet
2015-09-08 16:29:29 -07:00
Eric Levin
e9ea42f9ad
Merge pull request #5740 from ZappoMan/boombox
...
add a boom box entity script
2015-09-08 16:16:41 -07:00
ericrius1
717cbf3d5b
handControllerGrab.js is active by default
2015-09-08 16:13:17 -07:00
Brad Hefta-Gaub
ca6c413221
tweak THE_SONG
2015-09-08 16:02:10 -07:00
Brad Hefta-Gaub
8c4d7b98fd
fix header comment
2015-09-08 16:01:07 -07:00
