Philip Rosedale
|
9a83be618a
|
Merge pull request #3191 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 #3203 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
|
005a3c7c12
|
persist and recall domain-server web sessions from ini settings
|
2014-07-24 17:17:57 -07:00 |
|
wangyix
|
473cbf2afe
|
client audio now updated with stream class; seems fine for now
|
2014-07-24 17:15:46 -07:00 |
|
Stephen Birarda
|
5bc42b9d1c
|
add back the lost QXMPP_STATIC definition
|
2014-07-24 17:02:30 -07:00 |
|
Andrzej Kapolka
|
605b3282e7
|
Working on render bits.
|
2014-07-24 17:01:15 -07:00 |
|
barnold1953
|
9b629a7326
|
Added slerp and squad to the Quat scripting interface
|
2014-07-24 16:55:23 -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 |
|
wangyix
|
21402e3ff1
|
cleaned up some stuff
|
2014-07-24 14:50:13 -07:00 |
|
Stephen Birarda
|
21f4e87c51
|
cleanup HifiLibrarySearchHints cmake macro
|
2014-07-24 14:48:28 -07:00 |
|
wangyix
|
83ba4b9a1c
|
Audiomixer now working (added call to updateNextOutputTrailingLoudness())
|
2014-07-24 14:43:29 -07:00 |
|
Stephen Birarda
|
0849981f6a
|
more standardization for external library searches
|
2014-07-24 14:43:25 -07:00 |
|
Andrzej Kapolka
|
d0c5fec777
|
Thread safety for spanners.
|
2014-07-24 14:28:49 -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 |
|
wangyix
|
3d22a11e28
|
debugging new audio stream organization
|
2014-07-24 13:58:15 -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 |
|
Andrzej Kapolka
|
5bd3d1fe20
|
Working on renderer attribute.
|
2014-07-24 13:16:18 -07:00 |
|
wangyix
|
172cd91f27
|
removed unused seq variable
|
2014-07-24 11:58:07 -07:00 |
|
wangyix
|
da3339fc39
|
minor const change to qhash iterator
|
2014-07-24 11:57:00 -07:00 |
|
barnold1953
|
d5ea2de4ea
|
Merge branch 'master' of https://github.com/highfidelity/hifi into jsBlendShapes
|
2014-07-24 11:32:31 -07:00 |
|
Stephen Birarda
|
2e5dc2320d
|
don't flip order on node socket, HifiSockAddr is handling
|
2014-07-24 11:09:09 -07:00 |
|
wangyix
|
fe70c1f49a
|
didn't commit for some reason
|
2014-07-24 10:48:56 -07:00 |
|
wangyix
|
c9b6879ca8
|
audiomixer code complete; need to test
|
2014-07-24 10:48:27 -07:00 |
|
barnold1953
|
9ac8b732f0
|
FIxed error on ubuntu
|
2014-07-24 10:32:34 -07:00 |
|
Andrew Meadows
|
2ddca4fbf9
|
split independent classes out of Ragdoll files
|
2014-07-24 09:50:16 -07:00 |
|
Stephen Birarda
|
dc78a6f2c4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-24 09:40:47 -07:00 |
|
Andrew Meadows
|
1d124ebc61
|
fix comments
|
2014-07-24 08:49:41 -07:00 |
|
Andrew Meadows
|
2aaa628a67
|
send visible joint state when colliding as ragdoll
|
2014-07-24 08:42:34 -07:00 |
|
Mohammed Nafees
|
99ba0c6641
|
Merge remote-tracking branch 'upstream/master' into 19701
|
2014-07-24 20:28:23 +05:30 |
|
Philip Rosedale
|
a1b74c5272
|
remove unused code
|
2014-07-23 23:07:37 -07:00 |
|
Philip Rosedale
|
5aecbe690d
|
made calculateAverageEyePosition private, changed to getEyePosition() where used outside head
|
2014-07-23 22:56:59 -07:00 |
|
Philip Rosedale
|
00fdc37822
|
add velocity filtering to eyePosition to reduce camera jitter from faceshift
|
2014-07-23 22:45:50 -07:00 |
|
Andrzej Kapolka
|
0da46a5bc5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
|
2014-07-23 18:20:34 -07:00 |
|
Andrzej Kapolka
|
27f88e9f80
|
Progress on threading.
|
2014-07-23 18:20:00 -07:00 |
|
Andrew Meadows
|
924cc600b0
|
merge upstream/master into andrew/ragdoll
|
2014-07-23 18:03:09 -07:00 |
|
AndrewMeadows
|
509b86f092
|
Merge pull request #3205 from birarda/select-library
lowercase the SIXENSE_ROOT_DIR
|
2014-07-23 18:01:23 -07:00 |
|
Stephen Birarda
|
e182f54180
|
exclude sixense debug on UNIX only, not APPLE
|
2014-07-23 17:52:50 -07:00 |
|
Stephen Birarda
|
9fcb6735ce
|
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth
|
2014-07-23 17:50:18 -07:00 |
|
Philip Rosedale
|
f05855dcc2
|
Merge pull request #3199 from ey6es/master
Fix for shadows in close-up inset mirror.
|
2014-07-23 17:49:55 -07:00 |
|
Stephen Birarda
|
bc96975700
|
don't look for debug sixense on UNIX to avoid missing symbol
|
2014-07-23 17:49:38 -07:00 |
|
Clément Brisset
|
279a107272
|
Merge pull request #3200 from thoys/feature-multiple-JS-cursors
Feature multiple js cursors
|
2014-07-23 17:46:56 -07:00 |
|
Stephen Birarda
|
4cf27a0099
|
check in sixense not Sixense
|
2014-07-23 17:44:38 -07:00 |
|