Commit graph

21477 commits

Author SHA1 Message Date
Seth Alves
774cb33303 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-15 09:17:52 -07:00
Seth Alves
21cef482a5 Merge pull request #11190 from druiz17/fix-table-dialog
Fixed unable to select items in a TreeView
2017-08-14 17:05:42 -07:00
Dante Ruiz
459f2c5cdc fixed tab issue 2017-08-14 16:03:12 -07:00
Dante Ruiz
99617600c4 fix selection issue for TreeView.qml 2017-08-14 15:58:28 -07:00
Zach Fox
823f2fb252 Merge pull request #11181 from cain-kilgore/skybox-changer
WL 21447 - Create a Skybox Changer
2017-08-14 15:08:03 -07:00
Zach Fox
ee4a07b10d Merge pull request #11187 from zfox23/context_removeWhenDeleting
Remove context overlay (if present) when removing entity
2017-08-14 15:06:20 -07:00
Cain Kilgore
e7a4bff705 Made Changes per Review, added js 2017-08-14 22:47:18 +01:00
druiz17
97aa92bc44 Merge pull request #11170 from cain-kilgore/web-browser-assets
Added Assets for Web Browser MP Script
2017-08-14 13:50:11 -07:00
Zach Fox
c1d771842d Remove context overlay (if present) when removing entity 2017-08-14 13:37:50 -07:00
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -07:00
Cain Kilgore
28c81534c4 Updated Text at Top 2017-08-14 05:11:53 +01:00
Seth Alves
92cb1c9bf2 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-12 12:40:18 -07:00
Seth Alves
06780b638d Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1 2017-08-12 12:39:43 -07:00
Seth Alves
7ae41064db tablet stylus works again 2017-08-12 11:19:39 -07:00
Cain Kilgore
8c9f3ae977 Skybox Changer PR 2017-08-12 01:35:48 +01: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
d7f83a2fdf Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 15:53:53 -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
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
SamGondelman
f058781f49 just kidding shared_mutexes are c++17 2017-08-11 10:07:20 -07:00
Seth Alves
2dc76f6e42 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-11 08:52:55 -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
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
SamGondelman
d0d5ac8dd1 switch to stl wherever possible, use bitset instead of unsigned ints 2017-08-10 15:33:55 -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
Cain Kilgore
4e81ebf85c Added Assets for Web Browser MP Script 2017-08-10 22:53:35 +01:00
Seth Alves
1d07bc3b4e try, try again 2017-08-10 14:32:52 -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
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
anshuman64
95b1d5fb91 Merge pull request #11146 from ElderOrb/help_buttons
5351: Help Button has Old UI
2017-08-10 11:56:11 -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
Seth Alves
f125ef04f1 Merge pull request #11150 from ElderOrb/Case6742
6742: Multiple highlighted buttons
2017-08-09 17:53:55 -07:00
Anthony J. Thibault
4d845bd208 Bug fix for HMD roll causing avatar yaw when standing still
HMD roll should only cause the avatar to yaw when actively driving.
2017-08-09 15:52:27 -07:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
Howard Stearns
cc634a2d1b Merge pull request #11148 from zfox23/commerce_singleSetting
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
2017-08-09 13:25:10 -07:00
howard-stearns
f1ab91edd1 PR feedback 2017-08-09 12:41:16 -07:00
beholder
802b5733c5 6742: Multiple highlighted buttons 2017-08-09 22:26:13 +03:00