SamGondelman
4fdf556d5d
fix billboard mode in secondary camera
2019-02-21 10:29:21 -08:00
Roxanne Skelly
8c058f147e
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-20 14:24:47 -08:00
Brad Davis
79369a0c83
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-20 10:40:49 -08:00
Brad Davis
122a246d2d
Fix typo
2019-02-19 17:30:47 -08:00
Brad Davis
518e480a8b
Fix plugin activation
2019-02-19 17:00:50 -08:00
SamGondelman
6765268998
Merge remote-tracking branch 'upstream/master' into wearables
2019-02-19 16:52:00 -08:00
Brad Davis
d60dcb99d2
Merge remote-tracking branch 'upstream/master' into feature/quest
2019-02-19 12:37:30 -08:00
Roxanne Skelly
d957b38f10
Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags
2019-02-19 12:34:10 -08:00
r3tk0n
ebbf48a11b
Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco
2019-02-19 12:02:50 -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
r3tk0n
ea025a6878
Add hand dominance states to Controller.Hardware.Application for left and right hand dominance.
2019-01-21 15:38: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
John Conklin II
19e4a7389b
Merge pull request #14676 from wayne-chen/updateLoginUserLogging
...
case 20654: Updating user activity logging for login experience
2019-01-17 12:59:12 -08:00
John Conklin II
45ec44423b
Merge pull request #14694 from danteruiz/delete-only-domain-entities
...
case 20595: case 20563: Do not delete local entities when switching domains.
2019-01-17 11:25:58 -08:00
Wayne Chen
bb61334c0d
Merge branch 'master' into oculusLoginFeature
2019-01-16 17:24:22 -08:00
Wayne Chen
6bc1164d58
more wip on oculus login
2019-01-16 17:05:50 -08:00
Wayne Chen
4320f4cbe4
migrating platform plugin
2019-01-16 17:05:50 -08:00
Wayne Chen
a24ebe2718
oculus functions live in the display plugin; display plugins update
2019-01-16 17:05:49 -08:00
Wayne Chen
db06533018
adding more staging
2019-01-16 17:05:48 -08:00
Seth Alves
fd09180776
Merge pull request #14645 from ctrlaltdavid/M19774-d
...
Make mouselook directly proportional to right-click mouse
2019-01-16 09:09:38 -08:00
luiscuenca
a7f143dbce
Merge branch 'master' into multiSphereAvatar04
...
# Resolved Conflicts:
# interface/src/avatar/MyAvatar.h
# interface/src/avatar/OtherAvatar.cpp
2019-01-15 18:27:04 -07:00
luiscuenca
71e7023a3e
Refactor and optimizations
2019-01-15 18:07:50 -07:00
SamGondelman
1d2270e9c7
web entity fixes
2019-01-15 16:51:36 -08:00
David Rowe
184c11ca44
Fix tablet sometimes not working after domain change
2019-01-16 08:54:29 +13:00
Clement
6bd6c45b60
Remove dead IdentityRequest code
2019-01-15 11:40:08 -08:00
SamGondelman
9803043512
web entity fixes
2019-01-15 09:51:55 -08:00
Dante Ruiz
e7d3844620
making pre review requests
2019-01-14 11:14:57 -08:00
SamGondelman
6fd34bf1f0
setup qml surface contexts
2019-01-14 09:26:57 -08:00
Dante Ruiz
8252481ce7
Delete domain entities only
2019-01-11 16:00:10 -08:00
Seth Alves
6cd5770505
Merge pull request #14690 from sethalves/plugin-versioning
...
Plugin versioning
2019-01-11 15:20:05 -08:00
luiscuenca
19701ef333
Fix scale and add rayTest
2019-01-11 15:36:07 -07:00
SamGondelman
4b67a79561
more web entity wip
2019-01-11 09:57:42 -08:00
SamGondelman
6d12f5704e
fix multi-frustum view updating
2019-01-10 15:47:19 -08:00
Seth Alves
c8db50cb20
start up logger before loading plugins.
...
put a plugin-interface version into the meta data of each plugin. don't load plugins that don't match the current version.
2019-01-10 15:06:22 -08:00
Andrew Meadows
e2d6e6f3dc
more correct AvatarEntityData settings when switching domains
2019-01-09 17:28:00 -08:00
Andrew Meadows
cbda905e3b
fix typo
2019-01-09 17:28:00 -08:00
Andrew Meadows
329ec84104
MyAvatar.setAvatarEntityData() works in theory, blobs saved to settings
2019-01-09 17:28:00 -08:00
Andrew Meadows
121a591023
delete old AvatarEntities on domain reset on login
2019-01-09 17:27:14 -08:00
Andrew Meadows
ec384d7dbb
more correct reload AvatarEntityData from settings
2019-01-09 17:27:14 -08:00
Wayne Chen
ba8620b644
updating user activity logging
2019-01-09 13:51:40 -08:00
Anthony Thibault
5d606981de
Added HMD Avatar Alignment Type
...
Adds a new API to set this type, and an option to the Avatar App.
* "eye" - Match the user eyes with the avatar eyes. The previous default behavior.
If the avatar skull is larger then the user, it can cause the avatars body to lift off of the ground when the user looks down.
* "head" - Match the user head with the avatar head. The new default behavior.
This prevents the body from lifting off of the ground while wearing a large headed avatar. But can cause an offset between the users eyes and the avatars eyes.
2019-01-08 18:35:28 -08:00
Roxanne Skelly
37d4846722
Merge branch 'master' of https://github.com/highfidelity/hifi into Case20377
2019-01-07 11:56:48 -08:00
Shannon Romano
963bbbad19
Merge pull request #14661 from danteruiz/grabbing-web-entites
...
allow mouse pointer to pick against collidable entities
2019-01-07 10:24:48 -08:00
Dante Ruiz
4b99a795dd
code review changes
2019-01-07 09:09:35 -08:00
Roxanne Skelly
6d791a80c2
Bump protocol version for BulkAvatarTraits and add some guard code
...
around packet parsing.
2019-01-04 19:04:01 -08:00
Dante Ruiz
0dc5e7743f
allow mouse pointer to pick against collidable entities
2019-01-04 17:49:38 -08:00
Shannon Romano
4e5d275768
Merge pull request #14632 from thoys/feat/avatarTools/avatarPackager
...
MS19925: Avatar Packager
2019-01-04 16:22:06 -08:00
Shannon Romano
9855e9bee8
Merge pull request #14650 from NissimHadar/20301-addPlatformInfo
...
Case 20301 - add platform info
2019-01-04 14:37:17 -08:00
Thijs Wenker
8625037285
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
2019-01-04 15:29:07 +01:00
Antonina Savinova
4414579a6e
Merge pull request #14591 from Atlante45/feat/stats
...
Fix network stats to use low-level values
2019-01-03 16:54:03 -08:00
Ryan Huffman
93f53cf43d
Merge branch 'feat/avatarTools/avatarPackager' of github.com:thoys/hifi into feat/avatarTools/avatarPackager
2019-01-03 14:18:40 -08:00
Ryan Huffman
7ca7e0f234
Revert unintended changes in avatar packager
2019-01-03 13:45:00 -08:00
Thijs Wenker
c95da0a595
Merge branch 'master' of github.com:highfidelity/hifi into feat/avatarTools/avatarPackager
...
# Conflicts:
# interface/src/Application.cpp
2019-01-03 22:17:54 +01:00
