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

15072 commits

Author SHA1 Message Date
Stephen Birarda
4be8a92e52 remove explicit requirement of LibOVR source file in OculusManager 2014-07-30 14:15:14 -07:00
Stephen Birarda
4d3aafa5df use path suffixes instead of full path in name 2014-07-30 14:07:40 -07:00
Stephen Birarda
d6c0defd98 check in VS2010 subdir to see oculus 0.4.0 library 2014-07-30 14:05:20 -07:00
Brad Hefta-Gaub
df629b6288 Merge pull request from anthonye2007/master 
Tweak build docs for Windows 8.1
 2014-07-28 19:44:38 -07:00
Brad Hefta-Gaub
8e1d4eb0a6 Merge pull request from Atlante45/add_start_stop_animation_for_scripted_avatar 
Add start stop animation for scripted avatar
 2014-07-28 19:43:58 -07:00
Anthony Elliott
c5b824cb4e Merge branch 'master' of https://github.com/anthonye2007/hifi 2014-07-28 19:53:17 -04:00
Anthony Elliott
d4a6556917 Tweak build docs for Win 8.1 2014-07-28 19:52:00 -04:00
Anthony Elliott
adca04b9ce Configure build for Windows 8.1 2014-07-28 19:31:50 -04:00
Stephen Birarda
cd6a73a01c Merge pull request from ZappoMan/buildwithoutqxmpp 
fix build to work if Qxmpp is not available
 2014-07-28 15:21:12 -07:00
ZappoMan
fbfd63c429 fix build to work if Qxmpp is not available 2014-07-28 15:17:33 -07:00
Atlante45
3c7375daad Removed unused variable 2014-07-28 10:17:04 -07:00
Atlante45
844e5d7e47 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 
Conflicts:
	assignment-client/src/Agent.cpp
	examples/editModels.js
 2014-07-28 10:11:39 -07:00
Brad Hefta-Gaub
f438ae2ddb Merge pull request from Atlante45/master 
Fix the double entries in models' browsers
 2014-07-28 08:51:49 -07:00
Brad Hefta-Gaub
8b43ddc426 Merge pull request from birarda/select-library 
standardization of hints used to find external libraries
 2014-07-28 08:51:15 -07:00
Philip Rosedale
acecc17001 Merge pull request from AndrewMeadows/ragdoll 
Ragdoll Part 6: muscle constraints for driving Ragdoll and also damped velocity integration for verlet simulation
 2014-07-28 08:40:21 -07:00
Philip Rosedale
b2f6b0c5da Merge pull request from Atlante45/editVoxels_zFighting 
Edit voxels z fighting
 2014-07-28 08:37:37 -07:00
Andrew Meadows
dd515f6bb9 fix bad variable name 2014-07-28 07:06:36 -07:00
Atlante45
1849ec8e07 Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting 
Conflicts:
	examples/editVoxels.js
 2014-07-25 16:39:39 -07:00
Atlante45
b5dd9141a3 Fix the double entries in models' browsers 2014-07-25 16:12:40 -07:00
Andrew Meadows
d3ba00770f merge upstream/master into andrew/ragdoll 2014-07-25 15:34:32 -07:00
Andrew Meadows
b8b1df5799 MuscleConstraints for ragdoll; velocity for verlet points 2014-07-25 15:24:44 -07:00
Andrew Meadows
c8405d192d create MuscleConstraint for driving ragdolls 2014-07-25 15:24:14 -07:00
Andrew Meadows
60612f6397 implement VerletPoint::integrateForward() 2014-07-25 15:23:12 -07:00
Andrew Meadows
b2c2cfec79 implement base Ragdoll::stepRagdollForward() 2014-07-25 15:22:25 -07:00
Clément Brisset
f5dbc54b1c Merge pull request from binaryking/19701 
Code Review for Job
2014-07-25 12:09:14 -07:00
Clément Brisset
53b345d4cd Merge pull request from AndrewMeadows/ragdoll 
Ragdoll Part 5: send visible transforms when using ragdoll
 2014-07-25 11:50:15 -07:00
Atlante45
f7c675f3e6 CR missing index++ 2014-07-25 11:35:25 -07:00
Atlante45
7d64246d43 Made zFightingAdjust a ratio to the distance (currently 4%) 2014-07-25 11:00:03 -07:00
Atlante45
72a31ec8fc Removed magic number to use DEFAULT_NEAR/FAR_CLIP 2014-07-25 10:56:44 -07:00
Atlante45
c5ad856e65 Changed DEFAULT_FAR_CLIP to TREE_SCALE 2014-07-25 10:55:42 -07:00
AndrewMeadows
73ec862474 Merge pull request from PhilipRosedale/master 
Velocity filter head position for less jitter in camera
 2014-07-25 09:50:21 -07:00
AndrewMeadows
361ec5d1ee Merge pull request from Barnold1953/jsBlendShapes 
Exposed Avatar Blendshape control to JS
 2014-07-25 09:40:48 -07:00
Philip Rosedale
a5d6b2282e Merge pull request from wangyix/master 
moved audio stats to own overlay; audio stats now reset when audiomixer is killed;
 2014-07-24 21:40:43 -07:00
Philip Rosedale
9a83be618a Merge pull request from Atlante45/make_scriptEngine_a_qScriptEngine 
ScriptEngine now inherit from QScriptEngine
 2014-07-24 21:38:13 -07:00
barnold1953
ce1b8cdafc Multicursor editvoxels support 2014-07-24 17:32:41 -07:00
Philip Rosedale
e272d0be75 Merge pull request from Atlante45/laser_pointer_js 
Laser pointer js
 2014-07-24 17:28:08 -07:00
Atlante45
9ca00b55a5 Spelling 2014-07-24 17:19:49 -07:00
Stephen Birarda
5bc42b9d1c add back the lost QXMPP_STATIC definition 2014-07-24 17:02:30 -07:00
Stephen Birarda
6fdd64c9fc change to new style of signal slot connection for XmppClient 2014-07-24 16:52:18 -07:00
Stephen Birarda
d1b050dea8 remove extra wrapping HAVE_QXMPP if 2014-07-24 16:17:34 -07:00
Stephen Birarda
bcdfc9dd78 fix HAVE_QXMPP wrappings in XmppClient 2014-07-24 16:16:39 -07:00
Stephen Birarda
c3409c782d remove a lost s 2014-07-24 15:25:34 -07:00
Stephen Birarda
8c3ab2a084 search only in lib for Leapmotion lib 2014-07-24 15:13:00 -07:00
Stephen Birarda
5cbd1492f2 more Cmake cleanup to grab externals 2014-07-24 15:09:41 -07:00
Stephen Birarda
21f4e87c51 cleanup HifiLibrarySearchHints cmake macro 2014-07-24 14:48:28 -07:00
Stephen Birarda
0849981f6a more standardization for external library searches 2014-07-24 14:43:25 -07:00
Stephen Birarda
1d78427e6a only override root dir for interface externals if they don't exist 2014-07-24 14:09:49 -07:00
Atlante45
3ffc116cc5 Merge branch 'master' of https://github.com/highfidelity/hifi into add_start_stop_animation_for_scripted_avatar 2014-07-24 13:48:23 -07:00
Atlante45
cde025c8ad Remove unnecessary arguments 2014-07-24 13:47:56 -07:00
barnold1953
d5ea2de4ea Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes 2014-07-24 11:32:31 -07:00