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 |
|
SamGondelman
|
f058781f49
|
just kidding shared_mutexes are c++17
|
2017-08-11 10:07:20 -07:00 |
|
Elisa Lupin-Jimenez
|
6c2bf63392
|
Back button works
|
2017-08-10 17:51:19 -07:00 |
|
Anthony J. Thibault
|
49adf04913
|
Added Developer > Avatar > Show Detailed Collision menu option
|
2017-08-10 16:36:09 -07:00 |
|
Elisa Lupin-Jimenez
|
da5bb03187
|
Trying to add in a back button
|
2017-08-10 16:34:37 -07:00 |
|
SamGondelman
|
e4c954e862
|
merge from master
|
2017-08-10 16:30:33 -07:00 |
|
SamGondelman
|
353a3e8c68
|
properly fix AA stenciling
|
2017-08-10 16:07:40 -07:00 |
|
SamGondelman
|
96b179386f
|
working on fixing non-AA overlays
|
2017-08-10 16:07:40 -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 |
|
Anthony J. Thibault
|
ae98974d79
|
improve 14-dop generation for avatar joint collision
Also added debug rendering functionality.
|
2017-08-10 15:52:51 -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 |
|
Elisa Lupin-Jimenez
|
28476960bb
|
Moved Blocks to tablet app
|
2017-08-10 14:23:45 -07:00 |
|
samcake
|
5fb3000910
|
Merge branch 'black' of https://github.com/samcake/hifi into black
|
2017-08-10 14:20:50 -07:00 |
|
samcake
|
9e4daa6688
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2017-08-10 14:20:25 -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 |
|
Ken Cooke
|
ee752df653
|
fix typo
|
2017-08-09 20:11:52 -07:00 |
|
Ken Cooke
|
bcdf13c59c
|
Add explicit shutdown request, since null device means something else
|
2017-08-09 19:40:07 -07:00 |
|
Sam Gateau
|
ac9f26934d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into black
|
2017-08-09 18:56:25 -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 |
|