Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-25 11:52:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58573 commits 76 branches 59 tags 1.2 GiB
Commit graph

58573 commits

This branch
This branch
All branches
Author SHA1 Message Date
Elisa Lupin-Jimenez
28476960bb Moved Blocks to tablet app 2017-08-10 14:23:45 -07:00
Elisa Lupin-Jimenez
b0c91547b4 Fixed WebGL rendering 2017-08-10 14:14:09 -07:00
Chris Collins
99a05c4213 Merge pull request #11164 from ZappoMan/reEnableHydra 
re-enable sixense and update comment
 2017-08-10 13:52:07 -07:00
Seth Alves
ff83a8158b cancel effects of --replaceAvatarURL when avatar is changed with preference dialog 2017-08-10 13:49:48 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Anshuman Dewangan
f79bf4e009 High Fidelity Interface rename 2017-08-10 13:40:00 -07:00
Zach Fox
334f71e4fb Merge pull request #11166 from howard-stearns/commerce-blance-inventory 
balance and inventory stubs
 2017-08-10 13:33:56 -07:00
howard-stearns
8f0fd10e2b fix 2017-08-10 12:51:05 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
Clément Brisset
e37029599b Merge pull request #11163 from birarda/bug/audio-searcher-stop 
clear entity tree in Agent if ES node goes away
 2017-08-10 12:37:03 -07:00
Chris Collins
5a5ba08ae9 Merge pull request #11155 from jherico/fix_bad_plugins 
Fix bad plugins causing instant crash on startup
 2017-08-10 12:35:58 -07:00
Seth Alves
d812c293e8 Merge pull request #11120 from mukulHF/bug-lock-default-scripts 
Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values
 2017-08-10 12:29:23 -07:00
druiz17
005c5a9278 Update TabletRunningScripts.qml 2017-08-10 12:26:57 -07:00
ZappoMan
87b2af25ba re-enable sixense and update comment 2017-08-10 12:03:56 -07:00
anshuman64
95b1d5fb91 Merge pull request #11146 from ElderOrb/help_buttons 
5351: Help Button has Old UI
 2017-08-10 11:56:11 -07:00
Stephen Birarda
e8bd4334fe Merge pull request #11156 from birarda/bug/update-tbb-vc14 
stop compiling tbb from source and use vc14 version for VS 2015/2017
 2017-08-10 11:25:21 -07:00
Stephen Birarda
8d0ed51035 clear entity tree in Agent if ES disappears 2017-08-10 11:02:56 -07:00
Elisa Lupin-Jimenez
af95d7f892 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-10 10:13:27 -07:00
Stephen Birarda
feef7dfec3 compare MSVC version numerically with greater_equal 2017-08-10 09:46:58 -07:00
Zach Fox
cb02ff4026 Merge pull request #11154 from zfox23/commerce_fixMarketplacesMessagePassing 
Fix marketplaces message passing
 2017-08-10 09:46:54 -07:00
Ken Cooke
d0e7584f0f Merge pull request #11158 from kencooke/audio-input-dummy 
Support for running Interface without a microphone
 2017-08-10 06:47:04 -07:00
David Rowe
6977c35b6e Reduce number of Entities.getEntityProperties() calls 2017-08-10 22:17:46 +12:00
David Rowe
6d61c188f8 Tighten up grabbing created entity 2017-08-10 21:22:11 +12:00
David Rowe
20c7e17fb6 Tidy up logging 2017-08-10 21:13:40 +12:00
David Rowe
b58cac1c56 Tidying 2017-08-10 17:28:43 +12:00
David Rowe
4b3f7d6614 Reorient Tools menu and slightly adjust Create palette position 2017-08-10 16:46:39 +12:00
David Rowe
a6af6e0bff Add extra color swatches for user tests 2017-08-10 16:27:19 +12:00
David Rowe
594d144210 Finesse sliders to produce values that fully got to 0.0 and 1.0 2017-08-10 15:45:05 +12:00
David Rowe
9442a667b4 Raise sliders on hover 2017-08-10 15:32:48 +12:00
Ken Cooke
ee752df653 fix typo 2017-08-09 20:11:52 -07:00
David Rowe
cc64644946 Don't press sliders down when click on them 2017-08-10 15:02:19 +12:00
Ken Cooke
bcdf13c59c Add explicit shutdown request, since null device means something else 2017-08-09 19:40:07 -07:00
Stephen Birarda
c7edc98d5c remove deprecated CMake policy no longer needed 2017-08-09 18:47:50 -07:00
Stephen Birarda
5b072b591e remove commas breaking MSVC dir setting 2017-08-09 18:41:34 -07:00
anshuman64
0f163a6a7c Merge pull request #11153 from hyperlogic/bug-fix/you-spin-me-right-round-baby-right-round 
Bug fix for HMD roll causing avatar yaw when standing still
 2017-08-09 18:00:03 -07:00
Stephen Birarda
57fe5ae802 use tbb binaries more and update for vc14 2017-08-09 17:55:15 -07:00
Seth Alves
f125ef04f1 Merge pull request #11150 from ElderOrb/Case6742 
6742: Multiple highlighted buttons
 2017-08-09 17:53:55 -07:00
Ken Cooke
ee6d4dfc14 If real input device fails to start, use dummy input 2017-08-09 17:50:20 -07:00
David Rowe
e1adb3a20e Add image slider (for H, S, V or similar values) 2017-08-10 12:44:30 +12:00
Elisa Lupin-Jimenez
d3c76c99c2 See all markets button working again 2017-08-09 17:28:05 -07:00
Elisa Lupin-Jimenez
69a13052ab commented out blocks injection 2017-08-09 17:23:08 -07:00
Brad Davis
0452bcfbd5 Fix bad plugins causing instant crash on startup 2017-08-09 17:15:04 -07:00
Zach Fox
2d256a62a9 Fix marketplaces message passing 2017-08-09 17:04:36 -07:00
Ken Cooke
fc5b4be459 bugfix 2017-08-09 16:59:02 -07:00
Ken Cooke
9c6b7306c4 Re-implement callback to Use common handleAudioInput() 2017-08-09 16:58:12 -07:00
Zach Fox
4cfc80c70f Merge pull request #11151 from zfox23/commerce_workingBuyButton 
Adds a working "Buy" button to Checkout.qml
 2017-08-09 16:56:58 -07:00
Liv
6bde4db0d7 wrap in marketplace check and change landing point 2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
74c90d6323 minor typo 2017-08-09 16:08:47 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00