Seth Alves
|
327bc23b5c
|
get ready for highlighting
|
2017-08-13 11:41:12 -07:00 |
|
Seth Alves
|
e7437d66ef
|
if a raypick hits something that's very close, put it into the nearby-entities list
|
2017-08-12 17:49:02 -07:00 |
|
Seth Alves
|
ec93172676
|
far-search rays work, but nothing else about far-grab.
|
2017-08-12 17:27:48 -07:00 |
|
Seth Alves
|
505b564c62
|
sort plugins isReady calls by plugin priority. hook up pickrays in data-gathering phase
|
2017-08-12 13:14:00 -07: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
|
9fb1835a26
|
grabbing overlays works, again
|
2017-08-12 12:38:36 -07:00 |
|
Seth Alves
|
7ae41064db
|
tablet stylus works again
|
2017-08-12 11:19:39 -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 |
|
Zach Fox
|
a21ff75a49
|
Big progress!
|
2017-08-11 12:54:55 -07:00 |
|
Seth Alves
|
b4a54b017a
|
plugins occupy activity-slots and more than one plugin may run at a time, as long as their slots aren't in conflict
|
2017-08-11 12:15:41 -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 |
|
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
|
128be5c2c1
|
Merge branch 'sharks' of github.com:SamGondelman/hifi into controller-dispatcher-1
|
2017-08-11 08:52:47 -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 |
|
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 |
|
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 |
|
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 |
|