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

46564 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
12e6920a8d fix syntax error 2016-08-31 08:15:00 -07:00
Zach Pomerantz
372c52fea5 restore default ambient skybox 2016-08-30 17:07:34 -07:00
Zach Pomerantz
0e9ff04c4c fix layered zone applications 2016-08-30 17:00:02 -07:00
Zach Pomerantz
bb39cdafda fix applyPartial for last zone 2016-08-30 17:00:02 -07:00
Zach Pomerantz
abde84b068 fix async skybox tex loading 2016-08-30 17:00:02 -07:00
Seth Alves
c6804ba721 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 16:23:22 -07:00
Seth Alves
3d436d4c26 bump entity protocol version 2016-08-30 16:23:11 -07:00
Ken Cooke
1a6af49b3d Support for even more back-end sample rates 2016-08-30 16:10:11 -07:00
elisa-lj11
d16ef521f4 fixed merge conflicts from Howard's webview fix 2016-08-30 15:33:59 -07:00
Brad Davis
3ca01a1e4b Merge pull request #8540 from howard-stearns/restore-WebView-tab-handler 
restore onNewViewRequested
 2016-08-30 15:21:27 -07:00
elisa-lj11
aceddb0cf8 merge with james repo 2016-08-30 15:07:01 -07:00
Seth Alves
cdd08bd38e more anti-jitter changes 2016-08-30 14:59:30 -07:00
samcake
af68a2550e Remve dead code 2016-08-30 14:53:37 -07:00
Seth Alves
78f54a7f33 get rid of some jitter in equipped items. do a better job of deciding when something equipped has been torn-away 2016-08-30 14:39:11 -07:00
Ken Cooke
cb5bded7c1 Add support for more back-end sample rates 2016-08-30 14:37:33 -07:00
howard-stearns
8824507523 new smaller WebView.qml 2016-08-30 14:37:08 -07:00
samcake
2a5ee5d6b1 Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots 2016-08-30 14:28:52 -07:00
elisa-lj11
bbb80f4a55 hello again 2016-08-30 14:24:00 -07:00
James B. Pollack
e4bdc2e86c cleanup 2016-08-30 14:17:27 -07:00
elisa-lj11
074f9e0688 test to merge to status_bar branch 2016-08-30 14:15:27 -07:00
howard-stearns
564769f7d3 move WebView.qml to baseWebView.qml 2016-08-30 14:07:34 -07:00
howard-stearns
232ac74b26 back to master version 2016-08-30 14:06:20 -07:00
James B. Pollack
a6a834f2c7 remember and work on toggle 2016-08-30 13:58:28 -07:00
samcake
c553e5f2fe fine tune the scripts for proper presentation of the timing values 2016-08-30 13:57:47 -07:00
Ken Cooke
9187b4aa7d More complete fix for audio threading failures. Qt keeps an internal Q_GLOBAL_STATIC list of devices, which is referenced at device start() but clobbered by availableDevices(). Now protected by a mutex. 2016-08-30 12:57:29 -07:00
samcake
b18c0d5325 Revert enabling sRGB for GLcontext pixel format 2016-08-30 12:44:35 -07:00
Seth Alves
53ff6a239d Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 12:39:35 -07:00
Seth Alves
5bda94b2ba use same data as used for drawing show-hand-targets for controller joints in MyAvatar 2016-08-30 12:39:30 -07:00
samcake
ba9a6b107f Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2016-08-30 12:24:52 -07:00
samcake
faef8a9930 Adding the timing for GPU support with a simpelr JobConfig 2016-08-30 12:22:21 -07:00
howard-stearns
c5b998a2a8 use new hook in marketplace code 2016-08-30 12:18:03 -07:00
elisa-lj11
8b62c0e712 switching over to a fork 2016-08-30 11:49:49 -07:00
Chris Collins
188f5d5ace Merge pull request #8545 from ZappoMan/fbx2016 
support for fbx2016 format
 2016-08-30 11:36:25 -07:00
Seth Alves
617880479a Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 11:19:40 -07:00
Seth Alves
3a5f92d7a2 ignoreIK for equipping. change how auto-unequip searches 2016-08-30 11:16:13 -07:00
Brad Davis
eb0a8db0af Merge pull request #8539 from hyperlogic/bug-fix/snappy-search-beam 
When trigger is pulled, snap search beam to correct length instead of animating
 2016-08-30 11:13:58 -07:00
elisa-lj11
37cc50a14a Merge remote-tracking branch 'highfidelity/master' into marketplaces_html 2016-08-30 10:45:26 -07:00
elisa-lj11
fa941e4a1b Merge remote-tracking branch 'origin' into marketplaces_html 2016-08-30 10:42:56 -07:00
Seth Alves
2a9ffc1529 Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions 2016-08-30 10:26:14 -07:00
Ken Cooke
d2b33e00bd Fix audio startup failures. Directly calling the static method QAudioDeviceInfo::availableDevices() was not thread-safe. 2016-08-30 10:13:08 -07:00
Seth Alves
7d13f9220c fix math, renamed a couple variables 2016-08-30 09:55:42 -07:00
Seth Alves
01ee6e9e98 Merge branch 'arrow-actions' of github.com:sethalves/hifi into arrow-actions 2016-08-30 09:42:57 -07:00
Stephen Birarda
74fac8c7c9 Merge pull request #8512 from birarda/shareable-address 
add shareable address from default name, leverage for steam join/invite
 2016-08-30 09:35:24 -07:00
Seth Alves
a9400119ab Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions 2016-08-30 09:13:16 -07:00
Seth Alves
f4eee8d480 Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers 2016-08-30 09:12:53 -07:00
Brad Hefta-Gaub
7397b884e7 support for fbx2016 format 2016-08-30 09:07:39 -07:00
elisa-lj11
6bd41d0dd5 added status bar to marketplace 2016-08-29 18:43:52 -07:00
elisa-lj11
f2e61aa504 added status bar to marketplace 2016-08-29 18:43:32 -07:00
Seth Alves
314b7617ac Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events 
Bug fix for click events received by entity scripts
 2016-08-29 17:57:56 -07:00
James B. Pollack
2b2b2ecbac caps 2016-08-29 17:44:33 -07:00