Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 16:30:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31572 commits 76 branches 59 tags 1.2 GiB
Commit graph

31572 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
b9d5412aad prevent sending signals in the entities script engine 2015-09-11 09:48:42 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master 
fail asset request if hash does not match
 2015-09-11 09:09:56 -07:00
Brad Davis
2f679a3526 Merge pull request #5779 from ZappoMan/entityScriptCrashes 
Make sure all entity script callbacks happen on the Entities script engine thread
 2015-09-11 08:34:08 -07:00
Brad Hefta-Gaub
92a5a999c6 quiet some debug 2015-09-10 19:52:44 -07:00
Brad Hefta-Gaub
ee30fe4a56 quiet some debug 2015-09-10 19:48:41 -07:00
Philip Rosedale
c4c6e7264e Merge pull request #5774 from samcake/punk 
Toybox: Make the flashlight grab frame work correctly
 2015-09-10 16:08:01 -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
Howard Stearns
0870c5ed87 Merge pull request #5768 from hyperlogic/tony/ik-and-controllers 
AnimInverseKinematics and AnimController node
 2015-09-10 15:38:53 -07:00
Howard Stearns
23431efdeb Merge pull request #5771 from ctrlaltdavid/20671-tidy 
Stop DDE and EyeTracker early but don't destroy until later in shutdown
 2015-09-10 15:38:16 -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
Stephen Birarda
c6aeee7036 fix for OSX_SDK default string 2015-09-10 15:28:03 -07:00
Stephen Birarda
9a33a48ba5 clarify OSX_SDK option 2015-09-10 15:25:30 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
Stephen Birarda
2fa3ab7a14 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-10 15:09:13 -07:00
Stephen Birarda
699a9566c3 add option to specify OS X SDK for Xcode 7 2015-09-10 15:00:01 -07:00
David Rowe
4aa553c183 Stop DDE and EyeTracker early but don't destroy until later in shutdown 2015-09-10 14:53:56 -07:00
Seth Alves
a6a61d7e2f Merge pull request #5770 from birarda/master 
repair to packing of octree query from headless viewer
 2015-09-10 14:53:27 -07:00
Stephen Birarda
f58804a30e repair to packing of query data from headless viewer 2015-09-10 14:35:44 -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
Brad Hefta-Gaub
8eacdbf1c4 first cut at making sure entity scripts are called on the entities script engine thread 2015-09-10 13:02:02 -07:00
Brad Hefta-Gaub
5a4a75f4cc Merge pull request #5767 from jherico/lisa 
Eliminate excessive debug logging from procedural setup
 2015-09-10 12:25:41 -07:00
Anthony J. Thibault
9a9838fd0d Clean up of AnimNodeLoader after merge from master. 2015-09-10 11:47:41 -07:00
Anthony J. Thibault
663e37da66 Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:37:47 -07:00
Anthony Thibault
e8ede3ad00 Merge pull request #5731 from ChristophHaag/master 
build fixes
 2015-09-10 11:36:45 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Brad Davis
48bd54f81b Eliminate excessive debug logging from procedural setup 2015-09-10 10:57:37 -07:00
Anthony J. Thibault
68076ccf45 updated anim graph url to use ik-avatar.json 2015-09-10 10:57:30 -07:00
Brad Davis
6bc59341eb Merge pull request #5766 from samcake/punk 
FIx bad relative path for Flashlight.js
 2015-09-10 09:57:57 -07:00
Sam Gateau
38fcb80135 FIx bad relative path 2015-09-10 09:52:52 -07:00
Seth Alves
4e629b6254 Merge pull request #5764 from birarda/master 
don't have polyvox build bindings
 2015-09-10 09:23:25 -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
Stephen Birarda
710e369b70 don't have polyvox build bindings 2015-09-10 08:52:24 -07:00
Andrew Meadows
35b894872d Merge pull request #5753 from ctrlaltdavid/20671 
Terminate DDE earlier during shut-down and always at start-up
 2015-09-10 07:46:53 -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
David Rowe
fdcfa9657c Rework and clarify stopping an existing DDE process 2015-09-09 21:06:50 -07:00
Brad Hefta-Gaub
f29bcd8b6a Merge pull request #5755 from jherico/lisa 
Fix possible hang when switching out of Oculus mode
 2015-09-09 19:24:00 -07:00
Anthony Thibault
855fd1ccea Merge pull request #5759 from howard-stearns/animGraph-cleanup 
Anim graph cleanup
 2015-09-09 18:57:38 -07:00
Anthony J. Thibault
09b2d8e4a4 Seed AnimGraph with hand controller position and orientation. 2015-09-09 18:16:57 -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
Brad Hefta-Gaub
ede0a39b5b prevent Script.include() from including the same file multiple times 2015-09-09 17:54:09 -07:00