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

58126 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
0f7db74ef1 missed a couple warnings 2017-08-15 11:44:15 -07:00
David Kelly
a6390edf46 ugh 2017-08-15 10:10:48 -07:00
David Kelly
c08fce967f forgot a warning 2017-08-15 08:58:16 -07:00
David Kelly
ef5863d169 warnings squashed 2017-08-14 16:24:50 -07:00
David Kelly
170d2b186b url encode the base64 signature/key 2017-08-14 13:48:09 -07:00
David Kelly
803a5c6690 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-14 13:15:04 -07:00
David Kelly
b4b592cc00 one key file with (for now) both public and private keys in there 2017-08-14 12:53:10 -07:00
Zach Fox
a5fc47fc4d Merge pull request #11186 from zfox23/commerce_jsonInventory 
Commerce: Use new JSON inventory format
 2017-08-14 11:59:01 -07:00
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -07:00
Zach Fox
b3b118c5f7 Merge pull request #11180 from zfox23/commerce_useAsynchronous 
Commerce frontend now uses asynchronous API
 2017-08-14 09:58:51 -07:00
druiz17
d5644885fa Merge pull request #11177 from anshuman64/icon-rename 
Correct desktop icon name
 2017-08-14 08:55:17 -07:00
David Kelly
f784bc42de Initial cut using RSA keys for now 2017-08-11 16:54:04 -07:00
Zach Fox
0835b7b8e6 Bugfix 2017-08-11 16:36:26 -07:00
Zach Fox
d8e5f7a067 Small improvements 2017-08-11 16:32:35 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
9120e678f1 Use asynchronous commerce API 2017-08-11 16:17:13 -07:00
Howard Stearns
56d57ea160 Merge pull request #11172 from howard-stearns/asynchronous-commerce 
Asynchronous commerce
 2017-08-11 15:55:45 -07:00
howard-stearns
d7f83a2fdf Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 15:53:53 -07:00
Zach Fox
46a33dd01a Merge pull request #11173 from zfox23/commerce_inventory 
Add Inventory to Commerce
 2017-08-11 15:50:06 -07:00
Anshuman Dewangan
3bc185e67c Correct desktop icon name 2017-08-11 15:37:55 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
howard-stearns
8ee54c7b36 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 11:46:20 -07:00
howard-stearns
551ea921cd Make API asynchronous, for communicating with server 2017-08-11 11:45:40 -07:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
d2362e6329 addInventoryButton() under setting 2017-08-11 10:31:32 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
Brad Davis
26ad79aa01 Merge pull request #11171 from highfidelity/revert-11155-fix_bad_plugins 
Revert "Fix bad plugins causing instant crash on startup"
 2017-08-10 16:05:33 -07:00
Brad Davis
be9c1b0d12 Revert "Fix bad plugins causing instant crash on startup" 2017-08-10 16:05:16 -07:00
Seth Alves
972a24fea9 Merge pull request #11169 from anshuman64/new-branch 
High Fidelity Interface Application Rename
 2017-08-10 15:57:10 -07:00
Brad Davis
eb143c42d0 Merge pull request #11168 from sethalves/avatar-url-command-line-flag 
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
 2017-08-10 15:18:21 -07:00
Seth Alves
1d07bc3b4e try, try again 2017-08-10 14:32:52 -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
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
Ken Cooke
ee752df653 fix typo 2017-08-09 20:11:52 -07:00