Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 21:53:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
31534 commits 71 branches 56 tags 1.2 GiB
Commit graph

31534 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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 Thibault
e8ede3ad00 Merge pull request #5731 from ChristophHaag/master 
build fixes
 2015-09-10 11:36:45 -07:00
Brad Davis
48bd54f81b Eliminate excessive debug logging from procedural setup 2015-09-10 10:57:37 -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
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
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
Stephen Birarda
e8fca7f6ae Merge pull request #5760 from ZappoMan/fixLocalFileIncludes 
fix degenerative url scheme case
 2015-09-09 17:40:12 -07:00
Brad Hefta-Gaub
626fcb867b CR feedback 2015-09-09 17:27:39 -07:00
Brad Hefta-Gaub
f710afbfd1 CR feedback 2015-09-09 17:26:01 -07:00
Sam Gateau
6aebda86f4 Creating the flashlight script files 2015-09-09 17:24:20 -07:00
Brad Hefta-Gaub
d62945c6bf fix degenerative url scheme case 2015-09-09 17:13:16 -07:00
Howard Stearns
da6444a776 Start anim graph in the right saved state on startup. 2015-09-09 17:02:55 -07:00
Ryan Huffman
08ce09a89b Merge pull request #5758 from birarda/master 
fix for supression of packet from unknown nodes
 2015-09-09 16:16:39 -07:00
Howard Stearns
bcf16e52af Merge branch 'master' of https://github.com/highfidelity/hifi into animGraph-cleanup 2015-09-09 16:04:15 -07:00
Howard Stearns
745872f914 More variants tests. 2015-09-09 15:45:23 -07:00
Andrew Meadows
155d9e422a Merge pull request #5587 from howard-stearns/decouple-avatar-updates 
Decouple Avatar Update
 2015-09-09 15:36:19 -07:00
Stephen Birarda
f06e4eaae9 fix suppression of packet from unknown node 2015-09-09 15:20:35 -07:00
Howard Stearns
738da0116a Simplify timer use. 2015-09-09 15:19:01 -07:00
Howard Stearns
5e8fe29674 Remove unused declaration. 2015-09-09 15:09:06 -07:00
Howard Stearns
c1d68e058e Reduce interconnection between AnimGraph and SkeletonModel by removing init and having MyAvatar:initAnimGraph go directly to rig (just like destroyAnimGraph does). 2015-09-09 15:02:11 -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 Davis
382de2b4aa Fix possible hang when switching out of Oculus mode 2015-09-09 14:09:01 -07:00
Ryan Huffman
da5bdd5641 Merge pull request #5752 from birarda/master 
make all AssetClient packets reliable
 2015-09-09 12:50:47 -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
Howard Stearns
ed2ed525b2 Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate. 2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb Terminate DDE earlier during shut-down and always at start-up 2015-09-09 11:29:57 -07:00
Howard Stearns
83d14d3380 Protect avatarLock. 2015-09-09 11:11:06 -07:00