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

13417 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
425632e072 Add 'f' to end of const float to follow coding standard 2014-05-29 08:48:22 -07:00
Andrew Meadows
86d6fd45de safe copy of JointState data 2014-05-29 08:19:43 -07:00
Philip Rosedale
79405444d1 Merge pull request #2947 from PhilipRosedale/master 
Set max voxel size of 16 meters in script for voxel creation
 2014-05-28 21:05:23 -07:00
Philip Rosedale
e0d68607cd Set max voxel size of 16 meters in script for voxel creation 2014-05-28 21:02:33 -07:00
Ryan Huffman
cfe176c60e Add locationsMenu.js 2014-05-28 20:50:39 -07:00
Andrzej Kapolka
ff77644caa Progress on selecting cascades. 2014-05-28 18:35:30 -07:00
Clément Brisset
859461a1aa Merge pull request #2946 from AndrewMeadows/inertia 
cleanup: JointState transitions toward a proper class
 2014-05-28 18:18:41 -07:00
Andrew Meadows
0925da05d5 merge upstream/master into andrew/inertia 2014-05-28 17:53:47 -07:00
Andrew Meadows
ec25982a58 add JointState::updateWorldTransform() 2014-05-28 17:51:17 -07:00
wangyix
5d4b0df108 added flag,seq,st to EnvironmentData, untested 
removed/commented out debug prints
 2014-05-28 17:41:38 -07:00
Andrew Meadows
b15b0fd96c cleaner initialization of JointState 2014-05-28 17:31:07 -07:00
wangyix
c799077379 added flag,seq,ts to ParticleErase and ModelErase 
... this fixes unreasonable flight-time issue
 2014-05-28 17:20:10 -07:00
barnold1953
81ed0d99f7 Added prediction for Oculus rift to reduce apparent latency. 2014-05-28 17:13:59 -07:00
Andrew Meadows
9f2a4ae626 Make JointState a proper class 
JointState gets a pointer to its corresponding FBXJoint
 2014-05-28 16:49:39 -07:00
Atlante45
372ddc92fd Added attaching of model to MyAvatar when close enough 2014-05-28 16:00:37 -07:00
Atlante45
b4deed775e Added joints position and combined rotation to scripting interface 2014-05-28 15:59:42 -07:00
Andrzej Kapolka
698ecbf9c5 Fix for shadow map rendering. 2014-05-28 15:58:45 -07:00
Atlante45
8cd101ac57 Added getJointCombinedRotation to Models 2014-05-28 15:57:38 -07:00
barnold1953
e6d12bf239 Disabled overlay for oculus. We still have to call 
applicationOverlay.renderOverlay(true) or prioVR cant calibrate.
 2014-05-28 15:56:14 -07:00
Clément Brisset
e286250bb5 Merge pull request #2943 from ZappoMan/aacube 
Support for ray picking non-axis-aligned bounding box of models
 2014-05-28 15:54:33 -07:00
Ryan Huffman
8f6ad2faab Add 'Load default scripts' button to preferences 2014-05-28 15:27:50 -07:00
Andrzej Kapolka
c3f6cab199 Working on cascading shadow maps. 2014-05-28 15:20:09 -07:00
Andrew Meadows
e74da5f2a0 merge upstream/master into andrew/inertia 2014-05-28 14:55:08 -07:00
Andrew Meadows
13f11e1056 Remove "fromBind" arg in Model::setJointRotation 
It was always set 'true'.
 2014-05-28 14:53:32 -07:00
barnold1953
9311eeb8f5 Fixed compiler warning 2014-05-28 14:41:30 -07:00
ZappoMan
574bca38e6 clean up comments and variable names 2014-05-28 12:10:51 -07:00
Andrzej Kapolka
16a370303f Merge pull request #2942 from ey6es/master 
Fix arguments to applyRotationDelta.
 2014-05-28 12:04:43 -07:00
ZappoMan
d88dd90d79 revert dead code 2014-05-28 12:04:24 -07:00
Andrzej Kapolka
4cbc550820 Fix arguments to applyRotationDelta. 2014-05-28 12:03:57 -07:00
ZappoMan
e3d880248f tweaks 2014-05-28 12:03:40 -07:00
ZappoMan
bebfd7a301 non-aabox picking working 2014-05-28 12:02:22 -07:00
ZappoMan
c917678a45 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 11:04:04 -07:00
Brad Hefta-Gaub
9546fe477c Merge pull request #2940 from AndrewMeadows/inertia 
fix for lack of neck rotations
 2014-05-28 11:00:55 -07:00
Brad Hefta-Gaub
1340ea49d3 Merge pull request #2934 from Barnold1953/master 
OverlayRenderer class and display Overlays to Oculus
 2014-05-28 11:00:36 -07:00
AndrewMeadows
2d4970d106 Merge pull request #2932 from birarda/master 
make scripted assignments passed in DS config static
 2014-05-28 10:54:28 -07:00
Mohammed Nafees
8b0212dc1e remove all key bindings from running scripts dialog 2014-05-28 23:19:15 +05:30
barnold1953
ebfb11c1ce Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory 2014-05-28 10:46:46 -07:00
Andrew Meadows
676a8882fe fix for no neck motion 
FaceModel needs similar override to updateJointState() as SkeletonModel
 2014-05-28 10:43:21 -07:00
ZappoMan
0e7f3e0e37 Merge branch 'master' of https://github.com/worklist/hifi into aacube 2014-05-28 10:37:28 -07:00
barnold1953
21fb18a92e Fixed SkeletonModel compilation errors with PrioVR 2014-05-28 10:24:50 -07:00
ZappoMan
6fd22856f2 hacking on non-AABox models 2014-05-28 10:24:02 -07:00
Stephen Birarda
54bdae4428 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-28 10:09:55 -07:00
barnold1953
35e63757ed Merge branch 'master' of https://github.com/highfidelity/hifi 2014-05-28 09:25:55 -07:00
Philip Rosedale
bf4b0707c0 Merge pull request #2938 from matsukaze/master 
Job #19694. Add option for larger number of frames to the audio scope d...
 2014-05-27 21:02:15 -07:00
matsukaze
619db8ee93 Job #19694 - Add option for larger number of frames to the audio scope display 2014-05-27 23:24:28 -04:00
Philip Rosedale
8d7e682a1f Merge pull request #2937 from huffman/19714 
Code Review for Job #19714
 2014-05-27 20:20:45 -07:00
Philip Rosedale
c52592311f Merge pull request #2936 from ey6es/master 
A couple more shadow tweaks: reduce "shimmer" by moving in texel increments, use multisampling on voxels as well as models.
 2014-05-27 18:28:03 -07:00
Andrzej Kapolka
62eeeaa1c6 Fix for Windows build failure. 2014-05-27 18:12:15 -07:00
wangyix
f361b9a8a7 removed updatePacketTimestamp() 
..from OctreeQueryNode
 2014-05-27 18:04:53 -07:00
wangyix
e89d33dc60 added if to not track ParticleErase packets 2014-05-27 18:02:49 -07:00