NissimHadar
d5bb582811
Per Austin's comments.
2018-05-08 11:40:56 -07:00
NissimHadar
eb14658bc5
Per Austin's comments.
2018-05-08 11:13:06 -07:00
amantley
6051f4b8ff
Merge remote-tracking branch 'origin/nativeCGCode' into nativeCGCode
...
synching the branch with the remote repo
2018-05-08 10:55:14 -07:00
amantley
544967ef3b
added test function to cancel out roll and pitch
2018-05-08 10:55:10 -07:00
amantley
bbf8c73572
code review changes to declare functions static
2018-05-08 10:52:28 -07:00
amantley
3a10cacec0
1.added the swing twist code to update the follow rotation in MyAvatar.cpp
...
2.added step.js and cg_lean.js to the developer folder
3.added menu item for toggling the hips following between head and hips
4.added new function to return true if the root of MyAvatar is translating
to be under the head. Used to smooth the path of the hips
5.added computeCounterBalance to MyAvatar.h and cpp
6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp
7.added head yaw into the calculation of the hip rotation for the center
of gravity. This is already was happening in the deriveBodyFromHMD code
that is default
8.Changed Constants in Avatar constants for the base of support
9.fixed the over rotation of the shoulders
10.fixed scaling problem in cg computation
11.added room for going up on the toes without stretching
2018-05-07 17:41:35 -07:00
NissimHadar
8ad13826bd
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 13:11:39 -07:00
NissimHadar
2e51a66441
Use 'standard' format for command line parameter with multiple options.
2018-05-07 13:01:18 -07:00
Gabriel Calero
9b63b76b68
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-07 16:06:02 -03:00
Gabriel Calero
66b975192d
Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login
2018-05-07 15:56:43 -03:00
John Conklin II
6ac43c34c2
Merge pull request #13032 from druiz17/fix-spamming-reset-sensors
...
don't spam resetSensors function when holding down Qt::Key_Apostrophe
2018-05-07 10:52:51 -07:00
NissimHadar
481eddb2a3
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-07 08:24:03 -07:00
vladest
afe04f3a4f
cleanup
2018-05-06 14:24:54 +02:00
vladest
1794113f37
Check global switch as well
2018-05-06 12:51:59 +02:00
vladest
ac413c8854
Tablet opening notification sound settings added
2018-05-06 09:41:10 +02:00
Seth Alves
30c5fa6fa1
fix divide-by-zero asan warning in LODManager::autoAdjustLOD
2018-05-05 20:45:06 -07:00
vladest
c7ab1f3dbf
Merge branch 'master' into menu-updates
2018-05-05 20:48:40 +02:00
vladest
5a5bfcfe02
Merge branch 'master' into menu-updates
2018-05-05 07:11:39 +02:00
Clement
5a3773ba72
Fix compile error on linux/windows
2018-05-04 18:18:46 -07:00
Bradley Austin Davis
38f43bdc68
Disable current splash frame implementaton
2018-05-04 16:40:05 -07:00
Bradley Austin Davis
803bd284a6
Alternate shader
2018-05-04 16:40:05 -07:00
Brad Davis
72526781d9
Additional work on splash screen
2018-05-04 16:40:05 -07:00
Clement
da9fb9c751
Fix non self-sufficient headers
2018-05-04 16:26:41 -07:00
Cristian Luis Duarte
03ca427234
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-04 20:18:15 -03:00
Stephen Birarda
ec354620db
Merge pull request #12956 from huffman/feat/client-texture-selection-baking
...
Add support for client texture selection
2018-05-04 16:14:43 -07:00
Anthony J. Thibault
8480bb962b
Fix for crash deep in QML after useFullAvatarURL
...
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-04 16:08:44 -07:00
Clément Brisset
39e2a78b1a
Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist
...
Multifrustum queries punchlist
2018-05-04 15:50:44 -07:00
Gabriel Calero
087c6ff730
Patch for secondary camera assert error on Android
2018-05-04 18:45:39 -03:00
Cristian Luis Duarte
8c96d2be3c
Patch for secondary camera assert error on Android
2018-05-04 18:44:07 -03:00
Clement
ad60a79180
Fix for android builds
2018-05-04 14:43:28 -07:00
Clement
b04c5bd0db
CR
2018-05-04 14:43:16 -07:00
Cristian Luis Duarte
9f5365a277
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-04 18:38:08 -03:00
Gabriel Calero
1330132a32
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-04 18:35:51 -03:00
Liv Erickson
ee0af079cf
merge from upstream master and fix conflict
2018-05-04 14:34:38 -07:00
NissimHadar
2311fa33fb
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-04 14:13:43 -07:00
Gabriel Calero
868b58e66d
Un-expose Application from javascript. Restore displayplugin deactivation when goes to background
2018-05-04 18:01:01 -03:00
vladest
9e5dbf9a99
Snapshot notification sound settings
2018-05-04 22:01:44 +02:00
NissimHadar
aef5ea0936
Correct usage of the test script URL.
2018-05-04 12:30:13 -07:00
John Conklin II
c7bc479c60
Merge pull request #13094 from hyperlogic/bug-fix/case-14639
...
Fix for crash deep in QML after useFullAvatarURL
2018-05-04 11:33:28 -07:00
Zach Fox
1da840984b
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-04 10:24:28 -07:00
milad nazeri
b32039f895
Merge branch 'master' of https://github.com/highfidelity/hifi into gravprep-redo
2018-05-03 23:08:06 -07:00
Clement
487a63025f
Fix warning
2018-05-03 18:19:52 -07:00
Clement
d87cd2af6e
Update avatar query names
2018-05-03 18:19:30 -07:00
Clement
27c471ee97
Move all wire frustums to conical frustums
2018-05-03 18:19:29 -07:00
Clement
e400eb4ed2
Rename ViewFrustum packets to AvatarQuery
2018-05-03 18:19:29 -07:00
Stephen Birarda
21396287a4
Merge pull request #12990 from Atlante45/fix/spec-cam-av
...
Add support for multifrustum avatar queries
2018-05-03 18:18:51 -07:00
Stephen Birarda
31d5633b4a
Merge pull request #12930 from Atlante45/fix/spec-cam
...
Add support for multifrustum entity queries
2018-05-03 18:13:51 -07:00
NissimHadar
da621d99d3
Removed unneeded pragma.
2018-05-03 16:52:03 -07:00
Stephen Birarda
48aeebdd50
Merge pull request #13007 from Atlante45/fix/crashes-hotfix
...
Keep CrashpadClient around for application lifetime
2018-05-03 16:48:29 -07:00
NissimHadar
e07039266d
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-03 16:44:57 -07:00
NissimHadar
887b8285cd
Removed unneeded pragma.
2018-05-03 16:44:04 -07:00
NissimHadar
2c6c0a25fc
Add testSnapshotLocation parameter to takeSnapshot.
2018-05-03 15:15:30 -07:00
NissimHadar
fe9c6052f7
Added quitWhenFinished parameter to the command line.
2018-05-03 15:02:11 -07:00
NissimHadar
3a5425122b
Shutdown interface when test script finishes.
2018-05-03 14:31:01 -07:00
MiladNazeri
6efb710222
Merge pull request #13076 from ctrlaltdavid/21856-g
...
JSDoc fixes
2018-05-03 14:06:23 -07:00
Anthony J. Thibault
fc9bd7f905
Fix for crash deep in QML after useFullAvatarURL
...
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
2018-05-03 14:06:06 -07:00
Gabriel Calero
a767540b76
Fix connection issue syncing two AccountManagers
2018-05-03 17:53:18 -03:00
Zach Fox
c3d3cdca3d
Add cubemap output format
2018-05-03 12:57:00 -07:00
NissimHadar
46f461dcdb
Don't display crash message if running from command line with a test script.
2018-05-03 11:20:37 -07:00
Howard Stearns
d4a562ee47
Merge pull request #13081 from zfox23/MS14741_fixAppUninstallation
...
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
2018-05-03 10:02:20 -07:00
NissimHadar
8b3c451f91
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-03 08:25:19 -07:00
Ken Cooke
2a7e8c6f89
Default audio meter overlay to "on"
2018-05-03 07:15:18 -07:00
David Rowe
e95c38d939
Merge branch 'master' into 21856-g
...
# Conflicts:
# libraries/model-networking/src/model-networking/TextureCache.h
2018-05-03 21:03:14 +12:00
MiladNazeri
8e214d8ee8
Merge pull request #13049 from ctrlaltdavid/21856-d
...
List which contexts each namespace and class is available in
2018-05-03 01:29:14 -07:00
Seth Alves
b68d9ecd68
Merge pull request #12985 from druiz17/attachments-disappearing
...
fixing avatr attachments not being visible when coming out of first person
2018-05-02 18:50:41 -07:00
samcake
1dc6988f41
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-05-02 17:36:26 -07:00
Andrew Meadows
99a75c5a87
Merge 'master' into 'workload'
2018-05-02 17:28:36 -07:00
Zach Fox
56ba59681a
Fix MS14741, allowing uninstall of apps whose scripts are no longer running
2018-05-02 16:12:55 -07:00
Zach Fox
900486ed01
Don't use entity scripting interface
2018-05-02 16:03:50 -07:00
Gabriel Calero
ec838b1417
Trying to fix non-android builds
2018-05-02 18:51:44 -03:00
NissimHadar
5cbb8674ec
Use default parameter for saveSnapshot().
2018-05-02 14:45:28 -07:00
Gabriel Calero
88f0c2d700
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 18:42:10 -03:00
John Conklin II
f43b9ee7e8
Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw
...
Added items to the developer menu for debugging physics
2018-05-02 14:25:09 -07:00
NissimHadar
83846aec04
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-02 14:17:22 -07:00
NissimHadar
e0b16dfe03
Allow use of --url command line argument in test mode.
2018-05-02 14:17:01 -07:00
Cristian Luis Duarte
843aa9e261
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-02 18:06:56 -03:00
Gabriel Calero
e4fdd81148
Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login
2018-05-02 17:23:25 -03:00
Gabriel Calero
d0ab81d1f9
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 17:00:32 -03:00
Cristian Luis Duarte
c460f8bf1e
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-05-02 16:35:13 -03:00
Gabriel Calero
4dce62cc2e
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 16:27:41 -03:00
John Conklin II
7a5fce4315
Merge pull request #12991 from luiscuenca/avatarScript
...
Avatar Scripts
2018-05-02 12:23:13 -07:00
Zach Fox
57993cfdd0
Cleanup
2018-05-02 11:22:42 -07:00
luiscuenca
689fbd2da0
added requested changes
2018-05-02 11:09:17 -07:00
Gabriel Calero
a653c7df0b
Fix build
2018-05-02 14:59:46 -03:00
Anthony J. Thibault
4fa9af5534
Added items to the developer menu for debugging physics
...
Hooked up Bullet's internal debug draw functionality to our client.
Under the Developer > Physics Menu there are five new items:
* Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes.
* Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes.
* Show Bullet Contact Points - will draw all contact points where two or more objects are colliding.
* Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together.
* Show Bullet Constraint Limits - will render the joint limits for each constraint.
2018-05-02 10:51:00 -07:00
vladest
14dfafa815
Brings logging back
2018-05-02 19:46:18 +02:00
Gabriel Calero
c15ef56d90
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-05-02 14:38:10 -03:00
Zach Fox
ecae3ceb9d
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-05-02 10:05:15 -07:00
vladest
53350b471b
Merge branch 'master' into menu-updates
2018-05-02 19:02:11 +02:00
NissimHadar
3edfdae6b2
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-02 08:35:59 -07:00
Gabriel Calero
e83f1a8ec7
Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login
2018-05-02 12:20:23 -03:00
Gabriel Calero
0f08bd8fa1
Use a single AccountManager for android.
2018-05-02 12:11:11 -03:00
Gabriel Calero
3a1bfefc22
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-05-02 10:09:56 -03:00
David Rowe
3febdcb141
Miscellaneous JSDoc tidying
2018-05-02 16:15:35 +12:00
Clement
a283d28686
Send number of frustums in packet
2018-05-01 18:03:21 -07:00
Clement
ddde0228ba
Fix AC not sending Avatar Mixer a frustum
2018-05-01 18:03:21 -07:00
Clement
538f24162f
Define ViewFrustums type alias
2018-05-01 18:03:21 -07:00
Clement
1b2b70b769
Send both frustums to Avatar Mixer
2018-05-01 18:03:21 -07:00
Clement
21213e81f4
Multiview support for priority queue
2018-05-01 18:03:21 -07:00
Atlante45
0820ef3c95
Account for secondary view when deciding to query
2018-05-01 18:02:29 -07:00
Clement
4c90763236
Correctly update secondary camera frustum
2018-05-01 18:02:29 -07:00
Clement
fea49744ed
Add comment for future work
2018-05-01 18:02:29 -07:00
Clement
98cf48694e
Expose secondary camera to game logic
2018-05-01 18:02:29 -07:00
Clement
49fad3d868
EntityServer traversal aware of all ViewFrustums
2018-05-01 18:02:29 -07:00
John Conklin II
256154202e
Merge pull request #13071 from zfox23/RC67_preventImageProviderCrash
...
RC67: Fix a crash in Image Provider when logging in or reloading all scripts
2018-05-01 17:39:43 -07:00
Zach Fox
d5f809c3c0
Actually fix
2018-05-01 14:49:44 -07:00
Zach Fox
d1bb37874d
Prevent crash in ImageProvider when tablet isn't yet initialized
2018-05-01 14:49:37 -07:00
Stephen Birarda
f5441c05b3
Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master
2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107
Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently""
...
This reverts commit acb21cc96a
2018-05-01 14:15:12 -07:00
Ryan Huffman
24ac342c6b
Add support for client texture selection
2018-05-01 14:11:31 -07:00
NissimHadar
e9d28cf275
Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester
2018-05-01 13:26:58 -07:00
Zach Fox
249e2a2bac
Tons of stability and clarity improvements
2018-05-01 13:00:04 -07:00
David Rowe
1aa28b7f54
Merge remote-tracking branch 'upstream/master' into 21856-d
...
# Conflicts:
# interface/src/LODManager.h
2018-05-02 07:50:55 +12:00
vladest
aef62d09c7
Merge branch 'master' into menu-updates
2018-05-01 21:47:46 +02:00
MiladNazeri
3bb09024ec
Merge pull request #13058 from ctrlaltdavid/21856-e
...
Fix LODManager JSDoc
2018-05-01 12:25:37 -07:00
vladest
617b49fe14
Added mouse sensivity UI. Reworked advanced movements. TODO: properties interface complitely broken in Tablet mode
2018-05-01 21:22:48 +02:00
Zach Fox
c42b13134f
Merge pull request #13063 from zfox23/preventImageProviderCrash
...
Fix a crash in Image Provider when logging in or reloading all scripts
2018-05-01 11:55:15 -07:00
samcake
b3408ae4c0
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-05-01 11:39:54 -07:00
Stephen Birarda
24dc1c930e
Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67
2018-05-01 10:54:35 -07:00
Zach Fox
cd76336e6a
Actually fix
2018-05-01 09:54:23 -07:00
luiscuenca
2ac7fcadd2
load scripts once on rigReady
2018-05-01 09:37:01 -07:00
milad nazeri
aeb78e69f6
Merge commit 'refs/pull/13061/head' of https://github.com/highfidelity/hifi into gravprep-redo
2018-05-01 06:12:00 -07:00
David Rowe
65f5915372
Add JSDoc for startFarTrigger etc. calls on entity scripts
2018-05-01 21:55:27 +12:00
NissimHadar
d5610a2f37
WTF...
2018-04-30 17:52:44 -07:00
NissimHadar
c01fd02de2
Corrected parameter type.
2018-04-30 17:23:49 -07:00
NissimHadar
6d8eee6b32
Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester
2018-04-30 17:19:29 -07:00
Zach Fox
f69ee41074
Prevent crash in ImageProvider when tablet isn't yet initialized
2018-04-30 17:13:44 -07:00
milad nazeri
8845094afb
Added Lod fix
2018-04-30 16:55:42 -07:00
David Rowe
f9bda6df15
Fix LODManager JSDoc
2018-05-01 11:36:37 +12:00
luiscuenca
50ca09b3b4
minor fixes
2018-04-30 16:26:04 -07:00
Zach Fox
eab2feb543
Lots of little improvements and stability fixes
2018-04-30 13:54:10 -07:00
Atlante45
250806252e
Don't use unique_ptr to store CrashpadClient
2018-04-30 12:37:18 -07:00
Atlante45
5ab16302ca
Keep CrashpadClient around
2018-04-30 12:36:17 -07:00
Zach Fox
aafcf056c4
Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements
2018-04-30 12:36:00 -07:00
Zach Fox
a2b84c0fbb
It's working!!
2018-04-30 12:11:46 -07:00
luiscuenca
2de982a5a2
Added script types and better script reload
2018-04-30 12:04:35 -07:00
Liv Erickson
b994776ebd
do not open help on first run
2018-04-30 12:01:37 -07:00
vladest
4adfe94ed5
Removed check for updates menu item. POC: settings for advanced movements mappings
2018-04-30 20:43:36 +02:00
Cristian Luis Duarte
401bf2f2a4
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-30 14:38:32 -03:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1
...
Backtrace Attributes
2018-04-30 10:07:11 -07:00
Thijs Wenker
9e086dda3c
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-30 17:32:49 +02:00
vladest
deaecc7050
Added notifications settings
2018-04-29 11:19:01 +02:00
vladest
be22f49c32
Merge branch 'master' into menu-updates
2018-04-28 20:22:28 +02:00
David Rowe
2cc3ed6287
List which contexts each namespace and object is available in
2018-04-28 20:00:28 +12:00
Zach Fox
1b29946a48
I feel so close; why isn't this variable capturing?
2018-04-27 17:26:05 -07:00
NissimHadar
cf9b089a3c
Added option to set snapshot location (for this execution only) from the command line.
2018-04-27 17:18:16 -07:00
samcake
023941a133
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-27 15:19:23 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging
...
Quiet logging
2018-04-27 14:59:38 -07:00
Gabriel Calero
ce8bd13685
Cleanup android code
2018-04-27 18:58:09 -03:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable
...
Merge stable to RC66.2
2018-04-27 14:42:28 -07:00
Dante Ruiz
290c31d916
don't spam resetSensors
2018-04-27 11:33:45 -07:00
Bradley Austin Davis
acb21cc96a
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-27 10:50:47 -07:00
samcake
593c452671
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-27 09:33:06 -07:00
Stephen Birarda
d87adcec92
make home go to DEFAULT_HIFI_ADDRESS by default
2018-04-26 17:47:12 -07:00
samcake
3ab0458d3a
Trying to expose an array to js
2018-04-26 17:45:48 -07:00
Anthony J. Thibault
c6b12307aa
Added custom jsdoc tags to High Fidelity
...
There are 4 new jsdoc tags:
* @hifi-interface - indicates that this namespace or class is available in Interface Scripts.
* @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts.
* @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts.
* @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts.
These tags should appear just after the @class or @namespace tag. For example:
/**jsdoc
* Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar.
* For example, you can customize the avatar's appearance, run custom avatar animations,
* change the avatar's position within the domain, or manage the avatar's collisions with other objects.
*
* @namespace MyAvatar
*
* @hifi-interface
* @hifi-client-entity
*
2018-04-26 14:13:42 -07:00
Thijs Wenker
20b9e44844
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-26 22:37:15 +02:00
MiladNazeri
098b432fd9
Merge pull request #13011 from ctrlaltdavid/21856-a
...
Docs to JSDoc review updates
2018-04-26 13:29:48 -07:00
vladest
3296ae0db8
Merge branch 'master' into menu-updates
2018-04-26 22:21:40 +02:00
samcake
ba29ebaeb0
Moving the view controller up into workload and exposing timings
2018-04-26 13:08:26 -07:00
Stephen Birarda
bc4ce12e64
Merge pull request #13008 from huffman/fix/download-correct-installer
...
Fix update installer URLs and add installer info to user activity data
2018-04-26 11:32:22 -07:00
Seth Alves
5e790d4898
include machine_fingerprint
2018-04-26 09:49:20 -07:00
Seth Alves
64be0a547c
hook up several annotations for crash reporter
2018-04-26 08:49:45 -07:00
Ryan Huffman
4c8b8d8442
Improve installer campaign+type for updates and user activity data
2018-04-26 08:32:18 -07:00
David Rowe
b8063840e7
Miscellaneous fixes
2018-04-26 21:17:05 +12:00
David Rowe
08dc9b133f
Docs to JSDoc review
2018-04-26 21:10:28 +12:00
luiscuenca
12f578c93c
More fixes
2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1
Add scripts to Model Packager
2018-04-25 19:35:26 -07:00
Thijs Wenker
bbd31d590b
defaults
2018-04-26 03:12:44 +02:00
Thijs Wenker
8b7a07577c
Merge branch 'master' of git@github.com:highfidelity/hifi.git into feat/hasScriptedBlendshapes
2018-04-26 03:09:44 +02:00
samcake
6d755a2127
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-25 17:36:02 -07:00
samcake
5db3eee4ad
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-25 15:21:43 -07:00
Stephen Birarda
956cc411d5
Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback
2018-04-25 14:33:23 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate
...
Docs/docs to js docs update
2018-04-25 12:26:19 -07:00
samcake
32e83c256a
Adjusting the task::Engine run signature to appease gcc gods and other warnings
2018-04-25 12:23:30 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856
...
Docs to JSDoc
2018-04-25 11:36:34 -07:00
Thijs Wenker
484e20ea55
JSDOC - change bool type to boolean, to match JS type
2018-04-25 19:01:18 +02:00
Thijs Wenker
98148aa396
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-25 18:53:31 +02:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
2018-04-25 09:43:20 -07:00
Thijs Wenker
192e48a376
style fix + JSDocs
2018-04-25 13:47:00 +02:00
milad nazeri
4c736b2d62
Fixed defaults
2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5
Doc review
2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7
Avatar Scripts
2018-04-24 18:43:53 -07:00
samcake
f2c76abafa
Apply the noAA /popJittering on the WebOverlay
2018-04-24 14:18:44 -07:00
Brad Hefta-Gaub
497c3fac4d
Merge pull request #12971 from Atlante45/fix/crashes-hotfix
...
Add memory corruption crash handler
2018-04-24 14:01:09 -07:00
Dante Ruiz
29fce488e4
make some changes
2018-04-24 14:00:52 -07:00
Dante Ruiz
b2925c5843
fixing attachments not being visible when coming out of first person
2018-04-24 13:32:30 -07:00
milad nazeri
23d07fa292
fixed spacing issue
2018-04-24 13:14:55 -07:00
Clement
0804abcca6
Heap corruption crashes CR
2018-04-24 12:47:13 -07:00
samcake
33bbbcef83
Merging with master
2018-04-24 11:49:34 -07:00
Gabriel Calero
55a946c6c7
Fix non-android builds(performHapticFeedback)
2018-04-24 14:48:41 -03:00
Thijs Wenker
b0187ecfd3
add MyAvatar.hasAudioEnabledFaceMovement API property which is enabled by default
2018-04-24 19:24:23 +02:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash
...
Attempt to shutdown web surfaces more consistently
2018-04-24 10:15:25 -07:00
Brad Davis
a144de54e7
Attempt to shutdown web surfaces more consistently
2018-04-24 10:06:20 -07:00
Gabriel Calero
51f9b763ff
Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login
2018-04-24 13:18:28 -03:00
Gabriel Calero
5284c4edae
Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login
2018-04-24 12:00:00 -03:00
Gabriel Calero
103e9f92fa
Add haptic feedback to back, view and mic buttons
2018-04-24 11:56:01 -03:00
Sam Gateau
f50b2fab2b
Exposing timing and regulated radiuses
2018-04-23 22:38:50 -07:00
milad nazeri
1121fe8da0
fix tabs
2018-04-23 21:47:53 -07:00
samcake
f686ef1f25
Exposing more uniforms to ui for refining the controller
2018-04-23 18:02:09 -07:00
David Rowe
98f43b6a70
Interim JSDoc for MyAvatar - stubs for remainder
2018-04-24 10:47:33 +12:00
Thijs Wenker
3764ee4a06
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-24 00:36:28 +02:00
Brad Davis
861200db27
Attempt to shutdown web surfaces more consistently
2018-04-23 14:32:38 -07:00
David Rowe
719062dd9f
Interim JSDoc for MyAvatar - first pass
2018-04-24 09:10:59 +12:00
Atlante45
f2c471558c
CR
2018-04-23 13:14:21 -07:00
Atlante45
bc251115ed
Add special handler for heap corruption
2018-04-23 13:14:21 -07:00
Clement
fb496156ce
Fix threaded force crashes
2018-04-23 13:14:21 -07:00
Gabriel Calero
8923c16b08
Merge remote-tracking branch 'upstream/master' into android_new_login
2018-04-23 17:04:06 -03:00
Gabriel Calero
74e38882f7
Refactor using Android fragments. Complete drawer menu. Add Privacy Policy.
2018-04-23 17:01:34 -03:00
SamGondelman
1deb38f06d
fix copy error
2018-04-23 12:05:30 -07:00
Gabriel Calero
ccb5e1e06c
Commenting out display plugin activation/desactivation
2018-04-23 15:29:51 -03:00
Cristian Luis Duarte
c33f1fbbb1
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-23 15:12:56 -03:00
Seth Alves
1dbcbbcced
cleanups
2018-04-23 11:05:06 -07:00
Gabriel Calero
001cd5e937
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-23 14:25:26 -03:00
samcake
990ee83f04
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-23 10:07:58 -07:00
vladest
e1222ddbc5
1st notifications added
2018-04-23 18:54:41 +02:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu
...
Android: Hide menu and fix shader compilation
2018-04-23 09:51:20 -07:00
Cristian Luis Duarte
20d91b13dd
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-23 13:17:53 -03:00
Sam Gateau
97934fe563
Adjusting the regulators and moving task to use chrono nad interesting tests
2018-04-23 00:07:00 -07:00
milad nazeri
4ac06fe99f
Updating previous jsdocs
2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd
JSDoc fixes
2018-04-23 16:09:56 +12:00
Sam Gateau
99a0e42b5d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-22 20:26:49 -07:00
David Rowe
497cb4dab6
Interim JSDoc for Selection
2018-04-23 13:53:35 +12:00
David Rowe
96ddeb4e99
Interim JSDoc for SpeechRecognizer
2018-04-23 11:37:27 +12:00
milad nazeri
e9b9c05b5d
removed cruft
2018-04-22 08:51:47 -07:00
Sam Gateau
ec569b0e51
adjusting the bounding box for debug rendering
2018-04-21 12:05:27 -07:00
vladest
4de9969f36
Merge branch 'master' into menu-updates
2018-04-21 20:22:48 +02:00
David Rowe
34d0a892a0
Point to example using Hardware.Application item
2018-04-21 15:01:46 +12:00
samcake
b66ab6deaa
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 17:55:45 -07:00
samcake
d1b0e89fa3
merging with upstream correctly
2018-04-20 17:55:34 -07:00
samcake
b554aec317
Trying more drastic changes and learnign to use std::chrono the right way
2018-04-20 17:53:24 -07:00
David Rowe
748052614f
Doc review
2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6
hide menu, fix shaders
2018-04-20 17:38:38 -07:00
Seth Alves
6fc02638d7
control verbose logging with a menu-item in developer menu
2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7
remove some uncatagorized logging, suppress some categories by default
2018-04-20 16:08:57 -07:00
David Rowe
7087abd201
Merge branch 'master' into 21815
2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id
...
Use 16-bit local IDs for Nodes in NL packets
2018-04-20 15:28:18 -07:00
Andrew Meadows
06af31594e
merge 'master' into 'workload'
2018-04-20 15:07:46 -07:00
Cristian Luis Duarte
8235f999d8
Merge remote-tracking branch 'origin/master' into android_places_goto
2018-04-20 17:53:50 -03:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes
...
Fix threaded force crashes
2018-04-20 13:20:40 -07:00
samcake
3d651de797
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 13:20:19 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup
...
Make Audio.cpp threadsafe
2018-04-20 11:36:08 -07:00
Simon Walton
9f9a68188d
Merge remote-tracking branch 'upstream/master' into short-id
2018-04-20 11:10:21 -07:00
vladest
2b716f051c
Merge branch 'master' into menu-updates
2018-04-20 19:34:15 +02:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836
...
Update location.hostname JSDoc per serverless domains
2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66
try to fix audio crash on startup
2018-04-20 10:23:47 -07:00
Cristian Luis Duarte
55e64ceb55
Merge branch 'mm_1e08633' into android_places_goto
2018-04-20 13:32:23 -03:00
samcake
0f4aa7e27e
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-20 09:31:36 -07:00
vladest
d54739cfc2
Start adding notifications [DNP]
2018-04-20 18:08:11 +02:00
Cristian Luis Duarte
77caa4d402
Merge branch 'mm_c8bef86' into android_places_goto
2018-04-20 12:26:38 -03:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix
...
Minor changes to meet coding standard
2018-04-20 08:20:32 -07:00
Sam Gateau
cfaf75e196
Using the std::chrono to measure the physics time
2018-04-19 23:28:32 -07:00
samcake
9b1a887469
Starting to move dynamically yeah
2018-04-19 17:43:14 -07:00
Gabriel Calero
adfbaac18f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-19 19:40:00 -03:00
Cristian Luis Duarte
dc321e4cd7
Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto
2018-04-19 18:46:44 -03:00
David Rowe
08defea755
Merge branch 'master' into 21836
2018-04-20 09:20:56 +12:00
milad
42471c539b
initial fixes from ctralt david's comments
2018-04-19 13:40:57 -07:00
Gabriel Calero
f2184bf456
Handle android back button. Remove unused resources. Fix compilation errors.
2018-04-19 17:31:25 -03:00
samcake
a6bd589f4f
Merging upstream
2018-04-19 12:20:10 -07:00
vladest
b191ad866f
Merge fixes
2018-04-19 21:04:11 +02:00
vladest
ab1a89a6f9
Merge branch 'master' into menu-updates
2018-04-19 21:02:30 +02:00
samcake
9b3d546dad
Exposing the on off to use the distance configs
2018-04-19 09:35:57 -07:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash
...
Pre-requisite changes for splash screen rendering
2018-04-19 09:19:05 -07:00
Cristian Luis Duarte
5be9959424
Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto
2018-04-19 12:11:29 -03:00
Gabriel Calero
c8fe45eb8f
Remove debug statements and unused code. Put JNI code in a separated file.
2018-04-19 11:41:59 -03:00
Ken Cooke
764aa00069
Coding standard fixes
2018-04-19 07:33:14 -07:00
vladest
3d8d0bfa07
Added hot keys enumeration for display menu
2018-04-19 12:31:14 +02:00
vladest
ba4ef74313
Remove View->Overlays menu
2018-04-19 12:01:58 +02:00
vladest
fffd4eec41
Avatar enable flying added
2018-04-19 08:46:20 +02:00
milad
364d193499
audio added
2018-04-18 21:04:57 -07:00
milad
3f129bda13
More done on audio
2018-04-18 20:04:41 -07:00
samcake
52a4224442
Arg get me the feedback working!!!!
2018-04-18 18:16:06 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp
...
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
2018-04-18 17:28:48 -07:00
Gabriel
8f34c02ab2
Update AndroidHelper.h
2018-04-18 18:32:20 -03:00
Cristian Luis Duarte
9c44be3557
Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto
2018-04-18 16:55:08 -03:00
Gabriel Calero
472cc1b29a
Fix code spacing
2018-04-18 16:44:49 -03:00
vladest
b5071d28e8
Merge branch 'master' into menu-updates
2018-04-18 21:10:57 +02:00
Gabriel Calero
120de92c9e
Add login activity
2018-04-18 15:52:02 -03:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002
...
more correct stats names
2018-04-18 10:50:38 -07:00
John Conklin II
005b6a6b1f
Merge pull request #12893 from ctrlaltdavid/21843
...
Fix overlay toggling
2018-04-18 10:49:05 -07:00
samcake
d6b6645630
exposing feedback of timing
2018-04-17 18:03:45 -07:00
Atlante45
7e6d45ead7
CR
2018-04-17 16:25:07 -07:00
Stephen Birarda
95c172f418
Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66
2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018
...
Discovery: April 2018 (Huge PR; see description)
2018-04-17 15:11:50 -07:00
Atlante45
a626e9f6f3
Add special handler for heap corruption
2018-04-17 15:09:10 -07:00
Brad Davis
d478204722
Working on splash rendering
2018-04-17 14:17:41 -07:00
vladest
ee1738adac
Add stubs for graphics settings. Add avatar collision setting
2018-04-17 21:58:53 +02:00
David Rowe
e3edc45081
Document NavigationFocused
2018-04-18 07:04:55 +12:00
vladest
bb7eb90f58
Merge branch 'master' into menu-updates
2018-04-17 19:55:11 +02:00
vladest
8a5d80de31
Fix Desktop double windows
2018-04-17 19:51:24 +02:00
Cristian Luis Duarte
744fa808e3
Merge remote-tracking branch 'hifi/master' into android_places_goto
2018-04-17 13:11:02 -03:00
Sam Gateau
ab04a34ccf
Proposing a more flexible design for the engine
2018-04-17 02:06:33 -07:00
Sam Gateau
fd752a07c1
Proposing a more flexible design for the engine
2018-04-17 02:05:35 -07:00
samcake
2008c61368
more ui test features
2018-04-16 17:58:13 -07:00
David Rowe
c1ede6ef58
Merge branch 'master' into 21815
...
# Conflicts:
# tools/jsdoc/plugins/hifi.js
2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9
Controller API JSDoc
2018-04-17 11:46:40 +12:00
Anthony J. Thibault
0a162e62b0
transmit sendAll packet in nodeActivated signal callback
...
(cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)
2018-04-16 16:16:56 -07:00
Anthony J. Thibault
c29bf51226
Fix for avatar glitches, head and legs folding into chest.
...
As a form of compression, when encoding avatar data we only send joints that have changed significantly from the previous packet.
Also, if a joint has the same value as the avatar's default pose, we don't send the full value, instead we mark it with a single bit.
This particular issue is caused by an interaction between the default value flag and the joint changed culling.
When connecting to a domain for the first time, it's possible that a I-frame or 'full' packet will not be sent for several seconds.
In this case, the AvatarMixer has no previous history for values that have not changed recently.
This causes the AvatarMixer to broadcast incorrect values to other clients.
Keep in mind that the AvatarMixer does not have access to the avatar FBX file, so it cannot make an educated guess for this value and uses zero values instead.
(0, 0, 0) for translation and (0, 0, 0, 1) for rotation.
When a translation value of zero is received for the lower legs it will cause the legs to fold into the avatar's chest.
Also, we've uncovered a bug where sometimes values were not sent to the AvatarMixer even when the value was previously default.
This would also exhibit the same issue where zero translation values would be sent.
I've done three things to help mitigate this issue.
1) On first connect to a new AvatarMixer, the Avatar now sends a 'full' packet.
2) When a joint rotation or translation changes from the default value, we transmit it. No questions asked.
3) Once a SkeletonModel has finished loading we initialize the avatar's _jointData with the proper
translations from the default pose. This will help the case where a client receives a non default value, but has no previous history.
(cherry picked from commit 94efdf76a6454f316985f95d6a221adb24788d66)
2018-04-16 14:58:33 -07:00
Andrew Meadows
a80cf49eb3
split 'ETRupdate' out of 'postPhysics' stat context
2018-04-16 13:31:36 -07:00
Andrew Meadows
ace32193b4
more correct stat names
2018-04-16 13:31:36 -07:00
samcake
b32be91bb1
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 13:22:58 -07:00
Zach Fox
0504220171
Abide by new backend code
2018-04-16 13:01:31 -07:00
John Conklin II
5705bac87f
Merge pull request #12723 from ctrlaltdavid/21801
...
HMD API JSDoc
2018-04-16 11:12:26 -07:00
Gabriel Calero
e3b94b163c
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-16 14:55:16 -03:00
samcake
c18cee9862
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-16 10:38:06 -07:00
Sam Gateau
3ac4a1db2d
Merge pull request #12850 from SimonWalton-HiFi/early-trace
...
Enable Interface tracing from earliest execution point
2018-04-16 10:24:55 -07:00
Zach Fox
071bf35683
Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018
2018-04-16 10:11:44 -07:00
vladest
6d53512c6c
Merge
2018-04-15 15:24:16 +02:00
David Rowe
df31d20430
Fix overlay toggling
2018-04-14 17:06:34 +12:00
Clement
bd59ff1573
Fix threaded force crashes
2018-04-13 15:11:49 -07:00
John Conklin II
3982472cf2
Merge pull request #12851 from druiz17/rc66-spwan-fix
...
serverless-domain named landing-points(RC66)
2018-04-13 14:58:36 -07:00
samcake
1cd662acdb
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-13 14:43:11 -07:00
Thijs Wenker
22e7f80356
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-13 23:33:02 +02:00
samcake
b88b668a06
Exposing more texture memory budget options
2018-04-13 12:19:53 -07:00
samcake
e6085a90d6
Exposing more texture memory budget options
2018-04-13 12:17:50 -07:00
Melissa Brown
fd7b3b75f9
Merge pull request #12884 from Atlante45/fix/build-instructions
...
Update docs with correct qt version
2018-04-13 11:12:06 -07:00
Seth Alves
a56f3f4a10
code review
2018-04-12 19:06:12 -07:00
Sam Gateau
27e728ff67
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 18:11:18 -07:00
John Conklin II
fc487ea322
Merge pull request #12831 from ctrlaltdavid/21829
...
Model overlay fixes
2018-04-12 17:04:55 -07:00
Simon Walton
76468f7f26
Use existing DISABLE_WATCHDOG global to turn off thread entirely
2018-04-12 16:58:13 -07:00
Clement
157ca8cd68
Update docs with correct qt version
2018-04-12 16:21:26 -07:00
Andrew Meadows
6633304773
fix typo
2018-04-12 15:02:24 -07:00
Gabriel Calero
bd4a7ce4fa
Hide jump button while moving. Fix jump button right alignment in pixel
2018-04-12 19:02:03 -03:00
Thijs Wenker
2e396fd1b9
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-12 23:36:27 +02:00
Andrew Meadows
d553f85e83
adding pickManager and pointerManager to stat summary
2018-04-12 14:23:48 -07:00
Andrew Meadows
060c391d47
more correct stat names
2018-04-12 14:23:48 -07:00
samcake
e2f9eef5e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-12 12:27:27 -07:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1
...
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
2018-04-12 11:48:09 -07:00
Simon Walton
a584d67acd
Tweaks for clang error and gcc warning
2018-04-12 10:44:41 -07:00
John Conklin II
7bcaa12c50
Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix
...
Typo corrected: getAnimatationRoles to getAnimationRoles
2018-04-12 10:32:09 -07:00
Simon Walton
5c141aa5e9
Add --disableWatchdog command-line option
...
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
2018-04-12 09:28:28 -07:00
Thijs Wenker
7a5d3314a2
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-12 18:04:46 +02:00
Sam Gateau
6a7ae55d9c
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-11 19:08:57 -07:00
David Rowe
c2f0f7ef5f
Doc review
2018-04-12 10:54:35 +12:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue
...
Hack: Adding more budget options for memory texture
2018-04-11 15:46:08 -07:00
David Rowe
7a9e3388fa
Merge branch 'master' into 21801
2018-04-12 09:48:51 +12:00
David Rowe
c836014d21
Fix JSDoc typo noticed in passing
2018-04-12 09:24:10 +12:00
Cristian Luis Duarte
d993e4938e
Merge remote-tracking branch 'hifi/master' into android_goto_splash
2018-04-11 18:03:16 -03:00
John Conklin II
7a905ed420
Merge pull request #12777 from ctrlaltdavid/21813
...
Fix Window API position and size reporting
2018-04-11 13:48:21 -07:00
John Conklin II
854d3d7804
Merge pull request #12765 from ctrlaltdavid/21822
...
Fix text sizing per text3d overlay lineHeight property
2018-04-11 12:16:51 -07:00
MiladNazeri
9f7a765ec3
Merge pull request #12729 from ctrlaltdavid/21814
...
Settings API JSDoc
2018-04-11 11:48:15 -07:00
Thijs Wenker
56fbb6e384
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-11 18:49:39 +02:00
Zach Fox
0c9d65bc15
Merge pull request #12758 from zfox23/commerce_fixCertificateInfoError
...
Commerce: Fix Certificate Info error
2018-04-11 09:38:43 -07:00
Zach Fox
095b4ba5f2
Reduce logging from some Commerce/Discovery features
2018-04-10 16:02:58 -07:00
Zach Fox
b9d0360ea2
Finally fix the grey security pic bug!
2018-04-10 16:00:53 -07:00
Zach Fox
ffab27d442
Commerce: Fix Certificate Info error
2018-04-10 15:54:55 -07:00
Zach Fox
a9b9a1cb10
Commerce: Gifts
2018-04-10 15:54:19 -07:00
Seth Alves
f81836c830
support specification of named landing-points in serverless-domain json files
2018-04-10 14:25:59 -07:00
Simon Walton
ca5720c015
Take out superfluous DependencyManager::set<tracing::Tracer>()
2018-04-10 13:52:46 -07:00
Simon Walton
cf3648409d
Allow duration for tracing, other fixes
2018-04-10 13:14:52 -07:00
Simon Walton
513a4875f0
Move --traceFile option to start of main()
2018-04-10 13:13:47 -07:00
Simon Walton
9b6306601a
Merge Clement's PR12700 diffs for early trace start
2018-04-10 13:13:46 -07:00
samcake
72649f5c06
More featuers for the view of the workload and test scrtpts to stress the system)
2018-04-09 17:27:40 -07:00
Triplelexx
883cd7b8d0
rename performance timer
2018-04-09 18:24:20 +01:00
Triplelexx
aef0c29a31
remove Limitless API
2018-04-09 18:23:33 +01:00
Triplelexx
704499a76d
remove Limitless API
2018-04-09 18:22:48 +01:00
Gabriel Calero
b30cb25a3f
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-09 12:20:35 -03:00
Gabriel Calero
e85f5c97dc
Remove bottom bar. Apply new design for android
2018-04-09 11:41:00 -03:00
NissimHadar
7f70511d1a
Added a script command to clear caches.
2018-04-08 10:32:35 -07:00
David Rowe
f3a745b6cb
Fix initialization order
2018-04-07 18:53:27 +12:00
David Rowe
8093e3e5ae
Fix some miscellaneous JSDoc typos
2018-04-07 16:48:05 +12:00
David Rowe
96178404c7
Document that jointTranslations and jointRotations are not cloned
2018-04-07 16:47:38 +12:00
David Rowe
ba020854b6
Add missing "animationSettings.currentFrame" property JSDoc
2018-04-07 16:46:44 +12:00
David Rowe
38d7b81a4f
Add missing "get" and JSDoc for "loadPriority" property
2018-04-07 16:46:02 +12:00
David Rowe
6d9b69cd2e
Fix cloning a model overlay not cloning animation settings
2018-04-07 16:44:58 +12:00
samcake
49977d7fc3
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-04-06 17:42:45 -07:00
Sam Gateau
476b75488c
Merge pull request #12827 from AndrewMeadows/lhf-needsToCallUpdate
...
Workload: low hanging fruit optimization: don't unneccessarily update() entities
2018-04-06 17:38:54 -07:00
samcake
694baa81e8
removing logging around physics
2018-04-06 16:12:02 -07:00
Thijs Wenker
fa138b953b
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-07 00:19:35 +02:00
Dante Ruiz
00713ab225
fix selection api
2018-04-06 14:00:50 -07:00
Zach Fox
0c48ccefa4
Clean up failResponse to make it better
2018-04-06 11:41:17 -07:00
Andrew Meadows
a9f5b57681
merge 'master' into 'workload-010'
2018-04-06 11:11:06 -07:00
Andrew Meadows
da48a5af20
fix compile errors and add PhysicsBoundary.cpp file
2018-04-06 11:10:23 -07:00
Zach Fox
af5a68b282
Merge branch 'master' of github.com:highfidelity/hifi into commerce_fixCertificateInfoError
2018-04-06 10:58:32 -07:00
Stephen Birarda
1d76dea9f6
Merge pull request #12818 from highfidelity/RC66
...
Merge back RC66 to master
2018-04-06 10:43:01 -07:00
Thijs Wenker
c905437ed9
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-06 17:27:40 +02:00
Andrew Meadows
ed1761945c
add/remove entities to physics using workload output
2018-04-06 07:22:05 -07:00
samcake
a5ee211dbf
Dirty attempt to capture the owner typefor a payload
2018-04-05 18:04:35 -07:00
samcake
c5b88d55ab
Spliting the creation of the Workload engine from the setup and configuration, changing the output from region tracker
2018-04-05 16:05:40 -07:00
Howard Stearns
ad191defb8
Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError
...
Prevent Interface from crashing when a Snapshot upload fails
2018-04-05 13:51:33 -07:00
Seth Alves
8de545acdf
add new address accessor for 'public' addresses, use it for snapshot and stream
2018-04-05 13:39:51 -07:00
Zach Fox
ac2721fe6a
Logging improvements
2018-04-05 13:04:09 -07:00
Andrew Meadows
8035dde5dd
fix Windows warnings
2018-04-05 12:54:43 -07:00
Gabriel Calero
0da2c972e3
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-05 16:22:56 -03:00
Andrew Meadows
4f0980b94b
hook up prototype PhysicsBoundary job
2018-04-05 12:11:57 -07:00
Andrew Meadows
d9ab166aac
initial PhysicsBoundary job implementation
2018-04-05 12:10:46 -07:00
Andrew Meadows
299f2a92e0
merge 'master' into 'workload'
2018-04-05 12:01:19 -07:00
Zach Fox
8e46ebf83b
Prevent Interface from crashing when a Snapshot upload fails
2018-04-05 11:27:26 -07:00
John Conklin II
9e21bab67e
Merge pull request #12748 from AndrewMeadows/untangle-003
...
cleanup around simulation-ownership
2018-04-05 10:58:45 -07:00
Seth Alves
4b0d338e57
on first run, send user to serverless tutorial rather than checking for a local sandbox
2018-04-04 18:00:11 -07:00
Thijs Wenker
b3231c3f7e
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-05 00:32:09 +02:00
Gabriel Calero
15163f5e87
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-04 19:25:20 -03:00
Gabriel Calero
99d8f822b2
Fix crash selecting domain for second time. Stop rendering while Goto activity is started
2018-04-04 19:24:26 -03:00
John Conklin II
2e37b4a312
Merge pull request #12747 from Zvork/fade
...
Update to Transitions debugging / editing script
2018-04-04 14:31:59 -07:00
John Conklin II
cba307f28b
Merge pull request #12762 from samcake/one
...
Remove notifications and print outs when degrading LOD
2018-04-04 10:35:05 -07:00
Simon Walton
692ccfc09b
Create HIFI_FCDEBUG(_ID) variants that require a category
...
Original macros use default settings.
2018-04-04 09:49:15 -07:00
Zach Fox
752246d950
Merge pull request #12760 from zfox23/inspection_rightClickTweaking
...
Inspection: Tweak mouse-right-click-to-inspect behavior
2018-04-04 09:32:29 -07:00
Gabriel Calero
ddbf4417ff
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-04-04 12:24:25 -03:00
Thijs Wenker
ceeff58fac
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-04 17:04:11 +02:00
samcake
1629756d53
Adding more budget options for memory texture
2018-04-03 18:08:43 -07:00
samcake
88a5105b81
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-04-03 18:00:16 -07:00
samcake
fa35d659dc
Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload
2018-04-03 17:56:41 -07:00
Simon Walton
7d16ca9c1c
Remove uses of addRepeatedMessageRegex() and its implementation
...
Change to new log-message ID scheme.
2018-04-03 17:54:01 -07:00
Clément Brisset
3d4490f3fd
Merge pull request #12737 from highfidelity/RC66
...
RC66 mergeback
2018-04-03 15:39:16 -07:00
David Rowe
095c1b837c
Update JSDoc
2018-04-04 09:48:33 +12:00
Thijs Wenker
63aaf27847
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-03 23:46:30 +02:00
David Rowe
6868ca971f
Make Window.x and Window.y report top left of drawable area of window
2018-04-04 09:43:39 +12:00
David Rowe
a3c8b2792d
Fix Window.geometryChanged() values for moving and resizing window
2018-04-04 09:42:05 +12:00
samcake
2dc4630e68
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-04-03 12:55:21 -07:00
samcake
efd2b2720b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-03 12:46:10 -07:00
Seth Alves
5f13df4102
Merge pull request #12722 from druiz17/fix-entities-outline
...
fix ContextOverlayInferface highlighing unspecified entities.
2018-04-03 12:29:19 -07:00
Gabriel Calero
78c50410b3
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
2018-04-03 14:37:19 -03:00
samcake
5bfaa84258
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-03 09:16:07 -07:00
John Conklin II
53a5261905
Merge pull request #12712 from zfox23/newUpdateCertLocation
...
Fix cert location for content sets; handle .content.zip content sets
2018-04-03 09:10:11 -07:00
Thijs Wenker
a0f6afb53d
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-03 16:45:11 +02:00
David Rowe
ab55f20976
Fix text sizing per text3d overlay lineHeight property
...
Makes text size correct for multiple lines of text.
2018-04-03 16:54:07 +12:00
David Rowe
63603ff97c
Fix window height reported by Window.geometryChanged() signal
2018-04-03 14:21:15 +12:00
Sam Gateau
2afd5f9813
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-04-02 19:11:02 -07:00
samcake
5a1eac563b
Code review fixes
2018-04-02 15:50:18 -07:00
John Conklin II
9dcef996c5
Merge pull request #12684 from vladest/assetserver_wrong_dialog
...
Fix invalid message if cancel adding asset to AssetServer
2018-04-02 15:28:46 -07:00
John Conklin II
74ca98dc81
Merge pull request #12727 from amantley/triggerRecenterBehaviour
...
Trigger Avatar Recenter Behaviour
2018-04-02 14:42:21 -07:00
Zach Fox
1f3063193a
Tweak right-click to inspect
2018-04-02 14:24:51 -07:00
samcake
d4bc61fb3d
Remove notifications and print outs for LOD changes because it was too much noise
2018-04-02 13:53:30 -07:00
John Conklin II
796bd069b2
Merge pull request #12659 from alexiamandeville/script_charcontroller
...
Updating char controller
2018-04-02 13:24:15 -07:00
Zach Fox
7f3e9547cc
Handle the case when metaverse returns error for certificateInfo
2018-04-02 11:55:10 -07:00
Dante Ruiz
a9a53c7d64
make resquested changes
2018-04-02 10:51:39 -07:00
Gabriel Calero
2ff13270ed
Go back to GoTo screen
2018-04-02 12:22:21 -03:00
Thijs Wenker
665e053f3d
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-04-02 17:02:16 +02:00
Sam Gateau
dada0b9024
Exploring better task job config api that work
2018-04-02 01:09:35 -07:00
Sam Gateau
9e2295525d
merging with upstream workload after it s been updated with master
2018-03-31 13:31:20 -07:00
samcake
59a081bcdb
merge with upstream
2018-03-30 18:08:38 -07:00
Dante Ruiz
4b7e2cb331
made requested changes
2018-03-30 15:15:17 -07:00
Dante Ruiz
c99676b510
atlernate fix for selected entities
2018-03-30 13:44:54 -07:00
Andrew Meadows
73fa6d3d2f
slightly simpler EntityMotionState delete logic
2018-03-30 13:18:32 -07:00
Andrew Meadows
6837d042ad
move entityCollisionWithEntity to PhysicalEntitySimulation
2018-03-30 13:18:32 -07:00
Olivier Prat
5c26b4030b
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
2018-03-30 14:38:42 -04:00
Gabriel Calero
b123b67134
Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash
2018-03-30 15:38:36 -03:00
Ken Cooke
ff6c9f3127
Merge pull request #12704 from ElderOrb/FB13057
...
Improve audio devices selection logic
2018-03-30 11:18:05 -07:00
Zach Fox
32e5e9986f
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
2018-03-30 10:10:43 -07:00
Thijs Wenker
45730a6c7a
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-03-30 18:54:48 +02:00
Ken Cooke
a2be291363
Merge pull request #12715 from ctrlaltdavid/21677
...
Add Window.raise() as replacement for Window.raiseMainWindow()
2018-03-30 09:41:54 -07:00
John Conklin II
5013760aa1
Merge pull request #12742 from jherico/fix/rc66_crashes
...
Fix/rc66 crashes
2018-03-29 18:04:52 -07:00
Olivier Prat
5f8693aae2
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
2018-03-29 15:52:38 -04:00
samcake
028959f240
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-29 12:00:10 -07:00
Alexia Mandeville
31ab398344
Moving user height and clarifying verbiage
2018-03-29 11:20:01 -07:00
Seth Alves
dcfebde54a
put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain
2018-03-29 10:50:43 -07:00
amantley
3f44b88d2d
added js documentation for the three trigger recenter functionsthat have been added to MyAvatar class
2018-03-29 10:09:51 -07:00
Thijs Wenker
f86eb9d776
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-03-29 19:06:24 +02:00
John Conklin II
97d9c1b735
Merge pull request #12726 from jherico/fix/rc66_crashes
...
Attempt to resolve potential overlay crashes at shutdown
2018-03-29 09:37:23 -07:00
Olivier Prat
3c8cd48dfb
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
2018-03-29 07:21:01 -04:00
amantley
90d87c5b5d
changed get functions to const in MyAvatar.cpp changed bool variables to atomic for thread safety
2018-03-28 14:00:36 -07:00
John Conklin II
790162c88b
Merge pull request #12689 from ctrlaltdavid/21808
...
Reinstate Overlays.getOverlayObject API function
2018-03-28 14:00:28 -07:00
amantley
4b1f974561
fixed merge conflict for declaring _hmdLeanRecenterEnabled in MyAvatar.h
2018-03-28 11:57:48 -07:00
amantley
95f1d0e4fa
added get and set functions for the activate recenter variables
2018-03-28 10:33:00 -07:00
Zach Fox
ca2fba675d
Merge branch 'master' of github.com:highfidelity/hifi into newUpdateCertLocation
2018-03-28 10:28:32 -07:00
Thijs Wenker
3184aa51b1
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-03-28 19:15:13 +02:00
Brad Hefta-Gaub
16df773de4
Merge pull request #12721 from highfidelity/RC66
...
RC66 - Mergeback
2018-03-28 09:55:46 -07:00
John Conklin II
586fb4829c
Merge pull request #12637 from druiz17/fix-asset-server-qml
...
Fix asset server qml sorting
2018-03-28 09:35:53 -07:00
Brad Davis
aacfe92751
Don't trigger crashes from timers while waiting for some operation on exit
2018-03-28 09:09:56 -07:00
Olivier Prat
7fa5e384b9
Merge branch 'master' of http://github.com/highfidelity/hifi into fade
2018-03-28 11:21:07 -04:00
David Rowe
c3df741c62
Settings API JSDoc
2018-03-28 17:14:06 +13:00
Seth Alves
bb101956a6
fix entity importing
2018-03-27 18:25:43 -07:00
amantley
9f3b82a417
added the functions triggerVerticalRecenter,triggerHorizontalRecenter,and triggerRotationRecenter to MyAvatar.h, these allow java script calls to recenter the avatar on the fly
2018-03-27 18:21:14 -07:00
Simon Walton
bed4033554
Local node IDs now working correctly
...
Move typedef to single location; fixes for replicated packets
(probably still not correct); reserve zero as local ID;
pass domain server's local ID in domain server list;
other tweaks.
2018-03-27 18:18:14 -07:00
David Rowe
f27e8868eb
Add HMD JSDoc
2018-03-28 12:25:12 +13:00
Dante Ruiz
197662fd5e
fix contextOverlay highlighing all entities
2018-03-27 15:22:22 -07:00
Brad Davis
29106fbbbe
Prevent potential double delete of QML overlays
2018-03-27 14:18:19 -07:00
Brad Davis
eb20181b60
Shut down the overlay interface on exit
2018-03-27 14:18:01 -07:00
samcake
025730a329
Just merging with master and trying to see the ui working again...
2018-03-26 18:24:01 -07:00
David Rowe
d1d58eceab
Add Window.raise() as replacement for Window.raiseMainWindow()
2018-03-27 13:04:50 +13:00
Zach Fox
bf48ecda6d
Fix cert location for content sets
2018-03-26 14:48:05 -07:00
Alexander Ivash
06410ec342
temporarily select 'similar-by-title' device if previously selected one was unlplugged; re-select originally selected device if it was re-plugged
2018-03-27 00:44:17 +03:00
Dante Ruiz
b8796db1e5
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-26 09:13:58 -07:00
Alexander Ivash
8e551f4dc0
re-select re-plugged device
2018-03-25 13:49:59 +03:00
Alexander Ivash
3c45f17d70
remove unused code
2018-03-25 13:44:16 +03:00
Alexander Ivash
f6bbdec902
remove 'isHMD' from input parameters of AudioDeviceList::onDevicesChanged
...
note: having 'isHMD' as a parameter doesn't make sense because function rebuilds model which is used by both HMD and Desktop
2018-03-25 13:43:51 +03:00
Gabriel Calero
8558759d41
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-03-23 16:56:53 -03:00
Dante Ruiz
a14d5c6546
make alternate keys work
2018-03-23 11:55:16 -07:00
Thijs Wenker
7309f9d82c
Merge branch 'master' of github.com:highfidelity/hifi into feat/hasScriptedBlendshapes
2018-03-23 17:51:43 +01:00
John Conklin II
c61ed697df
Merge pull request #12552 from vladest/assetbrowser_cosmetics
...
Wrap text in query dialogs. Add right margins for input field and but…
2018-03-22 17:56:47 -07:00
Dante Ruiz
f36a916fb6
revert comment change
2018-03-22 17:44:17 -07:00
Dante Ruiz
4d52caccde
making some more requested changes
2018-03-22 17:39:22 -07:00
Dante Ruiz
1d17658c80
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-22 16:29:16 -07:00
Howard Stearns
113670e33b
Merge pull request #12638 from zfox23/commerce_upgrades_1
...
Commerce: Item Updates!
2018-03-22 15:40:22 -07:00
Seth Alves
6c1d713968
review
2018-03-21 19:21:57 -07:00
Seth Alves
916ed3a0d4
review
2018-03-21 16:18:31 -07:00
Seth Alves
196f621a60
remove unneeded setSessionUUID
2018-03-21 15:21:49 -07:00
Seth Alves
ef52ae13ee
rearrange domain-url-changed signals
2018-03-21 14:30:00 -07:00
Gabriel Calero
35935ed41a
Merge remote-tracking branch 'upstream/master' into android_goto_splash
2018-03-21 17:41:02 -03:00
Gabriel Calero
11bfc1ca74
Add Goto as splash screen in android
2018-03-21 17:40:14 -03:00
Dante Ruiz
9d8770b134
changing speed
2018-03-21 13:25:50 -07:00
Seth Alves
4033af9b11
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-21 11:11:43 -07:00
Dante Ruiz
cce77e3e68
made requested changes
2018-03-21 10:15:42 -07:00
Ken Cooke
f5f4e2a780
Merge pull request #12635 from ctrlaltdavid/21776
...
Fix Window hasFocus(), setFocus(), and raiseMainWindow()
2018-03-21 09:27:51 -07:00
Dante Ruiz
86cd5ffa30
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-21 08:49:25 -07:00
David Rowe
8df6cd58c6
Document Overlays.getOverlayObject's use for web3d event bridge
2018-03-21 15:50:22 +13:00
David Rowe
05efc5a231
Revert "Remove Overlays.getOverlayObject() from JavaScript API"
...
This reverts commit 8e2a3e8c99
2018-03-21 15:36:39 +13:00
samcake
a678a38211
Merge with master
2018-03-20 17:35:57 -07:00
Olivier Prat
143a315f1d
Fade edited objects are now selected with ray picking
2018-03-20 15:29:50 -07:00
Sam Gateau
5cc0e24921
Merge pull request #12666 from jherico/fix/web_overlay_crash
...
Fix invalid QML surface cache interaction
2018-03-20 14:26:39 -07:00
Seth Alves
585a523823
unmangle merge
2018-03-20 11:17:56 -07:00
John Conklin II
40d6e51da8
Merge pull request #12597 from ElderOrb/FB12956
...
Fix for broken 'toggle audio meter' button
2018-03-20 11:03:32 -07:00
Seth Alves
bd10cd6fa9
'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)
2018-03-20 10:53:17 -07:00
Stephen Birarda
cd887b5faf
Merge pull request #12654 from huffman/feat/content-zip-upload
...
Add support for .content.zip content uploads
2018-03-20 10:07:53 -07:00
samcake
816e7a21c2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-20 09:07:41 -07:00
vladest
faf8328d6a
Fix invalid message if cancel adding asset to AssetServer
2018-03-20 15:47:30 +01:00
Seth Alves
f61504b814
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-19 14:59:18 -07:00
John Conklin II
47437c9564
Merge pull request #12651 from ctrlaltdavid/21799
...
Fix "text" overlay not clipping to right and bottom margins
2018-03-19 14:12:20 -07:00
Flame Soulis
9d9b08803c
Corrected getAnimatationRoles to getAnimationRoles
2018-03-19 01:17:46 -04:00
samcake
fb7753ebaa
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-16 15:35:17 -07:00
Brad Davis
2f59283053
Fix initialization of QML overlay surfaces
2018-03-16 14:48:08 -07:00
Zach Fox
a792bcc3d3
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-16 13:24:17 -07:00
Seth Alves
50b9716a17
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 14:45:49 -04:00
Brad Davis
1dfde86680
Fix typo
2018-03-16 11:11:08 -07:00
Brad Davis
ca38b9fe34
Fix invalid QML surface cache interaction
2018-03-16 10:53:59 -07:00
Brad Hefta-Gaub
634e642db3
Merge pull request #12634 from sethalves/overlay-visible-in-2nd-cam
...
Overlays visible in 2nd cam
2018-03-16 10:07:26 -07:00
Seth Alves
4f72503d2d
put default home back to sandbox
2018-03-16 09:39:42 -07:00
Seth Alves
e3022da787
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-16 09:34:38 -07:00
Atlante45
d96f7553d9
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
2018-03-15 15:22:43 -07:00
Ryan Huffman
03c8c14f61
Fix content replacement being allowed from all URLs
2018-03-15 12:49:22 -07:00
Ryan Huffman
bee8899c46
Add support for uploading .content.zip files
2018-03-15 12:17:21 -07:00
Seth Alves
a5b94f22fa
works now
2018-03-15 10:31:55 -07:00
Seth Alves
b22e0f6209
use TAG_BITS_1 for cam rather than TAG_BITS_ALL
2018-03-15 09:55:42 -07:00
David Rowe
a7cd5a240a
Fix "text" overlay not clipping to right and bottom margins
2018-03-15 17:31:02 +13:00
samcake
a896e9872c
adressing the avatar vissibility switch
2018-03-14 17:09:23 -07:00
Andrew Meadows
3a3bc62bd0
Merge pull request #12636 from samcake/workload
...
Workload: Applying the transaction model to the Space & Proxies
2018-03-14 16:53:24 -07:00
Seth Alves
afcbb6751b
disable loading of serverless-domains over http(s), for now
2018-03-14 15:53:35 -07:00
Seth Alves
e63558dc05
code review
2018-03-14 14:33:17 -07:00
Seth Alves
93978209d8
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-14 13:49:46 -07:00
Dante Ruiz
2fb1fbe027
fix sorting
2018-03-14 09:17:22 -07:00
Seth Alves
21088cfbcc
Merge branch 'master' of github.com:highfidelity/hifi into overlay-visible-in-2nd-cam
2018-03-14 09:00:21 -07:00
David Rowe
966d711e56
Fix Window.raiseMainWindow()
2018-03-14 13:38:48 +13:00
David Rowe
025d2807f4
Fix Window.setFocus() JSDoc
2018-03-14 12:59:27 +13:00
David Rowe
c8b4217a96
Fix Window.hasFocus()
2018-03-14 12:57:23 +13:00
Seth Alves
602bc37b1a
oops
2018-03-13 16:39:56 -07:00
Seth Alves
271badfa62
provide an overlay property to control if the overlay is visible in the secondary camera view
2018-03-13 16:33:32 -07:00
Dante Ruiz
f9413dfe1b
fixing mirror mode
2018-03-13 15:59:10 -07:00
Zach Fox
f42255f46b
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-13 13:42:42 -07:00
samcake
2af88c11f2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 13:35:31 -07:00
SamGondelman
4adc357534
apply taa to text and web entities/overlays
2018-03-13 11:57:14 -07:00
samcake
7f8948fcce
Merge branch 'workload-master' of github.com:samcake/hifi into workload
2018-03-13 10:49:31 -07:00
Dante Ruiz
00fa5cfd06
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-13 10:08:00 -07:00
Dante Ruiz
f521a129b6
fixing issues
2018-03-13 10:07:34 -07:00
samcake
f8acca76e2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-13 09:31:50 -07:00
Seth Alves
b39c7eadd2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-13 09:24:18 -07:00
John Conklin II
5be2f0acc7
Merge pull request #12490 from Zvork/taa
...
Temporal Anti-Aliasing
2018-03-13 09:03:50 -07:00
Sam Gateau
a2993c7cdb
First version wof space working with Transaction & Collection
2018-03-13 01:45:21 -07:00
David Rowe
16aefea2e1
Merge branch 'master' into 21776
2018-03-13 14:46:07 +13:00
Sam Gondelman
c59d29f4ee
Merge pull request #12623 from SamGondelman/android
...
Android: Fix corruption on startup
2018-03-12 15:03:07 -07:00
samcake
74be67edb1
fixing the default state plus upstream master merged again
2018-03-12 14:40:09 -07:00
MiladNazeri
e054f16c46
Merge pull request #12526 from ctrlaltdavid/21709
...
Entities API JSDoc
2018-03-12 14:40:09 -07:00
SamGondelman
9953e7051f
Merge remote-tracking branch 'upstream/master' into android
2018-03-12 14:15:31 -07:00
samcake
b922331b05
Address comments from review
2018-03-12 13:40:00 -07:00
Alexia Mandeville
c5b8a2d06e
Revert "Increasing speed on mousescroll - zooming in/out of avatar"
...
This reverts commit 748507f1e3
2018-03-12 13:18:02 -07:00
Alexia Mandeville
6ddb91e593
Revert "Updating default mouse pitch/yaw input to be more stabilized"
...
This reverts commit 2598be16f8
2018-03-12 13:17:48 -07:00
samcake
3efa92b48e
removing comment
2018-03-12 13:07:57 -07:00
SamGondelman
4bef033d6f
cleanup, don't compress rcc file to fix corruption
2018-03-12 13:05:03 -07:00
Dante Ruiz
e289d37210
min diff
2018-03-12 12:59:30 -07:00
Dante Ruiz
1079cfb264
fixing some issues
2018-03-12 12:57:56 -07:00
Alexia Mandeville
8c9c7248d4
Reorganize of menu action items as well as QML categories
2018-03-12 12:52:12 -07:00
samcake
7116d82dc5
Merge branch 'workload-master' of github.com:samcake/hifi into workload-bis
2018-03-12 12:04:20 -07:00
samcake
9bec8cdd0b
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
2018-03-12 12:01:00 -07:00
Dante Ruiz
272f71b940
making changes
2018-03-12 11:48:17 -07:00
Olivier Prat
aad571f6bd
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-03-12 14:22:57 -04:00
Sam Gateau
9e7260839c
Better rendering of the view circles
2018-03-12 01:05:07 -07:00
Alexia Mandeville
748507f1e3
Increasing speed on mousescroll - zooming in/out of avatar
2018-03-10 22:20:00 -08:00
Alexia Mandeville
2598be16f8
Updating default mouse pitch/yaw input to be more stabilized
2018-03-10 21:46:20 -08:00
Sam Gateau
e3c8b9c62d
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
2018-03-09 22:24:58 -08:00
samcake
e8b5a875d6
REndering the view rings better
2018-03-09 17:40:58 -08:00
samcake
10016756b7
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-03-09 16:32:37 -08:00
Seth Alves
c781f88239
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-09 15:43:14 -08:00
Seth Alves
5b5ea11a18
changes to openUrl aren't needed for serverless domains
2018-03-09 15:43:05 -08:00
samcake
c78df4d967
Setting the correct Job config for ssao check box and fixing typo
2018-03-09 15:41:56 -08:00
samcake
fec30b8363
Fixing the menu for Shadow and AO to do the correct path to engine config
2018-03-09 15:04:14 -08:00
samcake
10447bf10e
Fix the fact that all avatars should cast shadows, not just MyAvatar. since this is always a SkeletonMOdel class let s just turn it on by default there
2018-03-09 13:04:04 -08:00
Sam Gateau
d0de5b2d96
Merge pull request #12496 from AndrewMeadows/faster-raypick
...
faster per-entity raypick culling and time-boxed picks
2018-03-09 13:01:52 -08:00
Seth Alves
621e6a62d6
merge from upstream
2018-03-09 12:07:24 -08:00
Seth Alves
58bc42990c
merge from upstream
2018-03-09 12:03:26 -08:00
John Conklin II
25b93d9fd7
Merge pull request #12606 from ElderOrb/FB12956_RC65
...
Fix for broken 'toggle audio meter' button
2018-03-09 11:20:27 -08:00
Dante Ruiz
c949b44f0c
conforming to coding standards
2018-03-09 10:42:19 -08:00
John Conklin II
6969f014fc
Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one
...
clear wallet when picking a new one
2018-03-09 10:09:41 -08:00
John Conklin II
407dfec342
Merge pull request #12603 from howard-stearns/RC65-clear-wallet-when-picking-a-new-one
...
clear wallet when picking a new one
2018-03-09 10:09:24 -08:00
John Conklin II
209dd7fb43
Merge pull request #12602 from zfox23/RC65_fixFontsAgain
...
RC65: Fix font loading for MacOS via completely different font loading method
2018-03-09 09:53:46 -08:00
Zach Fox
2b137f94a6
Merge pull request #12596 from zfox23/fixFontsAgain
...
Fix font loading for MacOS via completely different font loading method
2018-03-09 09:49:56 -08:00
Dante Ruiz
cfa85b5137
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-09 09:37:08 -08:00
Brad Hefta-Gaub
5437ffb2c8
Merge pull request #12536 from ctrlaltdavid/21700
...
Remove deprecated Window.openFileChanged() signal from API
2018-03-09 08:47:57 -08:00
Andrew Meadows
9fbe7ec194
time-box Picks and solve in round-robin sequence
2018-03-09 08:35:18 -08:00
Sam Gateau
f087bb7623
Adjust the freeze view and start drawing the views better
2018-03-09 01:38:00 -08:00
Olivier Prat
da6bd92ff6
Merged with master
2018-03-09 10:07:25 +01:00
Sam Gateau
8089d77c78
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
2018-03-08 19:40:20 -08:00
Atlante45
69fb830480
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-08 17:23:17 -08:00
David Rowe
b461a422c6
Merge branch 'master' into 21709
2018-03-09 14:18:42 +13:00
John Conklin II
cad53a0203
Merge pull request #12585 from druiz17/small-tablet-changes
...
tablet scale and position changes
2018-03-08 15:36:06 -08:00
samcake
a0db5c6135
Merge with master
2018-03-08 15:35:58 -08:00
John Conklin II
fe0d354d26
Merge pull request #12599 from zfox23/RC65_preventSendingEmptyKeys
...
RC65: Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
2018-03-08 15:30:19 -08:00
Alexander Ivash
b427d6c326
FB12956 - Audio Meter Toggle Button Broken
2018-03-09 02:20:34 +03:00
howard-stearns
883528488c
clear wallet when picking a new one
2018-03-08 14:35:43 -08:00
Zach Fox
ec6f66ee52
Try this
2018-03-08 14:31:56 -08:00
Zach Fox
747a6b07ce
Fix font loading for MacOS via different font loading method
2018-03-08 14:31:48 -08:00
howard-stearns
9d805283d1
clear wallet when picking a new one
2018-03-08 14:24:44 -08:00
Alexander Ivash
1fb68ec5ca
FB12956 - Audio Meter Toggle Button Broken
2018-03-09 00:55:49 +03:00
Zach Fox
409f5293bf
Try this
2018-03-08 13:51:34 -08:00
Zach Fox
22f18dbf56
Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd
2018-03-08 13:12:13 -08:00
Zach Fox
4df58f1e67
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-08 12:58:08 -08:00
NissimHadar
fda32e4aa4
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-08 12:16:36 -08:00
NissimHadar
d1b87b3116
Added missing avatar shadows.
2018-03-08 12:14:42 -08:00
Zach Fox
d0cc64f63d
Fix font loading for MacOS via different font loading method
2018-03-08 11:19:49 -08:00
Sam Gondelman
1e9cfe29f2
Merge pull request #12388 from highfidelity/android
...
Android Tip
2018-03-08 10:18:35 -08:00
Seth Alves
fca510c9f7
move start json to a new directory
2018-03-07 18:45:45 -08:00
David Rowe
b1bda281ee
Merge branch 'master' into 21776
2018-03-08 15:36:10 +13:00
Seth Alves
7c7f42af06
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-03-07 18:26:15 -08:00
Seth Alves
4ed0c24a73
use static QStrings rather than functions
2018-03-07 18:25:55 -08:00
Sam Gateau
dc122b4ce8
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-07 18:14:44 -08:00
Seth Alves
e70ca252de
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-03-07 16:03:48 -08:00
Seth Alves
12eb0e4109
name emit from AddressManager like an event
2018-03-07 15:36:35 -08:00
Seth Alves
9f2be4db8f
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-07 15:04:38 -08:00
Sam Gondelman
f51a35455a
Merge pull request #12515 from SamGondelman/scriptableMaterials
...
Material reflection
2018-03-07 14:29:31 -08:00
Zach Fox
d71fc22ed8
Support argument to available_updates endpoint
2018-03-07 14:06:29 -08:00
Elisa Lupin-Jimenez
2987c90f96
fixed syntax for ubuntu
2018-03-07 13:48:35 -08:00
Seth Alves
e583d3d104
Merge pull request #26 from druiz17/serverless-domains
...
Serverless domains
2018-03-07 13:40:55 -08:00
Elisa Lupin-Jimenez
9ae2da7e4b
fixed logic for texture files/non-models
2018-03-07 13:18:36 -08:00
Dante Ruiz
297273de08
Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord
2018-03-07 13:09:47 -08:00
Dante Ruiz
8382d842e1
changing to resources path
2018-03-07 12:51:26 -08:00
Seth Alves
8a08039efe
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-07 11:44:48 -08:00
Elisa Lupin-Jimenez
28589094c2
hopefully fixed mac/ubuntu builds
2018-03-07 10:18:40 -08:00
Zach Fox
91e0af9b46
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-07 10:16:10 -08:00
Dante Ruiz
2d448d7208
tablet scale and position changes
2018-03-07 10:02:35 -08:00
Dante Ruiz
a70509233e
making small changes
2018-03-07 08:25:27 -08:00
Brad Hefta-Gaub
9595049e01
Merge pull request #12582 from thoys/fix/JSDOCtypo
...
fix JSDOC typo rule -> role
2018-03-07 07:50:07 -08:00
Seth Alves
b8fc9e2469
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-07 07:40:35 -08:00
David Rowe
a62b6b7150
Merge branch 'master' into 21709
2018-03-07 17:34:53 +13:00
David Rowe
eeb7f5ca8d
Doc review
2018-03-07 17:29:39 +13:00
Elisa Lupin-Jimenez
c6e5f4c9c8
zip file drags don't auto add model textures
2018-03-06 19:24:09 -08:00
Thijs Wenker
90b77030d5
MyAvatar.hasScriptedBlendshapes property
2018-03-07 02:55:47 +01:00
Thijs Wenker
866bec0b34
rule -> role
2018-03-07 02:36:07 +01:00
Cristian Luis Duarte
bde2ba9272
Merge remote-tracking branch 'gcgithub/android_bubble_fix' into android_experimental_joystick_fixed
2018-03-06 22:02:23 -03:00
Elisa Lupin-Jimenez
251e4a3127
Fixed blocks importer textures being interpreted as image entities
2018-03-06 16:44:23 -08:00
NissimHadar
d72f46ec3e
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-06 16:24:53 -08:00
Seth Alves
926be73c0a
make this work again
2018-03-06 15:50:03 -08:00
Dante Ruiz
69af12fbc7
chaning speeds
2018-03-06 15:47:01 -08:00
Atlante45
edeed95ccc
Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master
2018-03-06 15:33:12 -08:00
Dante Ruiz
6fefd1355a
minimize diff
2018-03-06 14:19:26 -08:00
Dante Ruiz
fe363e7f2a
changing keybaord mapping
2018-03-06 14:16:25 -08:00
Gabriel Calero
a2327ea0cf
Merge branch 'android' into android_bubble_fix
2018-03-06 19:03:53 -03:00
Gabriel Calero
069d3e40bc
Merge branch 'android' into android_bubble_fix
2018-03-06 18:58:49 -03:00
Seth Alves
79aa450332
some code-review induced changes
2018-03-06 13:11:09 -08:00
Brad Davis
6cc36136bd
Fix assert on interaction with stats and avatarinputs during UI setup
2018-03-06 12:34:21 -08:00
vladest
7b9d9fad59
Merge branch 'master' into assetbrowser_cosmetics
2018-03-06 11:37:18 +01:00
Sam Gateau
7e96608699
introducing the first stage of the workload engine to setup view and expand the view definition
2018-03-06 01:35:16 -08:00
samcake
450786404c
Adding more detailed classes and introducing an upfront setupVIew job
2018-03-05 18:04:25 -08:00
Zach Fox
35b23cc954
It's working!
2018-03-05 15:54:17 -08:00
Brad Davis
8bfc610cfb
Merge remote-tracking branch 'upstream/master' into android
2018-03-05 11:48:58 -08:00
NissimHadar
1eb0dde3d2
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-05 11:36:39 -08:00
Zach Fox
4046c873bd
Still need to send correct thing to metaverse
2018-03-05 11:24:59 -08:00
samcake
0ab5fc178f
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-03-05 11:12:27 -08:00
samcake
7d32efb5e6
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-05 11:03:11 -08:00
Zach Fox
f5a8187fe2
Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1
2018-03-05 10:01:55 -08:00
Zach Fox
f10f9aa939
Continued progress
2018-03-05 10:01:40 -08:00
Seth Alves
a6c3bcd8d8
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-05 08:51:12 -08:00
John Conklin II
3f751bb5ca
Merge pull request #12546 from druiz17/fix-hyperlink
...
Fix hyperlink when far/near grabbing enitities
2018-03-05 08:23:51 -08:00
vladest
126f05f8bd
Added space
2018-03-04 13:28:26 +01:00
vladest
2a9bbfa808
Wrap text in query dialogs. Add right margins for input field and buttons
2018-03-04 13:19:56 +01:00
Seth Alves
606face7c0
gather together the url scheme constants, name them consistently
2018-03-02 20:39:38 -08:00
Seth Alves
fdb53b6543
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-02 19:27:53 -08:00
Seth Alves
7a61119d11
remove unneeded call to clearDomainOctreeDetails
2018-03-02 19:27:45 -08:00
samcake
660c4c30e9
Representing the view spheres
2018-03-02 18:22:51 -08:00
samcake
7179a31d17
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-03-02 17:51:19 -08:00
samcake
cc392944b5
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 17:49:10 -08:00
NissimHadar
8536b44c61
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 16:09:06 -08:00
John Conklin II
8f403ebc23
Merge pull request #12543 from zfox23/improveFontLoading
...
Improve font loading via QRC instead of file path
2018-03-02 14:22:17 -08:00
Seth Alves
746769cbe9
don't crash
2018-03-02 13:52:18 -08:00
Seth Alves
507dfa5ec3
more code review response
2018-03-02 11:35:34 -08:00
Seth Alves
bdd926f89e
cleanups
2018-03-02 10:38:35 -08:00
Seth Alves
45157a16f2
merge from upstream
2018-03-02 09:57:27 -08:00
Seth Alves
82bfd25d8b
fix placename in title-bar, fix domain-spawning-point
2018-03-02 09:54:54 -08:00
samcake
a40f8cefa2
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-03-02 09:01:16 -08:00
samcake
d4d5f3a7f0
Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload
2018-03-02 08:50:47 -08:00
NissimHadar
000b08f7c0
Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork
2018-03-02 08:07:01 -08:00
David Rowe
287ea8eff2
Fix Window.setFocus() unsetting focus if Interface has focus
2018-03-02 15:40:49 +13:00
samcake
5b8e18f15d
Adding the pipeline to render the view spheres
2018-03-01 17:57:44 -08:00
Sam Gateau
88ecfe7895
Merge pull request #12464 from jherico/android_dev
...
Android Master
2018-03-01 17:22:34 -08:00
SamGondelman
e3b65a9201
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
2018-03-01 16:39:31 -08:00
Dante Ruiz
1f4aed31f1
adding hyperlink
2018-03-01 16:16:47 -08:00
David Rowe
b50044fb2b
Remove deprecated Window.openFileChanged() signal from API
2018-03-02 13:15:27 +13:00
NissimHadar
0f2cf8ea85
Re-implemented shadow controls.
2018-03-01 14:24:20 -08:00
samcake
3a9a93f502
Introducing a ui app for debugging the workload and fixing the vissible/invisisble behavior of the render item
2018-03-01 13:40:58 -08:00
Seth Alves
9ee65ab474
don't use clipboard when loading serverless domains
2018-03-01 13:31:43 -08:00
Seth Alves
2d374583b4
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-03-01 11:07:50 -08:00
Seth Alves
33065fb51c
more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port
2018-03-01 11:07:37 -08:00
Andrew Meadows
f9db9e999e
Merge 'master' into 'workload'
2018-03-01 10:19:06 -08:00
Zach Fox
877fa52034
Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading
2018-03-01 10:14:23 -08:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
Zach Fox
67034274fa
Improve font loading by using QRC instead of relative paths
2018-02-28 17:59:37 -08:00
samcake
d91fb543f3
Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api
2018-02-28 17:15:40 -08:00
Cristian Luis Duarte
9acb83632c
Android - Make joystick move up when showing the bottom bar
2018-02-28 18:52:13 -03:00
Cristian Luis Duarte
55d52f92df
Android - Make Joystick appear always when possible (not in radar mode and when not hidden by some windows)
2018-02-28 15:55:50 -03:00
samcake
9e5ed7b905
Add more timing stats in explanded mode
2018-02-28 10:48:35 -08:00
samcake
e6d5f90847
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-02-28 10:30:14 -08:00
Andrew Meadows
3ca21dda67
Merge hifi/master of into hifi/workload
2018-02-28 10:28:31 -08:00
samcake
31462a87c3
now identifying the issue with ResourceBUffer
2018-02-28 10:13:13 -08:00
samcake
66f1b7f1fc
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-02-28 09:25:24 -08:00
samcake
3360c5a968
Debugging the ssbo bug
2018-02-27 18:46:12 -08:00
David Rowe
a782b6779a
Merge branch 'master' into 21709
...
# Conflicts:
# interface/src/ui/overlays/Overlays.h
# interface/src/ui/overlays/Shape3DOverlay.cpp
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
samcake
e290f2fc3c
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-02-27 14:54:11 -08:00
Seth Alves
a44ddbbc26
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-27 14:09:05 -08:00
Brad Davis
136ced98c3
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-27 13:44:00 -08:00
John Conklin II
b4000c04bc
Merge pull request #12432 from highfidelity/feat/content-settings
...
Add content archives to domain server web interface
2018-02-27 13:30:53 -08:00
SamGondelman
cc53b338db
Merge remote-tracking branch 'upstream/master' into scriptableMaterials
2018-02-27 13:30:03 -08:00
Howard Stearns
0e4f3460b3
Merge pull request #12497 from howard-stearns/end-seeding
...
End seeding
2018-02-27 13:18:13 -08:00
SamGondelman
0fca56eef0
Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork"
...
This reverts commit 3201d2ba21c0f20900a0
2018-02-27 11:33:05 -08:00
Stephen Birarda
9cc348ef27
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-27 09:59:37 -08:00
Zach Fox
9170244312
Make WindowScriptingInterface available to tablet
2018-02-27 09:36:02 -08:00
Seth Alves
636c271dc3
merge from upstream
2018-02-27 09:21:08 -08:00
samcake
e95b16c5f9
Merge branch 'workload' of https://github.com/samcake/hifi into workload
2018-02-27 09:12:13 -08:00
samcake
efba6bb524
Adding a counter for the other parts of the gameloop
2018-02-27 09:11:14 -08:00
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting
...
Leopoly_Phase1_010 Graphics Scripting
2018-02-27 07:53:25 -08:00
Olivier Prat
2d71d7da9f
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-27 09:11:43 +01:00
John Conklin II
25144f0fec
Merge pull request #12456 from Atlante45/fix/min-spec-crash
...
Fix crash when passing --checkMinSpec flag
2018-02-26 17:35:46 -08:00
David Rowe
1fb02d15d7
Entities actions JSDoc
2018-02-27 14:12:20 +13:00
Stephen Birarda
aa7bd2066a
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-26 17:02:00 -08:00
Seth Alves
642e7b7c37
Merge pull request #24 from druiz17/serverless-domains
...
Some bug fixes
2018-02-26 15:25:59 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Dante Ruiz
a23c425f5e
actions and serverless status fixes
2018-02-26 14:24:51 -08:00
Seth Alves
666fa77be2
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 13:53:20 -08:00
Brad Davis
b9387f2a21
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-26 13:18:14 -08:00
SamGondelman
6fe2d46d7c
merge
2018-02-26 12:40:14 -08:00
John Conklin II
6316f33282
Merge pull request #12485 from dback2/avatarMotors
...
Add dynamic mode for scripted avatar motor
2018-02-26 11:03:30 -08:00
howard-stearns
a5cedde3c8
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 10:33:03 -08:00
John Conklin II
3201d2ba21
Merge pull request #12407 from NissimHadar/shadowControlsOffZvork
...
Shadow control for zones, models and shapes
2018-02-26 10:13:40 -08:00
Brad Davis
3e552e5739
Fix warnings
2018-02-26 09:53:35 -08:00
Sam Gateau
8e4ed40246
Merge branch 'master' of https://github.com/highfidelity/hifi into workload
2018-02-26 09:51:23 -08:00
NissimHadar
c0f20900a0
Merge pull request #12458 from NissimHadar/snapshotDefaultNameFix
...
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-26 09:39:16 -08:00
howard-stearns
30a6cca4b3
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-26 09:26:09 -08:00
Seth Alves
f08864f17b
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-26 09:01:41 -08:00
Zach Fox
b5c42bfeca
Merge pull request #12480 from zfox23/commerce_extendedCerts_apps
...
Commerce: Extended Certificates - Apps!
2018-02-26 08:24:53 -08:00
humbletim
f824edd04e
* remove Model_temporary_hack
...
* split gpuhelpers and mesh part
* fix objwriter
* more work on bufferview helpers
* cr cleanup
2018-02-26 04:58:22 -05:00
howard-stearns
5e78de61ee
remove debugging
2018-02-25 15:24:08 -08:00
howard-stearns
300f611c47
working, with soft reset
2018-02-25 14:06:06 -08:00
howard-stearns
3d0e3a3901
Merge branch 'master' of https://github.com/highfidelity/hifi into end-seeding
2018-02-24 13:34:00 -08:00
Seth Alves
9e156deaab
Merge pull request #12494 from druiz17/one-menu
...
Remove the avatarEntitiesBookmark menu option
2018-02-23 19:02:25 -08:00
SamGondelman
b56f755034
material reflection
2018-02-23 17:58:46 -08:00
Brad Hefta-Gaub
3d54f4d246
Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog
...
Relax deadlock watchdog
2018-02-23 17:09:30 -08:00
howard-stearns
726c1ed816
receiveAt with new key
2018-02-23 17:05:46 -08:00
Seth Alves
f946ce48d6
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-23 16:46:55 -08:00
Seth Alves
5632f9d8fd
clean up debug prints. put filename in window title-bar when connected to a serverless domain
2018-02-23 16:46:42 -08:00
Atlante45
800d15b405
Make sure settings timer is running
2018-02-23 16:23:50 -08:00
howard-stearns
29a2fa6ca5
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-23 16:19:54 -08:00
Sam Gondelman
e10af9b83d
Merge pull request #12462 from SamGondelman/entityDelete
...
Fix EntityItems not getting destroyed
2018-02-23 16:17:52 -08:00
howard-stearns
f66e688f41
Merge branch 'master' of github.com:highfidelity/hifi into end-seeding
2018-02-23 16:12:41 -08:00
howard-stearns
53614a1d9f
almost working
2018-02-23 16:12:01 -08:00
Seth Alves
77febe0aab
save avatar-entities which are created while using a serverless domain
2018-02-23 16:03:08 -08:00
David Back
283b5724ba
CR changes
2018-02-23 15:02:51 -08:00
David Back
da391564a8
CR changes
2018-02-23 15:01:29 -08:00
David Back
a418129bea
simplify to just changing timescales
2018-02-23 15:00:23 -08:00
Dante Ruiz
07b0431215
fix merge conflict
2018-02-23 14:00:36 -08:00
Seth Alves
1e49dc5ca2
try using app-local-data path for /~/
2018-02-23 13:58:23 -08:00
Brad Davis
0550138609
Merge remote-tracking branch 'upstream/master' into android_dev
2018-02-23 12:48:10 -08:00
Dante Ruiz
d0ec84b6c8
remove menu option for booking marking avatar entities
2018-02-23 10:45:59 -08:00
Zach Fox
5ee28297f3
Don't use eventLoop, since that will block the UI
2018-02-23 10:19:00 -08:00
Seth Alves
99893d81e2
merge from upstream
2018-02-23 09:14:48 -08:00
Olivier Prat
c935111c43
Some slight cleanup in Application_render
2018-02-23 18:13:08 +01:00
Olivier Prat
b1b62087e5
Forgot to reactivate deadlock detection
2018-02-23 18:08:21 +01:00
Olivier Prat
ee253143ff
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-02-23 14:53:14 +01:00
humbletim
6ea4b660b7
CR feedback; remove ok bool pointer and all metadata; cleanup
2018-02-23 07:47:39 -05:00
Olivier Prat
4636f43728
Simplified camera view history and TAA is now working in all circumstances.
2018-02-23 10:19:05 +01:00
David Rowe
440c0aa0d9
Overlays JSDoc improvements
2018-02-23 19:27:54 +13:00
Atlante45
c106fee659
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration
2018-02-22 19:45:43 -08:00
Bradley Austin Davis
12d1885dff
Merge pull request #12428 from gcalero/android_ui_fixes
...
Android ui fixes
2018-02-22 18:28:18 -08:00
Brad Davis
aeb29db37d
Merge remote-tracking branch 'upstream/stable' into android_stable
2018-02-22 17:35:00 -08:00
ZappoMan
9f68accb30
add menu for testing unresponsive interface
2018-02-22 17:34:00 -08:00
David Back
083e461eb0
Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMotors
2018-02-22 17:20:49 -08:00
David Back
902672f85e
add dynamic mode for scripted avatar motor
2018-02-22 17:20:36 -08:00
Atlante45
277e556b48
Create a standard function to init Hifi Apps
2018-02-22 17:06:09 -08:00
howard-stearns
1aaae94cc1
checkpoint
2018-02-22 17:04:27 -08:00
samcake
101872abce
Still marinating how to represent the proxy values...
2018-02-22 16:44:35 -08:00
Atlante45
80c0f2a21e
Fix crash when passing --checkMinSpec flag
...
That flag caused a DLL to be loaded before Application was
instanced.
This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes
the previous registration pointing the startup function in
the main executable to be overridden with the address of the
function in the DLL (Since they both link the same static
library)
This leads to the correct function running in the wrong address
space (the DLLs), hence not initializing some global variables
correctly.
2018-02-22 16:29:38 -08:00
Zach Fox
33f73fef0d
YAY!
2018-02-22 16:26:35 -08:00
Zach Fox
10fa3fa346
It's working!
2018-02-22 16:09:01 -08:00
Zach Fox
de0eee52d6
cool
2018-02-22 14:45:32 -08:00
Seth Alves
72234970e3
set sessionUUID for a serverless domain to random rather than AVATAR_SELF_ID
2018-02-22 14:38:46 -08:00
Seth Alves
804ab855d7
Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains
2018-02-22 14:16:15 -08:00
Seth Alves
fdd2b0de15
increment _fullSceneReceivedCounter++ after loading a serverless domain. fix some indentation.
2018-02-22 14:16:11 -08:00
Seth Alves
c7081b28e6
when connected to a serverless domain, set the sessionUUID to be AVATAR_SELF_ID
2018-02-22 14:14:55 -08:00
Olivier Prat
ae63610582
Added history of view to try to adjust for GPU slower than game
2018-02-22 23:03:33 +01:00
ZappoMan
e9cad947d7
add the deadlock watchdog stats to the stats metaverse checkin data
2018-02-22 14:01:56 -08:00
Zach Fox
4d2d7fa51f
lots of fun initial progress!
2018-02-22 13:56:46 -08:00
NissimHadar
c6580f642a
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-22 13:45:00 -08:00
Seth Alves
50cec08efe
look offline when visiting a serverless domain
2018-02-22 13:43:41 -08:00
Andrew Meadows
1e71e819f4
update space view according to main ViewFrustum
2018-02-22 12:04:25 -08:00
Brad Davis
2f34fb2e42
Merge remote-tracking branch 'upstream/stable' into HEAD
2018-02-22 10:20:10 -08:00
Nissim Hadar
a843a53427
Improved JSDoc comments.
2018-02-22 10:17:20 -08:00
Zach Fox
90f05f4db7
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-22 09:23:49 -08:00
ZappoMan
aa5542c54b
Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog
2018-02-22 08:43:13 -08:00
Seth Alves
c83dcbc626
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-22 07:42:49 -08:00
humbletim
dd90c8c515
fix ubuntu compile warnings
2018-02-22 10:16:34 -05:00
humbletim
4fd3d9bf7b
cleanup; formalize data structures
2018-02-22 08:18:38 -05:00
humbletim
fe9b67344b
remove unnecessary UUID check
2018-02-22 07:58:49 -05:00
humbletim
e4a2a589a5
CR fedback and cleanup
2018-02-22 07:56:09 -05:00
humbletim
72fca7e57e
Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge
2018-02-22 05:18:05 -05:00
humbletim
be8d79f53f
CR fedback and cleanup
2018-02-22 05:15:01 -05:00
Seth Alves
d27cbac3f8
loading directly into a serverless domain works. user will have edit permissions
2018-02-21 18:21:45 -08:00
samcake
9c136e7dac
Trying to render the proxies without success
2018-02-21 17:31:53 -08:00
Seth Alves
db195c6184
Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items
...
Remove some deprecated JavaScript API items
2018-02-21 16:31:16 -08:00
SamGondelman
4b1217f1f6
move all entity items to main thread
2018-02-21 15:54:07 -08:00
Seth Alves
e36f39781b
remove some debug prints, fix serverless to servered domain transition
2018-02-21 15:06:23 -08:00
Nissim Hadar
049beba157
Corrected edge case of creating a snapshot with "" as the filename.
2018-02-21 14:15:41 -08:00
Seth Alves
37e16d2e6d
don't save up edit packets when loading a serverless domain
2018-02-21 12:54:41 -08:00
Nissim Hadar
bf4ba07b72
Added parameters to canCastShadow - still sucks.
2018-02-21 12:36:34 -08:00
Zach Fox
74655bde49
Fix skeletonmodelURLchanged signal
2018-02-21 12:12:20 -08:00
samcake
1c3bc0aa67
addressing review and warnings
2018-02-21 11:18:41 -08:00
samcake
33b47f9ae2
Merging with the actual worloadspace managed from the EntityTreeRenderer
2018-02-21 10:34:58 -08:00
ZappoMan
47a98d9d0f
relax the deadlock time to 2 minutes
2018-02-21 10:12:04 -08:00
samcake
34db56c50c
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-02-21 08:58:01 -08:00
Olivier Prat
f53c2f41a5
Merge branch 'master' of http://github.com/highfidelity/hifi into prev
2018-02-21 09:46:38 +01:00
Nissim Hadar
6f84e4c977
Moved shadows and ambient occlusion to menu checkboxes.
2018-02-20 23:45:07 -08:00
samcake
f1dcfeb25e
Adding shaders and means to render the proxies contained in the workload SPace
2018-02-20 18:20:12 -08:00
Seth Alves
c5d6f0e10f
don't queue up edit packets while connected to a serverless domain
2018-02-20 17:48:14 -08:00
Andrew Meadows
e7495d830b
maintain Space proxies for entities
2018-02-20 17:39:05 -08:00
SamGondelman
4c6169ec78
merge and a little cleanup
2018-02-20 15:45:34 -08:00
samcake
be3fdbeaeb
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload
2018-02-20 13:16:25 -08:00
Zach Fox
2daa30f125
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-20 12:41:12 -08:00
Andrew Meadows
7ed68ced62
Merge master into highfidelity/workload
2018-02-20 12:31:37 -08:00
Seth Alves
1f5a65f93e
only could a url as a domain if it ends with .domain.json
2018-02-20 10:58:43 -08:00
humbletim
5791ca4c51
interim checkin
2018-02-20 12:22:04 -05:00
Olivier Prat
4edfe6c9ab
Trying to keep track of a better previous correction
2018-02-20 14:48:21 +01:00
Sam Gateau
cd14fb65f0
First stp to add a rendering job to debug and display the workload space
2018-02-19 23:44:23 -08:00
Seth Alves
563c19bb91
fix connect
2018-02-19 15:21:46 -08:00
Nissim Hadar
b2a06cdb98
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
...
# Conflicts:
# libraries/entities/src/EntityItemProperties.cpp
# libraries/entities/src/ShapeEntityItem.h
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
Seth Alves
25c34403db
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-19 11:24:42 -08:00
Sam Gateau
fd49c0d100
Merge pull request #12401 from SamGondelman/decals
...
Material Entities
2018-02-19 10:58:02 -08:00
Olivier Prat
9cfe53be3e
Merged from orgin taa
2018-02-19 17:50:10 +01:00
Olivier Prat
f5a2557a2e
Merged with master
2018-02-19 17:28:39 +01:00
David Rowe
03bc1b05d9
Overlays JSDoc improvements
2018-02-19 12:21:07 +13:00
David Rowe
3e7e9fe2c6
Overlay shape is different to Entities shape
2018-02-19 12:19:25 +13:00
Seth Alves
7a5415efbe
working on getting history to work with serverless domains
2018-02-18 07:55:43 -08:00
Seth Alves
a060d0ddb7
allow more than just hifi:// in various places
2018-02-17 06:32:38 -08:00
Seth Alves
dd278b4b1b
go to the default spawn point when loading a serverless domain
2018-02-16 17:45:39 -08:00
Stephen Birarda
769d5677b1
Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings
2018-02-16 17:41:14 -08:00
samcake
d1b1ae0ea3
Working on adding rendering from the workload
2018-02-16 17:22:27 -08:00
samcake
9441bb477d
Working on adding rendering from the workload
2018-02-16 17:21:07 -08:00
Seth Alves
ed5b28aa2a
clear octree on any sort of domain change
2018-02-16 17:15:15 -08:00
Seth Alves
d58eccd5aa
don't use edit.js to load entities for serverless domain
2018-02-16 16:38:45 -08:00
Nissim Hadar
a2cc78b200
Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork
2018-02-16 14:01:57 -08:00
Nissim Hadar
4c1f22f84e
Models and Avatar cast shadows (box doesn't, yet).
2018-02-16 14:01:33 -08:00
Seth Alves
de9ac7f4a5
working to integrate serverless domains into history, etc
2018-02-16 13:56:22 -08:00
Seth Alves
afa059d331
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-16 12:58:56 -08:00
Seth Alves
b2a4181bc0
working to integrate serverless domains into history, etc
2018-02-16 12:58:50 -08:00
Nissim Hadar
194c7f4101
WIP - for review.
2018-02-16 09:28:15 -08:00
MiladNazeri
331b253ba0
Merge pull request #12386 from cain-kilgore/21668
...
WL 21668 - Make sure all Prompts are correctly emitting a signal on cancel and that cancellations return null
2018-02-16 06:57:03 -08:00
Andrew Meadows
6d347cf44f
revert deadlock, remove Space stubbery in EntityTree
2018-02-15 17:40:15 -08:00
Seth Alves
abc467b919
load json from indicated file to populate serverless domain
2018-02-15 16:09:03 -08:00
SamGondelman
b189433855
merge
2018-02-15 15:50:36 -08:00
SamGondelman
2d754edf74
CR
2018-02-15 15:48:41 -08:00
Seth Alves
17e2db96c6
make domain-manager and pals be still when interface is in serverless mode
2018-02-15 15:19:50 -08:00
Zach Fox
8072372822
Lots of changes
2018-02-15 13:27:13 -08:00
Andrew Meadows
1247f88d83
merge 'master' into 'workload'
2018-02-15 12:21:05 -08:00
humbletim
145a0df082
interim checkin
2018-02-15 14:14:07 -05:00
Ryan Huffman
2a667fcd60
Cleanup entity -> ds persist
2018-02-15 10:09:21 -08:00
Ryan Huffman
cb9327e030
Add entity file sync and domain content backups
2018-02-15 10:09:20 -08:00
Seth Alves
0f4b68c038
Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains
2018-02-15 07:53:36 -08:00
Sam Gondelman
15cdfef16a
Merge branch 'master' into decals
2018-02-14 17:33:01 -08:00
MiladNazeri
258133f1db
Merge pull request #12335 from ctrlaltdavid/21736
...
Update Overlays circle3d JSDoc per recent code changes
2018-02-14 17:17:04 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
Zach Fox
5a8b8d4ac8
Lots of changes
2018-02-14 16:44:02 -08:00
Bradley Austin Davis
33690e09b7
Merge pull request #12399 from samcake/blue
...
Introducing group culling to avoid the avatar model to be partially culled
2018-02-14 15:38:52 -08:00
Andrew Meadows
ba888a14ca
give Application a 'workload' engine
2018-02-14 13:26:42 -08:00
Brad Davis
8853bd6388
Fix spectator camera crash
2018-02-14 11:11:28 -08:00
Zach Fox
0fca843667
Integrate 'alreadyOwned' endpoint
2018-02-14 10:24:34 -08:00
samcake
1d3ae1b187
Work in progress to get the render items beeing tagged correctly for groupCulled
2018-02-13 17:50:01 -08:00
John Conklin II
309c2ecba1
Merge pull request #12239 from druiz17/fix-camera-update
...
Do not override sensorToWorldMatrix if animGraph is loading or failed to load
2018-02-13 15:10:13 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Zach Fox
ae8a8a48eb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1
2018-02-13 13:55:32 -08:00
Zach Fox
1b7253dc7f
Already Owned endpoint
2018-02-13 13:54:50 -08:00
Seth Alves
764447fa24
merge from upstream
2018-02-13 13:01:45 -08:00
Seth Alves
bf9496b46b
start on support for models.json serverless domains
2018-02-13 13:00:27 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
Zach Fox
0809210dc3
No permission card
2018-02-13 11:16:48 -08:00
Dante Ruiz
45f09dde96
address tony's requests
2018-02-13 10:32:15 -08:00
Zach Fox
95e9eb8e4a
Lots of progress
2018-02-12 17:06:57 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml
...
Migrating QML rendering off the main thread
2018-02-12 15:32:33 -08:00
John Conklin II
3377aaceea
Merge pull request #12343 from NissimHadar/saveSnapshotWithName
...
Added option to select snapshot filename in scripts.
2018-02-12 15:22:04 -08:00
Cain Kilgore
d1ecc85fb3
Merge branch 'master' of https://github.com/highfidelity/hifi into 21668
2018-02-12 23:19:20 +00:00
Cain Kilgore
5048bf16cb
Fixed Async Prompts/Assets/Dialogs
2018-02-12 23:01:19 +00:00
John Conklin II
51bf3c1466
Merge pull request #12323 from Zvork/shadow
...
Shadow performance / acnee improvements
2018-02-12 14:41:13 -08:00
John Conklin II
d084e58f48
Merge pull request #12328 from Atlante45/fix/misc-bugs
...
Misc bug fixes
2018-02-12 14:31:38 -08:00
SamGondelman
9e8aa1898c
warnings, load material from URL, shapeID -> parentMaterialID
2018-02-12 12:50:09 -08:00
David Rowe
033b85a3a8
Merge branch 'master' into remove-deprecated-items
...
# Conflicts:
# scripts/system/libraries/entitySelectionTool.js
2018-02-13 09:42:40 +13:00
Brad Davis
1f2760c4b7
Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into android
2018-02-12 12:39:40 -08:00
Dante Ruiz
1a25332575
fix indenting
2018-02-12 10:59:25 -08:00
Dante Ruiz
3c84318918
fixing merge conflict
2018-02-12 10:57:55 -08:00
Dante Ruiz
d381beb213
cleaning up code
2018-02-12 10:53:42 -08:00
Bradley Austin Davis
f6fbac25b0
Prevent deadlock crashes when building shaders at startup
2018-02-12 09:49:28 -08:00
Bradley Austin Davis
4bb329696a
Don't trigger a backtrace exception on quitting while in HMD
2018-02-12 08:49:20 -08:00
Bradley Austin Davis
288443d74b
Fix for deadlock triggering while loading QML engine
2018-02-12 08:49:10 -08:00
Dante Ruiz
5325b22b01
working on lambdas
2018-02-09 16:46:11 -08:00
John Conklin II
a961021101
Merge pull request #12378 from druiz17/save-avatarUrl
...
save avatarUrl when setting new skeletonModelUrl
2018-02-09 16:04:35 -08:00
John Conklin II
88094cae87
Merge pull request #12363 from zfox23/commerce_inspectionCertRedesign_v2
...
Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 15:51:46 -08:00
SamGondelman
5337377ef5
Merge remote-tracking branch 'upstream/master' into decals
2018-02-09 14:40:20 -08:00
John Conklin II
64c5b883b1
Merge pull request #12243 from RebeccaStankus/log-filtering
...
Some improvements to the log window
2018-02-09 12:50:49 -08:00
Cristian Luis Duarte
bb4f57f982
Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.
2018-02-09 17:32:12 -03:00
Gabriel Calero
917cbd73b1
Don't show help on android. Hide menu bar
2018-02-09 17:32:12 -03:00
Gabriel Calero
0f07d0b493
Add bottom bar and address dialog (Android)
2018-02-09 17:32:12 -03:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
John Conklin II
5b63c0523d
Merge pull request #12375 from druiz17/lasers-64
...
RC64 - fix lasers going to origin
2018-02-09 11:11:07 -08:00
Dante Ruiz
b3a3d92131
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-02-09 10:31:43 -08:00
Bradley Austin Davis
7102cf44b8
Fixing merge errors
2018-02-09 10:30:57 -08:00
John Conklin II
858e3e987c
Merge pull request #12372 from zfox23/RC64_commerce_inspectionCertRedesign_v2
...
RC64: Commerce: Inspection Certificate Redesign (Fixed!)
2018-02-09 10:12:53 -08:00
Dante Ruiz
beb41495d5
save avatarUrl when setting new skeletonModelUrl
2018-02-09 09:35:24 -08:00
RebeccaStankus
736115b12d
fixed QLabel include
2018-02-09 09:30:25 -08:00
Seth Alves
6471780e21
allow overlay children to follow avatar from one domain to another
2018-02-08 17:43:08 -08:00
Dante Ruiz
2ae976d256
Merge pull request #10 from sethalves/laser-bug
...
allow overlay children to follow avatar from one domain to another
2018-02-08 17:20:18 -08:00
Seth Alves
5e16623c81
allow overlay children to follow avatar from one domain to another
2018-02-08 17:17:04 -08:00
Bradley Austin Davis
023ee35b2e
Merge remote-tracking branch 'upstream/master' into threaded_qml
2018-02-08 17:16:36 -08:00
Brad Hefta-Gaub
a6c8172990
Merge pull request #12370 from jherico/fix/deadlock_shaders
...
Prevent deadlock crashes when building shaders at startup
2018-02-08 14:44:46 -08:00
Brad Hefta-Gaub
5aeadf04cf
Merge pull request #12371 from highfidelity/stable
...
Merge stable back into master
2018-02-08 14:39:37 -08:00
John Conklin II
199321a5f2
Merge pull request #12373 from jherico/rc64_deadlocks
...
Deadlock fixes from master
2018-02-08 14:38:36 -08:00
RebeccaStankus
14839bc5f4
Some improvements to the log window
...
-Renamed button "Clear Filters" to "All Messages"
-Changed search result matching text to a more visible color
-Made Date/Time text more visible
-Added count of current messages in window
-Set window to show all messages with no filtering upon first opening
2018-02-08 11:26:02 -08:00
divya
97abdb63db
Merge pull request #12364 from jherico/fix/display_plugin_crash
...
Don't trigger a backtrace exception on quitting while in HMD
2018-02-08 11:18:19 -08:00
Bradley Austin Davis
7eecc47672
Prevent deadlock crashes when building shaders at startup
2018-02-08 11:12:51 -08:00
Bradley Austin Davis
d2f5645f96
Don't trigger a backtrace exception on quitting while in HMD
2018-02-08 11:12:28 -08:00
Bradley Austin Davis
725eb14163
Fix for deadlock triggering while loading QML engine
2018-02-08 11:12:10 -08:00
Zach Fox
ecc0a2f43b
Bugfix.
2018-02-08 10:41:22 -08:00
Zach Fox
704d4255a5
Comment change
2018-02-08 10:41:17 -08:00
Zach Fox
679d53e2cf
This works, but is it correct?
2018-02-08 10:41:10 -08:00
John Conklin II
d0cfdfb4ca
Merge pull request #12368 from jherico/fix/offscreen_deadlock
...
Fix for deadlock triggering while loading QML engine
2018-02-08 10:37:46 -08:00
Zach Fox
a92e614aff
Bugfix.
2018-02-08 10:35:34 -08:00
Bradley Austin Davis
8748e98b5e
Prevent deadlock crashes when building shaders at startup
2018-02-08 10:23:25 -08:00
Zach Fox
744f679b4e
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-08 09:51:35 -08:00
Bradley Austin Davis
77741c2851
Fix for deadlock triggering while loading QML engine
2018-02-07 16:43:15 -08:00
Zach Fox
f5e2e4f3d8
Comment change
2018-02-07 15:44:21 -08:00
Bradley Austin Davis
2c514b5d1b
Don't trigger a backtrace exception on quitting while in HMD
2018-02-07 15:28:04 -08:00
Zach Fox
7f0915f6ab
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_inspectionCertRedesign_v2
2018-02-07 15:14:33 -08:00
Zach Fox
e01e88d4ae
This works, but is it correct?
2018-02-07 15:13:22 -08:00
Seth Alves
a63393bc55
undo part of #12312
2018-02-07 14:50:59 -08:00
Seth Alves
fdbfeab3ea
Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto
2018-02-07 14:22:26 -08:00
Seth Alves
84f4453990
undo part of #12312
2018-02-07 13:32:30 -08:00
Seth Alves
3e913cfcfe
AvatarActionHold has positional and rotational targets
2018-02-07 10:45:13 -08:00
Brad Hefta-Gaub
0b6dea3d10
Merge pull request #12350 from ctrlaltdavid/21743
...
Fix the spectator camera
2018-02-06 19:55:02 -08:00
NissimHadar
5579eac034
Nothing...
2018-02-06 16:42:25 -08:00
NissimHadar
d5bf9cdbcd
Updated JSDoc comments.
2018-02-06 16:16:25 -08:00
samcake
72749e139a
changing the Increase LOD gap to 10 to start upping earlier
2018-02-06 16:00:49 -08:00
samcake
3ed633ebea
FIxing the get***LODIncreaseFPS functions evaluation of the threshold FPS for starting increasing LOD again
2018-02-06 15:52:32 -08:00
David Rowe
665bd6825f
Fix the spectator camera
2018-02-07 12:27:56 +13:00
Brad Davis
7d5502eb92
Migrating QML rendering off the main thread
2018-02-06 11:53:09 -08:00
NissimHadar
faec9a62b6
Changed "" to QString()
2018-02-06 11:01:50 -08:00
Olivier Prat
179aca2bf9
Shadow task now uses LOD culling from main view task
2018-02-06 11:47:39 +01:00
NissimHadar
cf87052b7f
Added option to select snapshot filename in scripts.
2018-02-05 17:29:00 -08:00
Dante Ruiz
e87067f93d
fix variable naming and edge case
2018-02-05 15:31:37 -08:00
Dante Ruiz
0c5c4679fb
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-02-05 14:25:54 -08:00
John Conklin II
9c1cb60a43
Merge pull request #12333 from ctrlaltdavid/fix-spectator-camera
...
Fix the spectator camera
2018-02-05 11:06:59 -08:00
Stephen Birarda
761321875c
Merge pull request #12195 from birarda/bug/connection-refused
...
clear silent connection attempt counter on DomainHandler soft reset
2018-02-05 11:35:02 -07:00
David Rowe
22b33c7391
Update Overlays circle3d JSDoc per recent code changes
2018-02-05 11:22:40 +13:00
David Rowe
615e54620b
Remove Menu.isInfoViewVisible() and closeInfoView() from JavaScript API
2018-02-04 15:38:33 +13:00
David Rowe
efddec621f
Remove Menu.addActionGroup() and removeActionGroup() from JavaScript API
2018-02-04 15:16:20 +13:00
David Rowe
42498314f1
Remove further unused variable noticed in passing
2018-02-04 14:59:06 +13:00
David Rowe
0c0734a255
Remove unused Overlays property, borderSize, and associated code
2018-02-04 14:54:14 +13:00
David Rowe
dd5cc8677d
Remove Overlays.findRayIntersectionVector() from JavaScript API
2018-02-04 14:46:49 +13:00
David Rowe
8e2a3e8c99
Remove Overlays.getOverlayObject() from JavaScript API
2018-02-04 14:15:48 +13:00
David Rowe
d842e532ee
Remove Window.customPrompt() from JavaScript API
2018-02-04 14:02:30 +13:00
David Rowe
3af7701cac
Fix the spectator camera
2018-02-04 12:06:20 +13:00
Olivier Prat
2940a67b3e
Merged with master
2018-02-03 16:55:25 +01:00
John Conklin II
c8bb26ae74
Merge pull request #12294 from samcake/pastel
...
Improve startup time by optimizing shader bookkeeping
2018-02-02 16:37:44 -08:00
Elisa Lupin-Jimenez
e2bf8ad231
reverted to S3 for model URL
2018-02-02 15:36:28 -08:00
Stephen Birarda
eb9d100fc8
reset count on conn refusal, soft reset DH in Interface on limit reached
2018-02-02 13:47:48 -08:00
Stephen Birarda
e16a3859c2
reset silent check in packet check on domain connection reset
2018-02-02 13:47:48 -08:00
Brad Davis
e3e45e16c1
Disable LOD adjustment on android
2018-02-02 13:46:08 -08:00
Dante Ruiz
d593e7107c
fix merge conflict
2018-02-02 13:29:31 -08:00
Atlante45
8ebb3e52d8
Misc bug fixes
2018-02-02 13:10:49 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a
snapshot referenced locally, won't work on OS
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
62437dcc22
drag and drop works
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
2ff47fa454
images auto-add to asset server, started asset browser add link
2018-02-02 10:27:42 -08:00
Seth Alves
861497e907
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-02 08:56:18 -08:00
Seth Alves
14d5029f4d
only update cauterization of child entities when something relevant changes
2018-02-02 08:56:11 -08:00
Olivier Prat
1f4671ba17
Cleaned up orthographic shadow culling functor
2018-02-02 11:09:28 +01:00
John Conklin II
cbdbf51ccd
Merge pull request #12317 from hyperlogic/feature/remove-ik-hips-offset
...
Removal of hips offset shifting from AnimInverseKinematics node
2018-02-01 15:30:08 -08:00
humbletim
06afaa7470
BufferView <-> QVariant/QScriptValue conversion
...
update MeshProxy/SimpleMeshProxy and ScriptableModel
ModelScriptingInterface / scriptable::ModelProvider
integration
update to RC-63
initial graphics-scripting refactoring
graphics-scripting baseline commit
wip commit
Geometry -> MeshPart
remove SimpleMeshProxy
collapse graphics-utils -> graphics-scripting
scriptable::Model => scriptable::ScriptableModel
2018-02-01 16:30:29 -05:00
Seth Alves
f7027b52e1
Merge pull request #12311 from ElderOrb/FB11511
...
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 12:11:30 -08:00
Seth Alves
bdf6736a54
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 12:04:56 -08:00
Liv
6363ded74b
Merge pull request #12280 from misslivirose/feat/expose-identity-verification
...
Expose functionality to enable entity scripts to check ownership verification on avatar entities
2018-02-01 10:07:58 -08:00
Seth Alves
482be7ba4e
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-02-01 06:36:04 -08:00
Sam Gateau
a650c5bbc6
Move a define to resume watchdog a bit further
2018-01-31 23:31:31 -08:00
Anthony J. Thibault
b23f98b311
Removal of hips offset shifting from AnimInverseKinematics node
...
With the addition of the hips IK target, the hips offset shifting code is no longer necessary.
This PR should not effect any behavior, but it removes this unused code from the animation system.
2018-01-31 17:56:33 -08:00
vladest
bca903a6df
Fix build
2018-01-31 23:31:18 +01:00
samcake
0885b00ab8
Merge branch 'master' of https://github.com/highfidelity/hifi into pastel
2018-01-31 14:18:38 -08:00
Alexander Ivash
1ed7d164c4
FB11511 - position of log windows should be persistent between invocations of interface
2018-02-01 01:15:03 +03:00
vladest
2a5b3d97fb
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-31 23:05:38 +01:00
Seth Alves
a49097789a
Revert "AddressBar trigger implemented. Fixed warnings on non existing contex…"
2018-01-31 13:32:19 -08:00
Seth Alves
acc5973813
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-31 12:22:50 -08:00
Seth Alves
0df4ae02fc
Merge pull request #12126 from vladest/addressbar_close_fix
...
AddressBar trigger implemented. Fixed warnings on non existing contex…
2018-01-31 11:26:05 -08:00
Seth Alves
50e6864988
Merge pull request #12138 from Triplelexx/21669_prompt_keyboard
...
WL#21669: Allow better keyboard navigation of prompt windows such as Window.prompt()
2018-01-31 11:19:49 -08:00
Seth Alves
64a46bf5df
merge from upstream
2018-01-31 10:43:41 -08:00
Bradley Austin Davis
b97c938544
Merge pull request #12216 from thoys/feat/js-script-console-auto-complete
...
JS scripting console auto-complete
2018-01-31 10:39:51 -08:00
samcake
062bfbd7b6
Merging with master
2018-01-30 18:33:34 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
Sam Gateau
9ea6c78ac2
fix stupid copy paste
2018-01-30 15:31:34 -08:00
John Conklin II
215d03c4ce
Merge pull request #12269 from sethalves/backtrace-for-rc-63
...
Backtrace for rc 63
2018-01-30 15:13:01 -08:00
John Conklin II
0b03632437
Merge pull request #12289 from hyperlogic/bug-fix/mac-os-shader-compile-too-slow-rc63
...
RC63: 8x shader compilation optimization and watchdog disable
2018-01-30 13:26:49 -08:00
samcake
2dcedf9f39
cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation
2018-01-30 12:52:05 -08:00
Atlante45
019a2d346c
Fix spaces
2018-01-30 12:04:01 -08:00
Atlante45
db08f1dda6
Move backtrace to interface
2018-01-30 11:39:48 -08:00
Anthony Thibault
1e8a5485c1
8x shader compilation optimization and watchdog disable
...
addPlumberPipeline in RenderPipelines.cpp would recompile
a single program 7 more times then necessary. This was
causing startup times on Mac OS X to trigger the deadlock
watchdog.
Even with this fix, compiling shaders is still too slow,
As a workaround, we disable the watchdog thread during
rendering pipeline setup.
2018-01-30 10:27:06 -08:00
Gabriel Calero
a5a36b4b8f
Don't show help on android. Hide menu bar
2018-01-30 14:48:37 -03:00
Gabriel Calero
07a542e35d
Add bottom bar and address dialog (Android)
2018-01-30 14:48:37 -03:00
Seth Alves
7d1eb5fef8
Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63
2018-01-30 09:13:02 -08:00
Liv Erickson
8b7c989508
move emit signals to wallet interface
2018-01-29 16:34:44 -08:00
Liv Erickson
ce8159340b
fix vs autoformatting
2018-01-29 15:51:09 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes
...
Leopoly_Phase1_004_RayPick-Changes
2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark
...
Bookmark avatar entities
2018-01-29 12:55:35 -08:00
Liv Erickson
634bc83ed5
fix elses
2018-01-29 12:54:52 -08:00
Liv Erickson
f8f76d6757
changing back to avatar only and making some changes to avoid multiple calls to dependency manager
2018-01-29 12:46:00 -08:00
Seth Alves
98e0e663e7
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-29 12:36:37 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan
...
print warnings if head position contains not-a-number
2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4
Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information
2018-01-29 12:20:51 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request
...
Leopoly_Phase1_003_Asset-Request
2018-01-29 11:40:41 -08:00
Liv Erickson
6a971e1362
remove restriction to be avatar only
2018-01-29 11:27:30 -08:00
Dante Ruiz
a637bac2fe
remove debug statement
2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-29 11:25:26 -08:00
Liv Erickson
a10f7932bd
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/expose-identity-verification
2018-01-29 11:07:38 -08:00
Liv Erickson
0e3a01f1e8
it's working! removed my null pointer and just get it from the dependency manager when required
2018-01-29 10:20:16 -08:00
Andrew Meadows
c2817fc091
HMD low LOD threshold changed: 42 --> 34
2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92
HMD low LOD threshold changed: 45 --> 42
2018-01-29 10:05:23 -08:00
samcake
8dfa3aace3
cleaning en route
2018-01-26 17:34:37 -08:00
Liv Erickson
20635acf27
moving logic to wallet, crashes currently
2018-01-26 17:13:39 -08:00
humbletim
e2afcac534
include .extraInfo as part of RayPick API constructors
2018-01-26 18:34:13 -05:00
Seth Alves
b7303414f2
unmangle merges
2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce
fix merge/cherry-pick error
2018-01-26 10:45:18 -08:00
Seth Alves
3be42fe79a
Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan
2018-01-26 10:36:26 -08:00
Seth Alves
17ec79f182
add breaks in case statements that used to have returns
2018-01-26 10:36:16 -08:00
Seth Alves
b8f3d8140d
add breaks in case statements that used to have returns
2018-01-26 10:34:43 -08:00
Seth Alves
2962c8979c
print warnings if head position contains not-a-number
2018-01-26 09:49:21 -08:00
Seth Alves
dbe9fd290e
comment out code that would set annotations after StartHandler is called
2018-01-26 09:23:29 -08:00
Seth Alves
c550620cb4
backtrace for rc-63
2018-01-26 09:23:24 -08:00
Atlante45
df62ba88cb
Fix rebase error
2018-01-26 09:22:37 -08:00
Seth Alves
9eb10c09da
oops
2018-01-26 09:22:33 -08:00
Seth Alves
e32089d3dd
only start crash hanlder if UserActivityLogger::isEnabled() is true
2018-01-26 09:22:22 -08:00
Atlante45
39f26e35f0
backtrace for rc-63
2018-01-26 09:22:14 -08:00
Seth Alves
6c04431636
call startCrashhandler from interface
2018-01-26 09:20:29 -08:00
Seth Alves
47f44eb21f
extirpate bugsplat
2018-01-26 09:20:23 -08:00
Thijs Wenker
08b712281f
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
2018-01-26 18:10:47 +01:00
Olivier Prat
1aa41918d0
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
2018-01-26 15:01:30 +01:00
Sam Gateau
51dac04374
Introducing the tag in lieu of the vsisiblity mask
2018-01-26 02:59:43 -08:00
Sam Gateau
23b99f04cd
Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch
2018-01-25 18:33:37 -08:00
samcake
2f4e61888f
Making it work maybe
2018-01-25 16:57:35 -08:00
Seth Alves
b6f7d2eb89
print warnings if head position contains not-a-number
2018-01-25 15:15:59 -08:00
Liv Erickson
3a6f184278
make clear function is for avatar entities only, add error handling in non-client entity cases
2018-01-25 15:13:14 -08:00
Liv Erickson
7e5684c439
use signals
2018-01-25 15:04:12 -08:00
Brad Davis
361b767586
Merge branch 'fix/render_config' into android
2018-01-25 14:50:41 -08:00
Thijs Wenker
45487a1e45
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
...
# Conflicts:
# interface/CMakeLists.txt
2018-01-25 22:51:35 +01:00
Thijs Wenker
179c21acf4
jsdoc info on selected auto-complete entry
2018-01-25 22:46:30 +01:00
Brad Davis
ab4e2d99f1
Don't try to set the current directory to a QRC path
2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51
Fix help screen URL
2018-01-25 13:04:08 -08:00
Brad Davis
ac94327ec7
Fix loading of the context overlay information icon
2018-01-25 12:44:55 -08:00
Liv Erickson
7ee5608992
initial first pass of exposing headless verification
2018-01-25 12:02:26 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription
...
some settings cleanup
2018-01-25 11:30:14 -08:00
ZappoMan
cb01bd14b9
Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription
2018-01-25 10:39:43 -08:00
John Conklin II
e081808ace
Merge pull request #12235 from luiscuenca/assetBrowserFix
...
RC63 Fix Edit/Asset Browser in HMD mode
2018-01-25 09:38:23 -08:00
Olivier Prat
5af4337b0e
Merged with master
2018-01-25 10:11:53 +01:00
Olivier Prat
f3aac2a7b5
Merged with samcake/black
2018-01-25 09:27:48 +01:00
samcake
ae6a95ec0d
fixing my bugs on vissibility
2018-01-24 18:07:35 -08:00
Zach Fox
94e1c425ab
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
2018-01-24 17:03:16 -08:00
John Conklin II
1529fea983
Revert "Display both lasers on tablet and Web surfaces"
...
(cherry picked from commit 455090d2b9
2018-01-24 14:51:42 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp
...
Fix Interface first launch should show help
2018-01-24 12:11:34 -08:00
Dante Ruiz
2cbcc28bd4
only call init animGraph once
2018-01-24 10:44:04 -08:00
samcake
38242072e5
Merge branch 'cauterize-head-av-entities-1' of https://github.com/sethalves/hifi into seth-branch
2018-01-23 16:30:54 -08:00
Seth Alves
1cbc2e31cf
merge from upstream
2018-01-23 15:21:03 -08:00
Dante Ruiz
071f7d54d9
Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update
2018-01-23 14:44:26 -08:00
Dante Ruiz
6a03557801
don't override sensorToWorldMatrix
2018-01-23 14:44:10 -08:00
humbletim
65455e7b50
Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes
2018-01-23 14:57:33 -05:00
Brad Davis
5bf2bda96d
Merge branch 'android' into android_new
2018-01-23 08:17:46 -08:00
luiscuenca
3c12ae8925
Fix Edit/Asset Browser in HMD mode
2018-01-22 20:52:18 -07:00
luiscuenca
6d6950deca
Fix Interface first launch should show help
2018-01-22 16:25:58 -07:00
Brad Davis
6a91d549ce
Fix stylus overlay
2018-01-22 15:08:26 -08:00
Brad Davis
8ae0b09ea2
Merge remote-tracking branch 'upstream/master' into android
2018-01-22 15:07:30 -08:00
Thijs Wenker
e8955fcd32
Merge branch 'master' of github.com:highfidelity/hifi into feat/js-script-console-auto-complete
2018-01-22 23:37:24 +01:00
Sam Gondelman
bdef05a326
Merge pull request #12221 from highfidelity/revert-12203-21703
...
Revert "Display both lasers on tablet and Web surfaces"
2018-01-22 12:27:00 -08:00
John Conklin II
4697c5f92c
Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar
...
Fix for avatars with crooked spine/head when exiting HMD mode
2018-01-22 11:50:44 -08:00
John Conklin II
22ee57db74
Merge pull request #12214 from 1st-BrainStormer/master
...
Fix lockup when no midi devices present.
2018-01-22 11:25:46 -08:00
Thijs Wenker
f4e6606c8d
fix MyAvatar JS API typo
2018-01-22 19:01:13 +01:00
Seth Alves
f6b4cf4c60
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-22 07:13:41 -08:00
Sam Gateau
d38d13cbb9
Trying to address the overlays to not be visisble in 2nd camera
2018-01-21 23:47:45 -08:00
ZappoMan
4ad5d34a10
more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel
2018-01-20 17:20:42 -08:00
Bruce Brown
f7caba5295
de-bounce Midi::USBchanged signal.
...
Debounced USBchanged signal to prevent pauses.
2018-01-20 11:17:47 -08:00
ZappoMan
ab9041bcab
remove LOAD DEFAULT SCRIPTS from General Preferences, since it already exists on Running Scripts
2018-01-20 00:14:44 -08:00
ZappoMan
027a1e69f4
some settings cleanup, adding description to Send Data
2018-01-20 00:08:06 -08:00
Anthony J. Thibault
cd4d9255bd
Added defaultPoseFlags to avatar protocol
...
Change rotationSet to rotationIsDefaultPose for JointData
Also for translation. Fixed all code to flip boolean value.
Created EntityJointData so that the ModelEntity stuff doesn't need to change.
2018-01-19 15:34:27 -08:00
John Conklin II
455090d2b9
Revert "Display both lasers on tablet and Web surfaces"
2018-01-19 15:15:52 -08:00
John Conklin II
db5bf68431
Merge pull request #12203 from ctrlaltdavid/21703
...
Display both lasers on tablet and Web surfaces
2018-01-19 15:15:44 -08:00
Brad Davis
3e7872637d
Merge branch 'android' into android_new
2018-01-19 14:40:01 -08:00
Brad Davis
d53b8b38ac
Merge remote-tracking branch 'upstream/master' into android
2018-01-19 14:35:20 -08:00
Brad Davis
686393d62f
Load built-in resources earlier
2018-01-19 14:35:04 -08:00
Seth Alves
9be2c67f00
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 11:46:34 -08:00
Zach Fox
9d6e62d6bf
Merge pull request #12163 from ElderOrb/FB11109
...
FB11109 Preview disabled image swap (Commerce only)
2018-01-19 11:40:05 -08:00
Dante Ruiz
c71fa110db
update file dates and remove debug state
2018-01-19 11:31:13 -08:00
Dante Ruiz
139266fe80
remove unneeded code
2018-01-19 11:24:06 -08:00
Ryan Downe Karpf
f1b18ccc00
Merge pull request #12184 from ctrlaltdavid/21700
...
Add Window browseChanged signal as replacement for openFileChanged
2018-01-19 10:45:27 -08:00
Thijs Wenker
a31fe7546a
- remove debug
...
- fix API export JSON filename
- fix warnings
2018-01-19 19:45:25 +01:00
Brad Davis
3dba928b72
Merge remote-tracking branch 'upstream/android' into android_new
2018-01-19 10:36:46 -08:00
Thijs Wenker
0f7f58417b
JS scripting console auto-complete
2018-01-19 19:11:12 +01:00
Seth Alves
bce9b5f459
Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1
2018-01-19 09:53:54 -08:00
Seth Alves
6aa389cad0
trying to now show overlays in mirrors
2018-01-19 09:53:41 -08:00
David Rowe
fb684909ce
Merge branch 'master' into 21703
2018-01-19 17:25:12 +13:00
David Rowe
e0e6fc711b
Replace Pointers API function setNonHoverItems() with setDoesHover()
2018-01-19 16:05:09 +13:00
humbletim
dfb1619dc6
CR feedback; using namespace AssetUtils => inline AssetUtils::
2018-01-18 21:49:53 -05:00
Brad Davis
bdfa1273ba
Merge remote-tracking branch 'upstream/master' into android
2018-01-18 17:33:10 -08:00
David Kelly
2e4fc5e58c
Merge pull request #12207 from davidkelly/dk/placesInHfcTransferHistory
...
nearby hfc transfers should send the location
2018-01-18 16:46:34 -08:00
David Kelly
844ec6a863
eliminate dash in history, replace with 0 HFC
2018-01-18 16:02:40 -08:00
Clément Brisset
37504eca15
Merge pull request #12186 from ctrlaltdavid/21702
...
Add Window.protocolSignature() as a replacement for location.protocolVersion()
2018-01-18 15:20:03 -08:00
Brad Hefta-Gaub
f3dfad6c59
Merge pull request #12155 from ctrlaltdavid/21689
...
Remove unused "anchor" Overlays property
2018-01-18 15:04:41 -08:00
Sam Gateau
aec99db4fc
Merge pull request #12157 from AndrewMeadows/lod-debug-ui
...
add scripted/qml debug UI for render LOD
2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub
c9cedcb2c0
Merge pull request #12183 from SamGondelman/pointerCrash
...
Destroy PointerManager before PickManager
2018-01-18 14:58:20 -08:00
David Kelly
21cc6ee8dd
fix marketplace txn display (memo only)
2018-01-18 14:28:25 -08:00
Seth Alves
31c007d167
more backwards logic, added withViewVisibilityMask call in ItemKey
2018-01-18 14:15:30 -08:00
Seth Alves
7c32d3c536
flip logic back around
2018-01-18 13:49:17 -08:00
David Kelly
2b7576cef5
Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory
2018-01-18 13:00:07 -08:00
David Kelly
9a523ead31
fix link
2018-01-18 12:44:45 -08:00
Alexander Ivash
a74b093b60
FB11109 Preview disabled image swap (Commerce only)
2018-01-18 23:26:43 +03:00
David Rowe
8c2427dd58
Rename Window.protocolVersion() to Window.protocolSignature()
2018-01-19 09:06:16 +13:00
David Kelly
2cdbc1159e
nearby hfc transfers should send the location too
2018-01-18 11:15:32 -08:00
Seth Alves
fb974b0b9c
attempt to straighten out use of view-visibility masks
2018-01-18 10:09:23 -08:00
Brad Davis
d3c4b0ef45
Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new
2018-01-18 10:04:03 -08:00
Anthony J. Thibault
c5efcf5d6a
Bug fix for cocked head after playing an input recording.
...
I thought this was the cause of the Manuscript case 11454 but apparently not.
2018-01-18 09:21:15 -08:00
Andrew Meadows
2c43138e14
slightly faster auto LOD adjust
2018-01-18 08:53:45 -08:00
Andrew Meadows
80c43bd0f7
fix typo in variable name
2018-01-18 08:53:45 -08:00
Andrew Meadows
9a1a10b4e1
remove cruft and use more correct names
2018-01-18 08:53:45 -08:00
Andrew Meadows
82cab5e4a1
add scripted/qml debug UI for render LOD
2018-01-18 08:53:45 -08:00
Seth Alves
d897b1c1eb
Merge branch 'visible-perview' of github.com:samcake/hifi into cauterize-head-av-entities-1
2018-01-18 07:02:20 -08:00
Seth Alves
76ef3d7c7d
pull from upstream
2018-01-18 07:01:50 -08:00
Sam Gateau
7a9740d258
visible-perview
2018-01-18 02:18:46 -08:00
Brad Davis
cbb2d9d854
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 17:51:39 -08:00
David Kelly
c661bec8fd
whitespace
2018-01-17 17:15:14 -08:00
David Rowe
ee2936d133
Add Pointers API function that disables hover events for nominated items
2018-01-18 14:07:07 +13:00
David Kelly
1dde25e38f
Don't make links in txn history for highfidelity and marketplace
2018-01-17 16:51:38 -08:00
Zach Fox
5ce768f402
Merge pull request #12151 from zfox23/commerce_sendMoney1
...
Commerce: P2P Transfer Iteration 1
2018-01-17 16:41:56 -08:00
Dante Ruiz
eadd3b48bd
bookmark avatar-entities-done
2018-01-17 15:42:07 -08:00
Zach Fox
16d51986a9
Make the call to receiveAt more robust
2018-01-17 15:11:58 -08:00
Dante Ruiz
8f22c719b3
Merge pull request #12099 from sethalves/run
...
allow avatar walk-speed to be set from javascript
2018-01-17 13:53:13 -08:00
Seth Alves
7af90d5429
Merge pull request #12171 from mnafees/21671
...
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
2018-01-17 13:42:47 -08:00
Seth Alves
33c586de60
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor
...
Remove dangerous "Use Anim Pre and Post Rotations" menu item
2018-01-17 13:41:51 -08:00
Zach Fox
1d747bc0e4
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-17 11:56:00 -08:00
Bradley Austin Davis
9f6c2c3cdd
Merge remote-tracking branch 'upstream/master' into android
2018-01-17 11:44:00 -08:00
Dante Ruiz
3ba0eaa13d
fix typo
2018-01-17 11:05:55 -08:00
Dante Ruiz
ebb09f4271
Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark
2018-01-17 11:04:46 -08:00
Dante Ruiz
3abb3d6fcc
trying to add offset
2018-01-17 11:04:32 -08:00
David Back
92c0fd4877
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
...
Merge Account & GlobalServices follow-up
2018-01-17 10:50:54 -08:00
Gabriel Calero
970ca5e08f
Add virtual pad for android
2018-01-17 15:00:43 -03:00
Seth Alves
1e847cf32e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 08:08:13 -08:00
Seth Alves
69a33428c0
Merge pull request #12078 from druiz17/soft-entities
...
Soft Entities
2018-01-17 08:02:37 -08:00
Seth Alves
d3084dc0df
defang
2018-01-17 07:11:27 -08:00
Seth Alves
bfccb52b7a
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-17 07:02:14 -08:00
Brad Davis
6a06bf405a
Merge remote-tracking branch 'upstream/master' into android
2018-01-16 18:24:44 -08:00
Sam Gateau
d4571bd86a
Merge pull request #12181 from humbletim/rename-model-graphics
...
Rename libraries/model -> libraries/graphics
2018-01-16 18:12:25 -08:00
Anthony J. Thibault
51ea2632c0
Remove Avatar UseAnimPreAndPostRotations option.
...
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
2018-01-16 17:27:19 -08:00
Dante Ruiz
92a259fd63
fix setting correct joint index
2018-01-16 16:41:06 -08:00
Zach Fox
e700ff91d0
Remove warning
2018-01-16 15:58:17 -08:00
Dante Ruiz
7707e68234
bookmarks add back avatar-entities
2018-01-16 15:37:03 -08:00
Zach Fox
8cc427a374
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 15:07:53 -08:00
David Rowe
2883e24285
Add Window.protocolVersion() as a replacement for location's
2018-01-17 12:00:35 +13:00
David Kelly
929760c226
fix time display
2018-01-16 14:52:26 -08:00
Bradley Austin Davis
b4223215ef
Use old style resources on OSX for now
2018-01-16 14:44:05 -08:00
Seth Alves
511f94a4fc
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-16 14:01:54 -08:00
Zach Fox
d64b35729f
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
2018-01-16 13:44:29 -08:00
David Rowe
85bda1da8e
Add Window browseChanged signal as replacement for openFileChanged
2018-01-17 09:57:20 +13:00
David Kelly
d8f8f9ff1a
First cut at alan's new design
2018-01-16 11:19:10 -08:00
Clément Brisset
1949471dad
Merge pull request #12182 from highfidelity/stable
...
Merge stable (RC62) to master
2018-01-16 11:01:07 -08:00
SamGondelman
c3eb4b5ecd
destroy pointermanager before pickmanager
2018-01-16 10:31:42 -08:00
Mohammed Nafees
885801c5ca
Fix copying to clipboard from JS scripts
2018-01-16 13:17:47 -05:00
humbletim
b91d536dd0
rename model:: -> graphics::
2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
2018-01-16 12:44:44 -05:00
Seth Alves
12db51728e
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-16 07:50:55 -08:00
Dante Ruiz
69389116f5
add menu option for AvatarEntitiesBookmarks
2018-01-15 16:47:48 -08:00
MiladNazeri
c7cdf6b8f6
Merge pull request #12145 from ctrlaltdavid/21684
...
Update Window JSDoc per recent API changes
2018-01-15 14:50:40 -08:00
Seth Alves
06dd680dc9
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-15 13:48:10 -08:00
Brad Davis
d10d7026c5
Force Qt to use ANGLE when in GLES mode on Windows
2018-01-15 13:42:41 -08:00
Dante Ruiz
645f608814
fixing merge conflict
2018-01-15 10:45:51 -08:00
John Conklin II
c3648fb04c
Merge pull request #12168 from druiz17/RC62
...
fix Asset browser for tablet (RC62)
2018-01-15 10:16:56 -08:00
Zach Fox
f7ed8c10fa
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-15 10:13:07 -08:00
Brad Davis
58530c595a
Pre-merge cleanup
2018-01-14 19:48:12 -08:00
Seth Alves
a7d658c857
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-14 12:34:31 -08:00
Brad Davis
55bfdc105b
Switch android to GLAD
2018-01-14 10:22:18 -08:00
Brad Davis
acb95d1355
GLAD polish
2018-01-14 00:10:05 -08:00
Brad Davis
24b83aa0f1
Merge remote-tracking branch 'sam/android-gles' into windows_gles
2018-01-13 11:36:31 -08:00
Brad Davis
17899d5e07
Don't create share context for web while running nsight
2018-01-13 11:32:23 -08:00
Sam Gateau
df0660f823
Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles
2018-01-13 01:00:41 -08:00
Sam Gateau
331a8f3094
fixing the stencil not clearing correctly and shaders not compiled correctly in main thread
2018-01-13 01:00:10 -08:00
Brad Davis
ab7aa52a10
GLES emulaton on windows
2018-01-12 19:17:35 -08:00
Dante Ruiz
8e4bd2d662
fix asset browser for tablet
2018-01-12 17:11:02 -08:00
Dante Ruiz
a48304b104
fix Asset browser for tablet
2018-01-12 17:06:07 -08:00
Zach Fox
e627925bd3
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 15:14:42 -08:00
David Kelly
6cedc016c4
Adding sender/recipient to transaction history for hfc transfers
2018-01-12 16:08:52 -07:00
David Kelly
579a4d85b3
Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory
2018-01-12 14:37:46 -07:00
Zach Fox
6920e57613
Fix 'Browse Avatars' button from Avatar Settings
2018-01-12 13:31:58 -08:00
Dante Ruiz
5b82c7bc41
fix merge conflict
2018-01-12 11:00:19 -08:00
Brad Davis
7579451c24
Merge remote-tracking branch 'upstream/master' into android
2018-01-11 23:31:45 -08:00
Brad Davis
22d133c71f
Allow GLES client on desktop builds
2018-01-11 23:31:34 -08:00
Seth Alves
e7a3d98ae5
don't draw head-descendent entities when in 1st-person camera mode
2018-01-11 19:34:54 -08:00
Dante Ruiz
96a97b5938
added model transform override
2018-01-11 16:41:45 -08:00
David Rowe
5dca387055
Remove old, unused overlay panel code
2018-01-12 12:47:22 +13:00
David Rowe
9b0fb19cfa
Remove unused "anchor" Overlays property
2018-01-12 12:16:58 +13:00
howard-stearns
2987d21f66
remove some more
2018-01-11 13:15:34 -08:00
Zach Fox
81ab5ac81c
hfc_key -> public_key
2018-01-11 12:50:25 -08:00
Zach Fox
d25ef074e1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-11 12:35:18 -08:00
howard-stearns
c39771d995
do not delete wallet file when things go wrong, and remove obsolete
...
reset machinery
2018-01-11 11:50:23 -08:00
Seth Alves
c09f644612
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-11 09:09:11 -08:00
Sam Gateau
9bc02ec564
simple changes to try debugging the stereo rendering
2018-01-10 21:01:26 -08:00
David Rowe
a543d90090
Miscellaneous fixes
2018-01-11 15:53:45 +13:00
David Rowe
7ba42f0e76
Update JSDoc per recent changes in Window API
2018-01-11 15:52:56 +13:00
Seth Alves
568c27d6e0
Merge pull request #12039 from luiscuenca/currentAPI
...
Fix and improve currentAPI.js
2018-01-10 17:55:08 -08:00
Seth Alves
aefd294bf2
Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera
...
Improve stability for HMD third person avatars
2018-01-10 17:46:47 -08:00
Brad Davis
560fd38547
Merge remote-tracking branch 'upstream/master' into android
2018-01-10 17:31:50 -08:00
Andrew Meadows
b3fcca8446
Merge pull request #12132 from hyperlogic/bug-fix/prevent-hands-from-entering-body
...
Bug fix to prevent wrists entering the avatar's torso.
2018-01-10 17:22:50 -08:00
Brad Davis
97593bc4d8
Fixing compiled resource access
2018-01-10 17:18:12 -08:00
MiladNazeri
301731554f
Merge pull request #12102 from cain-kilgore/21664
...
WL 21664 - Window.innerHeight should not include the menu bar
2018-01-10 17:10:14 -08:00
Zach Fox
939012a2d0
Hook up the endpoints!
2018-01-10 17:10:05 -08:00
Zach Fox
c15b1669b1
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 15:53:23 -08:00
Triplelexx
24f1fc3546
fix Ui keyboard navigation
...
various fixes to allow some support for keyboard navigation in message boxes and dialogs
2018-01-10 22:30:43 +00:00
Seth Alves
ddc730f49f
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-10 13:49:07 -08:00
Brad Davis
2c35242af1
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-10 13:40:12 -08:00
Brad Davis
7a7aee770c
Switching to binary resources
2018-01-10 13:39:56 -08:00
MiladNazeri
b73106fa7e
Merge pull request #12120 from cain-kilgore/21666
...
WL 21666 - Window.domainChanged() isn't emitted if domain isn't running
2018-01-10 12:30:21 -08:00
Cain Kilgore
b26e31a362
Copy paste? Never!
2018-01-10 20:27:19 +00:00
MiladNazeri
2220b976dc
Merge pull request #12130 from cain-kilgore/21665
...
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 12:06:58 -08:00
Anthony J. Thibault
250e4032b0
Bug fix to prevent wrists entering the avatar's torso.
...
This was inadvertently disabled in PR #11978 .
(cherry picked from commit ae997928c1
2018-01-10 12:04:50 -08:00
MiladNazeri
bf61d8c7b3
Merge pull request #12115 from ctrlaltdavid/deprecations
...
Update JSDoc with some deprecations
2018-01-10 12:04:21 -08:00
Anthony J. Thibault
ae997928c1
Bug fix to prevent wrists entering the avatar's torso.
...
This was inadvertently disabled in PR #11978 .
2018-01-10 11:51:44 -08:00
Anthony J. Thibault
220b7f5e55
Merge branch 'master' into bug-fix/better-third-person-camera
2018-01-10 10:14:09 -08:00
Dante Ruiz
d0bff29471
fixing merge conflict
2018-01-10 10:11:53 -08:00
Zach Fox
e5abdc77d9
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
2018-01-10 10:02:56 -08:00
Andrew Meadows
7060cd9a90
Merge pull request #12122 from druiz17/fix-double-set-tablet-root
...
don't call setQmlTabletRoot twice
2018-01-10 09:53:09 -08:00
Sam Gateau
d4dc1e352f
Merge pull request #12124 from AndrewMeadows/no-misc-stats
...
more context for update performance stats
2018-01-10 09:10:26 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta
...
Model meta render item is only withTypeShape if visual geometry request fails
2018-01-10 09:09:19 -08:00
Seth Alves
3816c732c0
Merge branch 'run' of github.com:sethalves/hifi into run
2018-01-10 08:11:55 -08:00
Seth Alves
8cf94547e4
Merge branch 'master' of github.com:highfidelity/hifi into run
2018-01-10 08:11:46 -08:00
Cain Kilgore
330b266ca8
Merge branch 'master' of https://github.com/highfidelity/hifi into 21665
2018-01-10 11:33:06 +00:00
Cain Kilgore
38afc5a25b
WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal
2018-01-10 11:31:46 +00:00
Brad Davis
b1e95681a9
Cleanup android
2018-01-09 23:30:31 -08:00
Brad Davis
fb59a0a56f
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 20:02:55 -08:00
Brad Davis
105dffebaf
Fixing UI
2018-01-09 18:36:42 -08:00
Zach Fox
928e3d2ef7
Merge pull request #12108 from zfox23/commerce_pagination
...
Commerce: Support pagination at History endpoint; improve Purchases scrolling
2018-01-09 15:57:34 -08:00
Dante Ruiz
c4253f3b3b
Merge branch 'master' of github.com:highfidelity/hifi into soft-entities
2018-01-09 15:31:38 -08:00
vladest
075bcba49f
AddressBar trigger implemented. Fixed warnings on non existing context properties. Fixed warnings about non notifyable property
2018-01-09 23:48:40 +01:00
Zach Fox
edf25c3e4e
Remove code duplication...
2018-01-09 14:14:54 -08:00
Zach Fox
a6259a5ef5
Initial progress
2018-01-09 13:39:28 -08:00
Andrew Meadows
8c6edc749a
provide more context for update perf stats
2018-01-09 12:59:32 -08:00
SamGondelman
7c56a9ffb2
model meta is only withTypeShape if visual geometry request fails
2018-01-09 12:43:43 -08:00
Zach Fox
d31dec7acb
Fix unix build errors
2018-01-09 12:41:56 -08:00
John Conklin II
b1790cccbe
Merge pull request #12113 from druiz17/fix-double-set-tablet-root
...
Don't call setQmlTabletRoot twice for Web3dOverlays RC62
2018-01-09 12:25:00 -08:00
Brad Davis
d6dd29b952
Merge remote-tracking branch 'upstream/master' into android_nov
2018-01-09 11:43:03 -08:00
Brad Davis
bd5af2b493
Working on android avatar rendering
2018-01-09 11:40:32 -08:00
Zach Fox
360a7cc4c6
CR feedback
2018-01-09 11:08:18 -08:00
Anthony J. Thibault
e28f13c1db
Merge branch 'master' into bug-fix/better-third-person-camera
2018-01-09 10:34:04 -08:00
