Roxanne Skelly
d957b38f10
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-19 12:34:10 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick
...
Case 21291, Case 21292, Case 21293: Working on overlay bugs
2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity
...
Case 20920: Move Material Entity logic to render thread
2019-02-19 10:59:51 -08:00
SamGondelman
06ac2b291b
attachments and wearables cull with avatar parent
2019-02-17 17:52:10 -08:00
SamGondelman
71653f95d7
working on overlay bugs
2019-02-16 20:08:36 -08:00
SamGondelman
3df231f1e0
it's working!
2019-02-15 14:43:22 -08:00
Brad Davis
4409e59682
Add per-android-app preprocessor macros
2019-02-15 14:11:26 -08:00
John Conklin II
b9356e22d8
Merge pull request #14927 from huffman/fix/hide-asset-browser
...
Case 16349: Fix asset browser being hidden in incorrect way on server switch
2019-02-15 13:32:27 -08:00
SamGondelman
c92b82e744
merge with master
2019-02-15 12:43:30 -08:00
SamGondelman
87ab255115
finish moving materials to rendering
2019-02-15 11:49:20 -08:00
Brad Davis
a5f84ab51a
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-15 11:37:13 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping
...
Case 20242: FST materialMapping supports our material JSON format
2019-02-15 11:21:51 -08:00
Roxanne Skelly
be98fb1ac7
Standalone Tags - checkpoint
2019-02-15 11:21:40 -08:00
SamGondelman
25b31cfc72
merge with master
2019-02-15 11:08:24 -08:00
Brad Davis
0b171ffe13
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-15 10:31:04 -08:00
Ryan Huffman
ab5c4a927b
Fix asset browser being hidden in incorrect way on server switch
2019-02-14 22:18:42 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode
...
Case 20962: Billboard mode improvements
2019-02-14 17:44:48 -08:00
Shannon Romano
3b5b077a3e
Merge pull request #14887 from AndrewMeadows/shape-garbage-collector
...
Case 21066: restore shape caching in ShapeManager
2019-02-14 17:33:33 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal
...
Case 20723, Case 20334: Internally, replace all overlays with local entities
2019-02-14 13:49:47 -08:00
SamGondelman
bed2732d34
start moving materials to rendering only
2019-02-14 12:59:16 -08:00
SamGondelman
13ece79476
merge with master
2019-02-13 16:30:22 -08:00
SamGondelman
3f8bfc5475
CR and fix deadlock
2019-02-13 16:19:39 -08:00
Andrew Meadows
c79e3e5a6d
add some trace contexts for easier debugging
2019-02-13 10:02:58 -08:00
Andrew Meadows
8bdac589b8
use RingBuffer for gradual garbage collection
2019-02-12 15:37:09 -08:00
Brad Davis
4dd853ddbc
Cleanup from master
2019-02-12 15:14:50 -08:00
Sam Gateau
a10cf9b620
Merge pull request #14883 from amerhifi/feature/quest
...
case:21032 Fixing Lifecycle of the android app
2019-02-12 12:32:38 -08:00
Brad Davis
a6f23f48d6
Merge branch 'feature/quest_custom_plugins' into feature/quest
2019-02-12 09:53:12 -08:00
SamGondelman
77a8ddb3f0
Merge remote-tracking branch 'upstream/master' into materialMapping
2019-02-11 16:35:05 -08:00
SamGondelman
96f32a9f72
fix keyboard focus thing
2019-02-11 15:17:32 -08:00
amerhifi
e8a35c63c7
moved asset loading to the permissions screen, added the onNotifyAppLoaded signal connect function as well as binding to the qtread with the ui thread.
2019-02-08 13:45:53 -08:00
SamGondelman
f7a487a020
move materialcache et al to material-networking library
2019-02-08 10:28:07 -08:00
Brad Davis
d3301803d3
Support custom display / input plugin lists and small tweaks
2019-02-07 15:15:26 -08:00
danteruiz
95d30e5cbf
Merge branch 'master' of github.com:highfidelity/hifi into feature/quest
2019-02-07 10:41:44 -08:00
SamGondelman
e74ff18bef
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-07 09:48:13 -08:00
SamGondelman
a665664fd5
fix double lasers
2019-02-06 16:13:40 -08:00
Shannon Romano
6fd480e51d
Merge pull request #14795 from AndrewMeadows/myAvatar-vs-backfacing-triangles-2
...
case 17773: reduce likelihood MyAvatar will get stuck in mesh geometry when flying around
2019-02-06 15:52:31 -08:00
Brad Davis
8b70f1771e
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 13:16:22 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace
...
Qml marketplace
2019-02-06 11:20:49 -08:00
Brad Davis
91e18f569b
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-06 10:15:36 -08:00
Roxanne Skelly
d3bc536b58
Merge branch 'QmlMarketplace' of https://github.com/roxanneskelly/hifi into QmlMarketplace
2019-02-05 11:35:28 -08:00
Roxanne Skelly
2b40260953
QmlMarketplace - disable HTML for quest
2019-02-05 09:27:12 -08:00
Roxanne Skelly
78aa1783a0
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-02-04 15:04:55 -08:00
SamGondelman
934abb3d52
fix keyboard focus and image overlays
2019-02-04 13:33:03 -08:00
SamGondelman
31cf623252
fix keyboard focus
2019-02-04 12:44:04 -08:00
SamGondelman
4b406bf41c
fix getEntityObject and tablet highlighting (Overlays.findOverlays)
2019-02-01 16:23:06 -08:00
SamGondelman
b80d2a9b06
Merge remote-tracking branch 'upstream/master' into NOverlaysFinal
2019-02-01 13:33:04 -08:00
SamGondelman
0955512a80
add billboard mode to web entities and fix picking/culling
2019-01-31 15:45:10 -08:00
Wayne Chen
03789e01da
adding fix for oculus store argument check
2019-01-30 15:53:21 -08:00
Brad Davis
efff296398
Master merge cleanup
2019-01-29 14:45:05 -08:00
Brad Davis
0d34030135
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-01-29 14:13:11 -08:00
Shannon Romano
72d3eb9d33
Merge pull request #14797 from kencooke/audio-injector-stereo-distattn-bugfix2
...
case 20805: RC78.1 to master: Fix the distance attenuation of stereo local injectors
2019-01-29 13:12:51 -08:00
Ken Cooke
fa08e42da6
Restore legacy attenuation behavior for system sounds and scripts that do not set position.
...
JS detects when "position" was not set by the script.
C++ explicitly sets .positionSet=false when not set (for system sounds).
Local rendering uses a direct mix (no attenuation/HRTF) when not set.
2019-01-29 11:21:02 -08:00
Andrew Meadows
fb5ef95a5b
disable bf triangle collisions for flying MyAvatar
2019-01-29 11:00:18 -08:00
Jeff Clinton
536a76a791
Merge pull request #14787 from wayne-chen/oculusLoginFeature
...
MS20874: Only initialize plugin if started through Oculus Store
2019-01-29 10:57:03 -08:00
SamGondelman
a8dbe5e761
working on build errors
2019-01-28 21:10:24 -08:00
SamGondelman
6ad0b3412a
showKeyboardFocusHighlight + fixes
2019-01-28 20:43:47 -08:00
SamGondelman
7b88efa42c
trying to fix web surfaces??
2019-01-28 18:29:09 -08:00
SamGondelman
0d1e4bed66
merge with master
2019-01-28 18:13:05 -08:00
luiscuenca
a6dce5dd84
Merge branch 'master' into multiSphereAvatar04
2019-01-28 17:48:22 -07:00
Brad Davis
b1e4e17f47
Santa Cruz
2019-01-28 15:52:36 -08:00
Shannon Romano
d8f781deae
Merge pull request #14719 from jherico/feature/quest_frame_serialization
...
case 20883: GPU frame serialization and related tools
2019-01-28 15:47:55 -08:00
Wayne Chen
0f1aebea82
adding init/shutdown for plugin init
2019-01-28 14:35:41 -08:00
SamGondelman
2db45b3ec9
dante's keyboard changes + getProperty + some fixes
2019-01-28 14:03:43 -08:00
Roxanne Skelly
d3cffa50d6
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-28 11:11:28 -08:00
luiscuenca
cc73649ef8
Merge branch 'master' into multiSphereAvatar04
2019-01-28 11:57:04 -07:00
Jeff Clinton
f9b63b975d
Merge pull request #14781 from danteruiz/script-print-log
...
Case: 20770 allow debug prints in the log by default
2019-01-28 10:49:18 -08:00
Seth Alves
15aa574afd
Merge pull request #14774 from danteruiz/window-ontop
...
case 20705: Allow log window to stay on top
2019-01-28 10:05:48 -08:00
SamGondelman
70b1e17a8c
more wip
2019-01-27 00:05:25 -08:00
SamGondelman
0dd729232b
simplify keyboard focus highlight
2019-01-26 22:49:12 -08:00
SamGondelman
8f0bd2449b
pointerevents are working!
2019-01-26 21:53:46 -08:00
SamGondelman
abd7d6bddf
some stuff is working!
2019-01-26 01:39:13 -08:00
Shannon Romano
f084021fdf
Merge pull request #14678 from hyperlogic/feature/hmd-avatar-alignment-type
...
Added HMD Avatar Alignment Type
2019-01-25 17:32:41 -08:00
Roxanne Skelly
dfac0d88a2
QmlMarketplace - Add 'logged out' behavior, fix issue with search scope
...
display
2019-01-25 16:41:13 -08:00
Jeff Clinton
f78fdffeda
Merge pull request #14727 from wayne-chen/oculusLoginFeature
...
MS20311: Oculus login feature
2019-01-25 16:16:32 -08:00
Dante Ruiz
db58173977
fix mac issue
2019-01-25 15:10:53 -08:00
Roxanne Skelly
49e6120e73
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-25 14:06:44 -08:00
SamGondelman
a2083d949e
IT'S BUILDING (but still wip)
2019-01-25 14:04:52 -08:00
Dante Ruiz
4ed54f63ea
allow debug prints in the log by default
2019-01-25 13:56:54 -08:00
luiscuenca
f54f9e5bfd
Merge branch 'master' into multiSphereAvatar04
2019-01-25 13:54:01 -07:00
Wayne Chen
c136f24181
Merge branch 'master' into oculusLoginFeature
2019-01-25 11:44:14 -08:00
Brad Davis
81a7fa17bf
PR feedback
2019-01-25 11:14:40 -08:00
SamGondelman
5ce8f566cc
more overlay wip
2019-01-25 11:10:11 -08:00
Dante Ruiz
2c22fb82b1
keep log window on top option
2019-01-24 18:16:07 -08:00
Roxanne Skelly
cfaf01b22a
Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace
2019-01-24 17:21:16 -08:00
Roxanne Skelly
c1ff51a02d
QML Marketplace
...
Checkpoint full functionality
2019-01-24 17:20:42 -08:00
SamGondelman
0bfcde67ea
remove overlays from application.cpp
2019-01-24 14:11:24 -08:00
SamGondelman
217ff2b1b2
keyboardFocusOverlay
2019-01-23 18:33:35 -08:00
SamGondelman
5d19666f60
merge with master
2019-01-23 17:58:56 -08:00
SamGondelman
9a734b2011
merge with master
2019-01-23 17:48:24 -08:00
Anthony Thibault
a7a71e4286
Merge branch 'master' into feature/hmd-avatar-alignment-type
2019-01-23 15:52:20 -08:00
Jeff Clinton
49fa2dc75d
Merge pull request #14715 from ctrlaltdavid/M20052
...
Case 20052: Fix tablet sometimes not working after domain change
2019-01-23 15:29:20 -08:00
Brad Davis
e18e3fc138
Gpu Frame serialization
2019-01-23 13:21:34 -08:00
Jeff Clinton
b9f9766b01
Merge pull request #14747 from SimonWalton-HiFi/wallet-in-hmd
...
Fix security-image display in HMD
2019-01-23 13:18:45 -08:00
Simon Walton
3a5d550fa5
Treat QmlCommerce as a singleton class
2019-01-22 17:13:36 -08:00
Roxanne Skelly
8010d86210
QML Marketplace support
...
Support QML UI for the Marketplace as some devices do not handle
web on 3d surfaces.
Checkpoint code
2019-01-21 13:39:16 -08:00
Simon Walton
c3a8c71f60
Add TabletMenu to list of pages that trigger the QmlCommerce bridge
2019-01-21 12:27:14 -08:00
Adam Smith
da7cd6b2f7
Merge pull request #14691 from SamGondelman/multifrustum
...
Case 20394: Fix multi-frustum view updating
2019-01-18 15:23:58 -08:00
Antonina Savinova
8c4c488676
Merge pull request #14721 from Atlante45/feat/upstream-limitter
...
Limit upstream bandwidth to the Avatar Mixer
2019-01-18 13:32:03 -08:00
Wayne Chen
2859784e17
Merge branch 'master' into oculusLoginFeature
2019-01-17 14:20:00 -08:00
