Gabriel
|
32419127a1
|
Delete hand.svg
|
2018-06-29 14:08:13 -03:00 |
|
Gabriel
|
8af91ca0d4
|
Delete Cairo-SemiBold.ttf
|
2018-06-29 14:07:48 -03:00 |
|
sabrina-shanman
|
c849d8e2a8
|
Merge branch 'mac-shutdown-crash-on-present' into fix-osx-crash-on-exit
|
2018-06-29 09:37:54 -07:00 |
|
Sam Gateau
|
d543cd0766
|
Fixing a bug if the last session display pluginis an invalid name, resolve to default
|
2018-06-29 15:42:19 +02:00 |
|
amantley
|
15a17ae32a
|
finished the step detection, need to finish the failsafe
|
2018-06-28 18:36:13 -07:00 |
|
Gabriel Calero
|
2112af4400
|
Apply desing to android web entities and overlays
|
2018-06-28 17:46:33 -03:00 |
|
John Conklin II
|
0a0e1668d5
|
Merge pull request #13478 from amantley/glowingOrbMaster
The client should render "something" for an avatar even if mesh or identity is not available
|
2018-06-28 12:12:16 -07:00 |
|
amantley
|
3e6d54e83c
|
added all the parts for the step conditional to do: failsafe
|
2018-06-28 11:56:46 -07:00 |
|
Thijs Wenker
|
8ade709c1f
|
Merge branch 'feat/create/interactive-window' into feat/create/native-windows
|
2018-06-28 19:14:46 +02:00 |
|
Thijs Wenker
|
7fe9365a76
|
create app - native windows
|
2018-06-28 19:12:03 +02:00 |
|
Thijs Wenker
|
5029767493
|
InteractiveWindow scripting API
|
2018-06-28 19:04:08 +02:00 |
|
John Conklin II
|
040978830a
|
Merge pull request #13413 from Atlante45/fix/audio-starve
Fix audio device sometimes being on the wrong thread
|
2018-06-28 09:59:00 -07:00 |
|
John Conklin II
|
b07d317f4c
|
Merge pull request #13488 from hyperlogic/bug-fix/qstring-from-script-engine
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
|
2018-06-28 09:56:51 -07:00 |
|
John Conklin II
|
af13196d3f
|
Merge pull request #13489 from r3tk0n/mouse_menu
Re-added mouse sensitivity settings to General Preferences dialog.
|
2018-06-28 09:43:55 -07:00 |
|
John Conklin II
|
138342ba91
|
Merge pull request #13485 from zfox23/MS16257_clearOverlay
Implement MS16257: Remove 'clear overlay when moving' setting and code
|
2018-06-28 09:31:04 -07:00 |
|
Sam Gondelman
|
736c56f5f4
|
Merge pull request #13487 from gcalero/single_account_manager_android
Remove the duplicated AccountManager used for android
|
2018-06-28 09:07:23 -07:00 |
|
Angus Antley
|
2307c8e24a
|
more work on the mode threshold
|
2018-06-28 15:40:42 +01:00 |
|
amantley
|
621ca7d2b4
|
more work on the mode function
|
2018-06-27 18:46:24 -07:00 |
|
amantley
|
61a935dbb5
|
added the first pass at mode computation
|
2018-06-27 18:02:11 -07:00 |
|
r3tk0n
|
f36ba49fbd
|
Update TabletGeneralPreferences.qml
Fixed a typo
|
2018-06-27 16:30:38 -07:00 |
|
r3tk0n
|
d6684e5ef7
|
Re-add mouse sensitivity option to tablet.
|
2018-06-27 16:23:40 -07:00 |
|
r3tk0n
|
c80ab0d237
|
Re-added mouse sensitivity settings to General Preferences dialog.
|
2018-06-27 16:10:07 -07:00 |
|
Anthony J. Thibault
|
70a3c9ce3c
|
Fix for heap-corruption in Settings::saveAll due to implicitly shared QStrings
Using gflags on windows and enabling full page heap verification, I was able to detect this as a source of
memory corruption.
https://docs.microsoft.com/en-us/windows-hardware/drivers/debugger/enable-page-heap
Running interface with pageheap before and after, this change leads me to believe that this is a source of
some of our heap-corruption crashes on backtrace.
Specifically these 19 crashes in the last month, and possibly more.
https://highfidelity.sp.backtrace.io/dashboard/highfidelity/project/Interface/query-builder?qb=%7B%22mode%22%3A%22aggregate%22%2C%22sorting%22%3A%7B%22aggFactor%22%3A%22count%22%2C%22aggSortOrder%22%3A%22descending%22%2C%22selectFactor%22%3A%22timestamp%22%2C%22selectSortOrder%22%3A%22descending%22%2C%22sortedColumnNames%22%3A%5B%5D%7D%2C%22dateTimePicker%22%3A%7B%22granularity%22%3A%221M%22%2C%22start%22%3A%222018-05-27T07%3A00%3A00.000Z%22%2C%22end%22%3A%222018-06-27T23%3A05%3A29.399Z%22%7D%7D&qn=&query=%7B%22filter%22%3A%5B%7B%22callstack%22%3A%5B%5B%22contains%22%2C%22saveAll%22%5D%5D%2C%22timestamp%22%3A%5B%5B%22at-least%22%2C1527404400%5D%2C%5B%22at-most%22%2C1530140729%5D%5D%7D%5D%2C%22fold%22%3A%7B%22timestamp%22%3A%5B%5B%22range%22%5D%2C%5B%22bin%22%2C32%2C1527404400%2C1530140729%5D%5D%7D%2C%22group%22%3A%5B%22classifiers%22%5D%2C%22select%22%3A%5B%22timestamp%22%2C%22fingerprint%22%2C%22_deleted%22%2C%22callstack%22%2C%22object%22%5D%7D
|
2018-06-27 16:06:23 -07:00 |
|
John Conklin II
|
0cb8b4dfa1
|
Merge pull request #13471 from danteruiz/disable-flying-by-default
Disable flying by default
|
2018-06-27 16:04:16 -07:00 |
|
John Conklin II
|
02d0c7d795
|
Merge pull request #13454 from danteruiz/mac-fix-general-settings
make general settings be under settings instead of preferences
|
2018-06-27 15:59:16 -07:00 |
|
John Conklin II
|
8c516e1ca8
|
Merge pull request #13480 from birarda/bug/go-to-before-clear-master
move AddressManager to NodeList thread, make AccountManager safer
|
2018-06-27 15:58:56 -07:00 |
|
Zach Fox
|
1b414fbbfe
|
Quick CR comments
|
2018-06-27 15:11:59 -07:00 |
|
Gabriel Calero
|
e15fc787d3
|
Remove the duplicated AccountManager used for android
|
2018-06-27 19:04:27 -03:00 |
|
Zach Fox
|
8ba184db6a
|
Don't use flags; use a bool
|
2018-06-27 14:59:46 -07:00 |
|
amantley
|
205cd44a49
|
removed override keyword from OtherAvatar and MyAvatar destructors, also
added the virtual keyword to the createOrb virtual method in OtherAvatar
|
2018-06-27 14:31:39 -07:00 |
|
Zach Fox
|
2347634d72
|
Fixed View Overlays checkbox (thanks Dante)
|
2018-06-27 14:28:43 -07:00 |
|
amantley
|
7b49ae4950
|
added the within threshold of height function and to do: the mode computation
|
2018-06-27 14:23:24 -07:00 |
|
Zach Fox
|
cfc8c0fb09
|
Implement MS16257: Remove 'clear overlay when moving' setting and code
|
2018-06-27 14:07:04 -07:00 |
|
John Conklin II
|
b9439d1e6b
|
Merge pull request #13384 from ctrlaltdavid/21892
Fix entity detaching from head joint not becoming visible
|
2018-06-27 12:32:52 -07:00 |
|
amantley
|
99ff5f9140
|
made the Avatar destructor virtual to ensure that MyAvatar and OtherAvatar cleanup correctly
|
2018-06-27 11:59:53 -07:00 |
|
Stephen Birarda
|
b5254f1ea5
|
cleanup race on deleteLater after callback processed
|
2018-06-27 11:41:37 -07:00 |
|
Stephen Birarda
|
e90ea82ef5
|
move AddressManager to NodeList thread, fix AccountManager invokes
|
2018-06-27 11:41:37 -07:00 |
|
amantley
|
1804422df0
|
remove orb in the otherAvatar destructor, and check
_otherAvatarOrbMeshPlaceholder pointer before updating the position
|
2018-06-27 11:15:42 -07:00 |
|
amantley
|
3893b7e339
|
added the head angular velocity check
|
2018-06-27 10:37:54 -07:00 |
|
sabrina-shanman
|
18219464f1
|
Fix shutdown crash on Mac in Application::onPresent
|
2018-06-27 09:56:03 -07:00 |
|
Seth Alves
|
d9f8cd46ea
|
Merge pull request #13415 from ctrlaltdavid/21896
Zero avatar velocity if protocol version mismatch so that overlays show
|
2018-06-27 09:35:15 -07:00 |
|
amantley
|
8cf59783d1
|
removed white space
|
2018-06-27 09:20:46 -07:00 |
|
amantley
|
be6fadbc2d
|
Merge remote-tracking branch 'upstream/master' into integratedStepping
|
2018-06-27 09:16:43 -07:00 |
|
Angus Antley
|
eba4a27329
|
added newline to the end of AvatarManager.cpp
|
2018-06-27 05:59:53 +01:00 |
|
John Conklin II
|
a03a5693a5
|
Merge pull request #13466 from danteruiz/fix-login-2.0
fix login links (forgot username and password)
|
2018-06-26 18:51:10 -07:00 |
|
amantley
|
39edc21423
|
spaced comment fixed
|
2018-06-26 17:47:36 -07:00 |
|
amantley
|
8b13905d6c
|
final final final coding standards
|
2018-06-26 17:43:45 -07:00 |
|
amantley
|
7ecf8c24df
|
Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with upstream master
|
2018-06-26 16:44:34 -07:00 |
|
amantley
|
a89c2ea734
|
removed crust
|
2018-06-26 16:40:51 -07:00 |
|
Sam Gondelman
|
7fb2e535ff
|
Merge pull request #13468 from SamGondelman/secondaryShadows
Disable shadows in secondary camera
|
2018-06-26 15:45:44 -07:00 |
|
amantley
|
2b6d470467
|
Merge remote-tracking branch 'upstream/master' into glowingOrbMaster
syncing with master
|
2018-06-26 15:16:41 -07:00 |
|
amantley
|
46c70d948f
|
Moved OtherAvatar class to interface project. This allows AvatarManager to create and delete the orb overlay that is drawn when an avatar is present in a domain but for some reason the geometry is not loaded. OtherAvatar has new members orbMeshPlaceholder and orbMeshPlaceholderID for a spherical orb that is drawn
|
2018-06-26 15:11:58 -07:00 |
|
Dante Ruiz
|
3cf36bed55
|
making small adjustments
|
2018-06-26 14:57:15 -07:00 |
|
Dante Ruiz
|
1fec900ba6
|
disable flying by default
|
2018-06-26 13:31:59 -07:00 |
|
amantley
|
fa1a9d04e0
|
everything working before trying to move otheravatar to interface
|
2018-06-26 13:18:26 -07:00 |
|
SamGondelman
|
97ee02811c
|
disable shadows in secondary camera
|
2018-06-26 12:27:59 -07:00 |
|
Zach Fox
|
56b3c125c5
|
Merge pull request #13459 from zfox23/MS16113_hifikeyPath
Fix MS16113: Use alternate method for creating backup instructions
|
2018-06-26 11:36:03 -07:00 |
|
Dante Ruiz
|
a906fbaf56
|
fix login links
|
2018-06-26 10:20:22 -07:00 |
|
Seth Alves
|
dcebbada28
|
fix various crashes-upon-exits
|
2018-06-26 10:08:44 -07:00 |
|
Gabriel Calero
|
48cdd6d64c
|
Fix web entities for android
|
2018-06-26 12:30:03 -03:00 |
|
Angus Antley
|
b8dea4b869
|
adding changes to add the orb when an avatar is processed by the avatar mixer
and when a new model is being loaded for an avatar. The orb is removed
when the geometry has loaded.
|
2018-06-26 06:27:18 +01:00 |
|
Sam Gondelman
|
acfd562309
|
Merge pull request #13435 from gcalero/breakpad_android
Breakpad integration for android Interface (part II)
|
2018-06-25 16:47:07 -07:00 |
|
Howard Stearns
|
5fe7b874a4
|
Merge pull request #13455 from howard-stearns/test-wearables
16089: test wearables for wear before gifting and wearing
|
2018-06-25 16:44:53 -07:00 |
|
Andrew Meadows
|
ca70b865d3
|
Merge pull request #13452 from AndrewMeadows/avatar-entities-001
fix physics deactivation of avatar-entities
|
2018-06-25 16:18:01 -07:00 |
|
Zach Fox
|
7a5d794505
|
Fix MS16113: Use alternate method for creating backup instructions
|
2018-06-25 14:40:54 -07:00 |
|
Dante Ruiz
|
7f7ca677f0
|
mac - moving general settings back under settings
|
2018-06-25 14:23:37 -07:00 |
|
Zach Fox
|
3ceb9ddee9
|
Merge pull request #13444 from zfox23/MS16074_16076_banklinks
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-25 13:47:08 -07:00 |
|
Gabriel Calero
|
0a70e844bf
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-25 17:41:51 -03:00 |
|
howard-stearns
|
43cba68cd2
|
test wearables for wear before gifting and wearing
|
2018-06-25 13:40:45 -07:00 |
|
Gabriel Calero
|
fedc0a9e61
|
Support web3d overlays in android
|
2018-06-25 16:37:03 -03:00 |
|
Zach Fox
|
3553f97776
|
Merge pull request #13446 from zfox23/MS16088_usernameOverlap
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-25 11:45:29 -07:00 |
|
Andrew Meadows
|
756f34761f
|
don't build AvatarMotionStates until physics enabled
|
2018-06-25 10:37:54 -07:00 |
|
David Rowe
|
af3861def8
|
Code review
|
2018-06-25 16:33:05 +12:00 |
|
David Rowe
|
40fb627504
|
Merge branch 'master' into 21892
|
2018-06-25 16:04:44 +12:00 |
|
Simon Walton
|
0dca842102
|
Add avatar identity requests to analytics
|
2018-06-22 17:06:33 -07:00 |
|
Simon Walton
|
269d803812
|
New approach to tracking no-identity duration
|
2018-06-22 16:42:37 -07:00 |
|
Zach Fox
|
6fce6431a3
|
Fix MS16088: Prevent long usernames from overlapping HFC logo in Wallet Home
|
2018-06-22 16:09:49 -07:00 |
|
Zach Fox
|
25f22326a8
|
Fix MS16074, MS16076: Fix links to Go To BankOfHighFidelity
|
2018-06-22 15:43:16 -07:00 |
|
John Conklin II
|
b7069fff71
|
Merge pull request #13382 from SamGondelman/particleFix
Fix Particle Entities
|
2018-06-22 13:27:11 -07:00 |
|
Simon Walton
|
e5b35b1cd9
|
Clang doesn't support digit separators yet
|
2018-06-22 12:01:00 -07:00 |
|
Sam Gondelman
|
44a7d04b2a
|
Merge pull request #13426 from SamGondelman/avatarPriority
Highest loading priorities for avatars and attachments
|
2018-06-22 11:22:10 -07:00 |
|
Sam Gondelman
|
850e2d5cf5
|
Merge branch 'master' into particleFix
|
2018-06-21 17:32:24 -07:00 |
|
amantley
|
3027f8242c
|
added the conditional for leaving the base of support to pre physics update in MyAvatar.cpp
|
2018-06-21 17:23:03 -07:00 |
|
Simon Walton
|
6796af4b6a
|
Move sendAvatarIdentityRequest() to a more logical location
|
2018-06-21 15:00:51 -07:00 |
|
amantley
|
e4ca6c6303
|
added the fixes for the lurch that happens when driving or flying
|
2018-06-21 11:22:26 -07:00 |
|
amantley
|
8fc04776f9
|
starting to implement the step detection code in MyAvatar.cpp
|
2018-06-21 10:59:07 -07:00 |
|
John Conklin II
|
aa630e02cf
|
Merge pull request #13269 from wayne-chen/BillboardableWarning-case-14709
Billboardable::pointTransformAtCamera div by zero asan warning
|
2018-06-21 10:04:38 -07:00 |
|
Gabriel Calero
|
4af0815561
|
Add missing annotations to breakpad (version, build_number, build_type)
|
2018-06-21 11:19:39 -03:00 |
|
Simon Walton
|
d789c4573b
|
Add couple of comments
|
2018-06-20 17:44:58 -07:00 |
|
SamGondelman
|
8f411ad6c8
|
CR
|
2018-06-20 16:13:10 -07:00 |
|
Andrew Meadows
|
4424a8df11
|
Merge pull request #13303 from highfidelity/workload
workload project part 1
|
2018-06-20 15:39:01 -07:00 |
|
Cristian Luis Duarte
|
3837952418
|
Android - Add a clear method on pending downloads and use it when going background
|
2018-06-20 18:29:04 -03:00 |
|
SamGondelman
|
8014f61243
|
loading priorities for avatars and attachments
|
2018-06-20 12:29:28 -07:00 |
|
Simon Walton
|
d638bdd986
|
First pass at requesting ID for unknown data
Keep list of AvatarData that was created from a
data packet without a matching ID. If items get
old enough send an ID request and remove them.
|
2018-06-20 12:21:39 -07:00 |
|
Andrew Meadows
|
24bae8eddc
|
Merge pull request #13425 from sabrina-shanman/crash-strafe
Fix crash when walking sideways
|
2018-06-20 11:13:20 -07:00 |
|
sabrina-shanman
|
a8b2da14cf
|
Format numeric constant in strafe crash commit to match coding standards
|
2018-06-20 08:45:12 -07:00 |
|
sabrina-shanman
|
45fdf3d68f
|
Fix crash when walking sideways
|
2018-06-19 17:23:00 -07:00 |
|
Brad Davis
|
787fb1b9bd
|
Fix crash in display plugin caused by audio device changed
|
2018-06-19 16:13:57 -07:00 |
|
Zach Fox
|
fa3fae09b2
|
Merge pull request #13416 from zfox23/MS15154_removeButtonFocusState
Fix MS15154: Remove focused button color
|
2018-06-19 13:10:11 -07:00 |
|
Zach Fox
|
a4d47a0248
|
Merge pull request #13408 from zfox23/MS16012_emptyHistoryFix
Fix MS16012: Correct the criteria used to determine empty txn history
|
2018-06-19 12:01:51 -07:00 |
|
Zach Fox
|
1ea3b85a5d
|
Merge pull request #13418 from zfox23/MS16052_PNG50
Implement MS16052: Use quality '50' when saving PNG Snapshots
|
2018-06-19 11:52:10 -07:00 |
|
Zach Fox
|
97e4d2eb46
|
Merge pull request #13404 from zfox23/MS15545_fixWebBackButton
Fix MS15545: Fix PAL/GoTo WebView's Back Button
|
2018-06-19 11:25:27 -07:00 |
|
Zach Fox
|
3ef41664dc
|
Implement MS16052: Use quality '50' when saving PNG Snapshots
|
2018-06-19 10:32:01 -07:00 |
|
Zach Fox
|
d056fa6c93
|
Fix MS15154: Remove focused button color
|
2018-06-19 09:56:24 -07:00 |
|
David Rowe
|
0e1e44a3f5
|
Zero avatar velocity if protocol version mismatch so that overlays show
|
2018-06-19 20:44:53 +12:00 |
|
Andrew Meadows
|
44c3620b6e
|
remove cruft
|
2018-06-18 17:45:58 -07:00 |
|
Atlante45
|
4a4c0d132e
|
Make stereo interface async
|
2018-06-18 17:26:29 -07:00 |
|
John Conklin II
|
9ace80c709
|
Merge pull request #13407 from AndrewMeadows/0.69.0-colliding-avatars
RC69: avatars collide again (again)
|
2018-06-18 15:21:47 -07:00 |
|
John Conklin II
|
a47038d81f
|
Merge pull request #13381 from hyperlogic/feature/crashpad-thread-id
Add main & render thread ids to crashpad annotations
|
2018-06-18 15:21:04 -07:00 |
|
Sam Gateau
|
56a1137f7b
|
Merge pull request #13312 from SamGondelman/overlayPipelines
Fix layered overlay rendering and highlight
|
2018-06-18 14:35:03 -07:00 |
|
Zach Fox
|
ad1da3e225
|
Fix MS16012: Correct the criteria used to determine empty txn history
|
2018-06-18 14:26:46 -07:00 |
|
Andrew Meadows
|
a18ba36dd2
|
merge 'master' into 'workload'
|
2018-06-18 13:40:08 -07:00 |
|
Andrew Meadows
|
085130e3c9
|
avatars collide again again
|
2018-06-18 13:17:32 -07:00 |
|
Zach Fox
|
84ed07cdb4
|
Merge pull request #13405 from zfox23/MS16007_supportPngSnapshots
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 13:10:45 -07:00 |
|
Wayne Chen
|
07e689f086
|
removing compute/check for u
|
2018-06-18 13:02:53 -07:00 |
|
Zach Fox
|
e83b76781b
|
Be a bit more specific in the docs
|
2018-06-18 11:47:26 -07:00 |
|
Zach Fox
|
614b512411
|
Add docs
|
2018-06-18 11:43:31 -07:00 |
|
Howard Stearns
|
69d1b85d32
|
Merge pull request #13393 from howard-stearns/fix-concurrency-drill-down
fix concurrency drillDown
|
2018-06-18 11:39:30 -07:00 |
|
Elisa Lupin-Jimenez
|
9c488ff05e
|
Merge pull request #13331 from gcalero/breakpad_android
Breakpad integration for android Interface
|
2018-06-18 11:32:05 -07:00 |
|
Elisa Lupin-Jimenez
|
c08df9e39f
|
Merge pull request #13400 from kitely/parse-snapshot-fix
Don't call parseSnapshotData() in a static manner
|
2018-06-18 11:26:29 -07:00 |
|
Zach Fox
|
dbf3ade04f
|
Implement MS16007: Add support for PNG snapshots
|
2018-06-18 11:22:05 -07:00 |
|
Wayne Chen
|
e381022910
|
checking for NaN in cross products from vec3 positions
|
2018-06-18 11:21:53 -07:00 |
|
Gabriel Calero
|
3eecb2f379
|
Apply code conventions
|
2018-06-18 14:42:08 -03:00 |
|
Wayne Chen
|
ed7f008517
|
checking edge case of if input vectors are zero
|
2018-06-18 10:31:11 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
Zach Fox
|
f307f1d97a
|
Fix MS15545: Fix PAL/GoTo WebView's Back Button
|
2018-06-18 10:19:00 -07:00 |
|
Elisa Lupin-Jimenez
|
b255cf0ba9
|
Merge pull request #13389 from AndrewMeadows/misc-001
crash fixes, removing unnecessary writes, and misc cleanup
|
2018-06-18 09:19:22 -07:00 |
|
Oren Hurvitz
|
d8ea47b78f
|
Don't call parseSnapshotData() in a static manner.
Shouldn't call non-static methods in a static manner. (Some compilers don't even allow this, although apparently Visual Studio 2017 does.)
|
2018-06-17 14:18:25 +03:00 |
|
vladest
|
41dad71634
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-17 12:27:03 +02:00 |
|
David Rowe
|
be4b929301
|
Fix cauterization when reparent entity to a different joint
|
2018-06-16 16:31:06 +12:00 |
|
David Rowe
|
4dd6ba1d18
|
Fix Mac crash
|
2018-06-16 16:29:45 +12:00 |
|
Gabriel Calero
|
583c46b3a0
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-15 21:21:03 -03:00 |
|
Gabriel Calero
|
20c147ef11
|
Fix compilation error
|
2018-06-15 21:12:38 -03:00 |
|
howard-stearns
|
97fa22b69b
|
fix concurrency drillDown
|
2018-06-15 16:57:21 -07:00 |
|
Gabriel Calero
|
1cdd8c2f3c
|
Fix compilation error
|
2018-06-15 20:39:24 -03:00 |
|
Gabriel Calero
|
20727378e2
|
Rename crash handler files
|
2018-06-15 20:32:10 -03:00 |
|
John Conklin II
|
2655dd77b6
|
Merge pull request #13368 from zfox23/MS15501_CreateModelKeyboard
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-15 15:34:02 -07:00 |
|
Anthony J. Thibault
|
2feecf6db8
|
removed unnecessary setting of 'username' annotation.
|
2018-06-15 14:56:10 -07:00 |
|
Anthony J. Thibault
|
8ddcff6070
|
Set username annotation more reliably.
|
2018-06-15 14:47:02 -07:00 |
|
John Conklin II
|
2483c45f40
|
Merge pull request #13350 from sabrina-shanman/bulletcollisionrenderonly
Remove functionality for rendering collision models directly in the Model class
|
2018-06-15 14:46:40 -07:00 |
|
Andrew Meadows
|
be0899c41d
|
remove unnecessary writes to appease Xcode's static analyzer
|
2018-06-15 11:44:22 -07:00 |
|
Anthony J. Thibault
|
24689224ce
|
removed redundant machine_fingerprent crashpad annotation.
|
2018-06-15 11:40:45 -07:00 |
|
David Rowe
|
249f72758e
|
Fix entity detaching from head joint not becoming visible
|
2018-06-15 16:36:16 +12:00 |
|
Thijs Wenker
|
05bc32b3ad
|
Merge branch 'master' of github.com:highfidelity/hifi into merge/triplelexx-21883
# Conflicts:
# interface/src/Application.cpp
# interface/src/scripting/LimitlessVoiceRecognitionScriptingInterface.cpp
|
2018-06-15 02:34:29 +02:00 |
|
Gabriel Calero
|
c02750edd1
|
Upload breakpad minidumps from an android service
|
2018-06-14 19:43:03 -03:00 |
|
Anthony J. Thibault
|
84601446bf
|
Add main thread id & machine fingerprint to crashpad annotations
|
2018-06-14 12:57:30 -07:00 |
|
John Conklin II
|
d023d6adef
|
Merge pull request #13321 from danteruiz/tablet-imporvments
Tablet improvements
|
2018-06-14 12:38:20 -07:00 |
|
Anthony Thibault
|
f2d6d0ee56
|
Merge pull request #13351 from ctrlaltdavid/21891
Fix Avatar > Attachments joint and spinboxes
|
2018-06-14 11:31:04 -07:00 |
|
Anthony Thibault
|
5d06ea1c45
|
Merge pull request #13250 from MiladNazeri/gravprep-docs
Jsdoc to Grav Automation Tool
|
2018-06-14 11:26:56 -07:00 |
|
John Conklin II
|
7057e00583
|
Merge pull request #13298 from danteruiz/fix-vive-configuration-page
Controller Confguration Page fixes
|
2018-06-14 11:07:26 -07:00 |
|
vladest
|
aa23728bca
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-14 19:26:43 +02:00 |
|
John Conklin II
|
b43d5287e2
|
Merge pull request #13286 from ElderOrb/spinbox-bugs
Introduce test 'controls gallery' application for controls testing & few spinbox fixes
|
2018-06-14 10:21:17 -07:00 |
|
Dante Ruiz
|
dc28e8f03f
|
fixing error
|
2018-06-13 18:24:06 -07:00 |
|
Dante Ruiz
|
eb01b50e6f
|
making code review changes
|
2018-06-13 17:58:10 -07:00 |
|
Zach Fox
|
6b59b5b53c
|
MS15501: Fix keyboard in Create -> Model in HMD
|
2018-06-13 13:23:43 -07:00 |
|
John Conklin II
|
99b5835098
|
Merge pull request #13344 from birarda/feat/new-version-numbers
handle semantic version numbers in interface/sandbox update
|
2018-06-13 11:16:56 -07:00 |
|
Dante Ruiz
|
60e46481b2
|
emissive maps
|
2018-06-13 10:41:02 -07:00 |
|
John Conklin II
|
0ba97fa83b
|
Merge pull request #13338 from amantley/scriptedBlendshapesFaceFlags
Scripted Blendshapes and Procedural Face Movement Flags
|
2018-06-13 10:32:59 -07:00 |
|
vladest
|
010309ba31
|
Add focus change logging. Switch off all focus hacks
|
2018-06-13 14:51:29 +02:00 |
|
vladest
|
75ce8e56df
|
Merge branch 'master' into address_dialog_focus_fix
|
2018-06-13 11:47:29 +02:00 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -07:00 |
|
Howard Stearns
|
6f011b70ac
|
Merge pull request #13358 from howard-stearns/drill-down-to-place-and-stack-goto-cards
MS15788: drillDownToPlace and isStacked based on server data.
|
2018-06-12 16:18:54 -07:00 |
|
Zach Fox
|
ffb9a47be0
|
Merge pull request #13355 from zfox23/MS14314_multipleSnapshots
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-12 15:10:22 -07:00 |
|
Anthony Thibault
|
027c4f6b9e
|
Merge pull request #13332 from hyperlogic/bug-fix/large-avatar-little-domain-rc68
Large avatars should instantly shrink when entering small height domains
|
2018-06-12 14:57:07 -07:00 |
|
howard-stearns
|
05d3f92867
|
drillDownToPlace and iStacked based on server data.
|
2018-06-12 13:18:44 -07:00 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Dante Ruiz
|
759c29ab10
|
updating the model
|
2018-06-12 10:53:38 -07:00 |
|
Dante Ruiz
|
f1d11f9566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-12 10:21:12 -07:00 |
|
vladest
|
11129eddde
|
Remove extra textfield fro address ber input
|
2018-06-12 18:48:41 +02:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07:00 |
|
David Rowe
|
537665c22a
|
Fix spinbox not validating the second time an invalid value is entered
|
2018-06-12 17:35:53 +12:00 |
|
Anthony J. Thibault
|
042f902d2e
|
Merge branch 'master' into scriptedBlendshapesFaceFlags
|
2018-06-11 17:13:30 -07:00 |
|
Zach Fox
|
14034f29a1
|
Interface Fix for MS14314: Make use of original image filename when sharing
|
2018-06-11 17:10:09 -07:00 |
|
Sam Gateau
|
f769b63c3d
|
Merge pull request #13308 from jherico/fix/13677
Fix for black text rendering white in web elements
|
2018-06-11 16:17:31 -07:00 |
|
Sam Gondelman
|
e8ec32c7f8
|
Merge pull request #13340 from SamGondelman/modelTextures
Try to fix ModelOverlay texture loading
|
2018-06-11 16:09:10 -07:00 |
|
Dante Ruiz
|
6685fbbfc4
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 13:56:54 -07:00 |
|
Zach Fox
|
7fbc7bf1a5
|
Merge pull request #13347 from zfox23/MS15721_deleteApp
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-11 13:28:05 -07:00 |
|
Zach Fox
|
15129e37db
|
Merge pull request #13341 from zfox23/MS13761_hideOverlayFix
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-11 11:44:26 -07:00 |
|
Anthony J. Thibault
|
f773aef053
|
Merge branch 'master' into bug-fix/large-avatar-little-domain-rc68
|
2018-06-11 11:06:21 -07:00 |
|
sabrina-shanman
|
4c39d08358
|
Remove "Draw Collision Shapes" option from developer physics menu
|
2018-06-11 11:03:57 -07:00 |
|
Zach Fox
|
56bd7e3d37
|
Remove dead function declaration from header
|
2018-06-11 10:58:01 -07:00 |
|
Stephen Birarda
|
10e34000aa
|
Merge pull request #13278 from SimonWalton-HiFi/tablet-popup-remains
Domain-unreachable message remaining on slow connects
|
2018-06-11 10:46:55 -07:00 |
|
Zach Fox
|
c26b03f480
|
Cleanup
|
2018-06-11 10:40:13 -07:00 |
|
Zach Fox
|
c7c06590ac
|
Merge branch 'master' of github.com:highfidelity/hifi into MS13761_hideOverlayFix
|
2018-06-11 10:16:35 -07:00 |
|
Howard Stearns
|
5ce122f148
|
Merge pull request #13307 from howard-stearns/infinite-scroll
Infinite scroll
|
2018-06-11 10:03:52 -07:00 |
|
Anthony J. Thibault
|
b8379045a8
|
Fix MyAvatar::isReadyForPhysics() in serverless domains.
|
2018-06-11 09:53:34 -07:00 |
|
Sam Gondelman
|
be28097279
|
Merge pull request #13339 from SamGondelman/avatarHash
Possibly fix avatarHash crash
|
2018-06-11 09:39:40 -07:00 |
|
Sam Gondelman
|
535dc92213
|
Merge pull request #13334 from SamGondelman/tablet
Fix tablet not disappearing
|
2018-06-11 09:34:57 -07:00 |
|
Dante Ruiz
|
ba86c9753d
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-11 09:13:14 -07:00 |
|
David Rowe
|
11178d80f7
|
Fix avatar attachment spinbox min/max values
|
2018-06-11 16:24:45 +12:00 |
|
David Rowe
|
0161015746
|
Fix setting avatar attachment joint
|
2018-06-11 15:31:42 +12:00 |
|
howard-stearns
|
020d622302
|
don't depend on matching handlers with overlapping requests
|
2018-06-09 17:34:49 -07:00 |
|
howard-stearns
|
421edbfa1e
|
PSFListModel isa ListModel instead of hasa
|
2018-06-09 16:03:45 -07:00 |
|
howard-stearns
|
d2cf042a88
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-09 14:09:42 -07:00 |
|
Anthony Thibault
|
044d142635
|
Merge pull request #13133 from amantley/nativeCGCode
Center of Gravity Leaning
|
2018-06-08 17:53:55 -07:00 |
|
Stephen Birarda
|
9506e7edbe
|
check for update for dev-builds, handle semantic version
|
2018-06-08 17:20:57 -07:00 |
|
howard-stearns
|
d68415c47c
|
code feedback
|
2018-06-08 16:47:06 -07:00 |
|
howard-stearns
|
f0d486a6a5
|
remove the unused client-side stuff from model
|
2018-06-08 15:48:39 -07:00 |
|
howard-stearns
|
d9daa3495a
|
remove comments / dead code
|
2018-06-08 15:36:10 -07:00 |
|
howard-stearns
|
ce322a4794
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 15:33:07 -07:00 |
|
John Conklin II
|
bc3edbc7fc
|
Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-08 15:14:32 -07:00 |
|
howard-stearns
|
210cb23de6
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 14:54:15 -07:00 |
|
Stephen Birarda
|
112abc9d7e
|
Merge pull request #13148 from birarda/feat/new-version-numbers
add SHA to PR/master version, add build_type (stable/master/pr/dev)
|
2018-06-08 14:44:22 -07:00 |
|
howard-stearns
|
36a0adf553
|
strip snapshot stacking code - we'll do it on server or not at all
|
2018-06-08 14:24:24 -07:00 |
|
Zach Fox
|
95faad23e2
|
Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-08 14:20:21 -07:00 |
|
Zach Fox
|
812c28ef48
|
Fix MS13761: Change the move conditions under which overlays hide
|
2018-06-08 14:15:42 -07:00 |
|
SamGondelman
|
310e2ee063
|
attempt to fix first time model overlay loading
|
2018-06-08 13:56:21 -07:00 |
|
Dante Ruiz
|
5843c24309
|
adding perfectly straight model and adjusting ovelray
|
2018-06-08 13:56:00 -07:00 |
|
howard-stearns
|
3ade31bdf6
|
always show edition
|
2018-06-08 12:57:40 -07:00 |
|
howard-stearns
|
dd0f3c64ec
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-08 12:12:21 -07:00 |
|
Zach Fox
|
9f0864944c
|
Fix Friending in Connections tab - READ FIXME
|
2018-06-08 11:37:02 -07:00 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -07:00 |
|
Dante Ruiz
|
5d570f030f
|
fixing calibration
|
2018-06-08 11:18:52 -07:00 |
|
Zach Fox
|
d4a19e7bc9
|
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-08 10:52:14 -07:00 |
|
David Back
|
e8aece4c11
|
Merge pull request #13315 from dback2/avatarFeet
Fix default avatar feet
|
2018-06-08 10:00:43 -07:00 |
|
howard-stearns
|
21ed081eae
|
proper name for updated type filter of inventory endpoint
|
2018-06-08 09:52:11 -07:00 |
|
howard-stearns
|
64e466ee7d
|
snapshot stacks
|
2018-06-07 21:10:40 -07:00 |
|
Atlante45
|
83e1db14cf
|
Set UAL default value earlier to be caught by crashpad
|
2018-06-07 19:40:30 -07:00 |
|
howard-stearns
|
595a0d8733
|
restore lost code
|
2018-06-07 19:24:05 -07:00 |
|
howard-stearns
|
348d5fc359
|
inventory text filter
|
2018-06-07 17:01:48 -07:00 |
|
SamGondelman
|
c7007c089f
|
fix tablet not disappearing
|
2018-06-07 16:35:22 -07:00 |
|
amantley
|
913d78841d
|
Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes
synching with upstream master
|
2018-06-07 16:20:11 -07:00 |
|
howard-stearns
|
2761688d39
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 16:14:57 -07:00 |
|
howard-stearns
|
8b08505116
|
using filter/sort endpoint parameters
|
2018-06-07 16:14:18 -07:00 |
|
Zach Fox
|
c1b971a269
|
Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider
|
2018-06-07 16:10:44 -07:00 |
|
Anthony J. Thibault
|
608575cf17
|
Large avatars should instantly shrink when entering small height domains
Also reduce the fudge factor for safeLanding from an additional 50% of avatar's height to 25%.
|
2018-06-07 15:31:40 -07:00 |
|
amantley
|
836c3da858
|
cleaned up white space and removed extra declaration of hadAudioEnabledFaceMovement
|
2018-06-07 15:11:57 -07:00 |
|
Zach Fox
|
f9b6e3e2ac
|
Merge pull request #13300 from zfox23/MS15582_PurchasesButtonClicks
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
|
2018-06-07 15:10:00 -07:00 |
|
Gabriel Calero
|
3911a93a38
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-07 19:00:16 -03:00 |
|
Gabriel Calero
|
8869af069e
|
Integrate Breakpad in android Interface
|
2018-06-07 18:59:43 -03:00 |
|
druiz17
|
8c83bd29a3
|
making requested changes
|
2018-06-07 14:04:39 -07:00 |
|
Zach Fox
|
7d8e02e714
|
Fix MS15663/15664: Don't set Wallet Status to 'ready' too early
|
2018-06-07 14:01:52 -07:00 |
|
amantley
|
97831e61f0
|
removed stray comments
|
2018-06-07 12:54:46 -07:00 |
|
Zach Fox
|
d33875e142
|
Merge pull request #13295 from zfox23/MS15574_WalletMemoryLeak
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-07 12:42:24 -07:00 |
|
howard-stearns
|
890c97e7cb
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-07 12:24:27 -07:00 |
|
John Conklin II
|
1646f543cd
|
Merge pull request #13273 from danteruiz/fix-show-overlays-menu
fixing show overlays menu item on start up
|
2018-06-07 11:34:30 -07:00 |
|
John Conklin II
|
3b413d0f72
|
Merge pull request #13272 from zfox23/MS14615_memoryUsageMinimized
MS14615: Prevent memory overuse when minimized
|
2018-06-07 11:16:56 -07:00 |
|
David Back
|
ae5d056ca0
|
Merge pull request #13292 from dback2/fileChooser
File Dialog Fixes
|
2018-06-07 09:38:56 -07:00 |
|
Sam Gateau
|
146732a20f
|
Merge pull request #13317 from jherico/feature/mac_resources
Use binary resources on OSX
|
2018-06-07 09:38:00 -07:00 |
|
John Conklin II
|
2b6fdb6b69
|
Merge pull request #13217 from Atlante45/fix/ds-memory
Fix uploaded content archives taking too much memory
|
2018-06-07 09:37:41 -07:00 |
|
Zach Fox
|
7f04506020
|
Merge pull request #13318 from zfox23/MS14925_doubleCallingDisplayChanged
Fix MS14925: Don't double-emit signal for display plugin change
|
2018-06-07 09:32:50 -07:00 |
|
David Back
|
a246c9f0d1
|
fix fbx and textures
|
2018-06-06 15:47:29 -07:00 |
|
Dante Ruiz
|
6ddc768f57
|
making overlays use precisionPicking and adjust tablet screen position
|
2018-06-06 15:40:33 -07:00 |
|
howard-stearns
|
8185d1b5f5
|
cleanup and consistently don't getNextPage at beginning
|
2018-06-06 15:24:54 -07:00 |
|
Bradley Austin Davis
|
fa51c15849
|
Use binary resources on OSX
|
2018-06-06 15:10:52 -07:00 |
|
Zach Fox
|
6869718025
|
Fix MS14925: Don't double-call signal for display plugin change
|
2018-06-06 14:41:33 -07:00 |
|
Seth Alves
|
b70ffa5bae
|
Merge pull request #13297 from ctrlaltdavid/21835
Remove some deprecated functions from the Controller API
|
2018-06-06 14:06:34 -07:00 |
|
Sam Gondelman
|
b4afabee68
|
Merge pull request #13294 from SamGondelman/overlays
Add isGroupCulled property to ModelOverlays
|
2018-06-06 13:52:33 -07:00 |
|
Dante Ruiz
|
d57d087752
|
update tablet model again
|
2018-06-06 12:48:20 -07:00 |
|
David Back
|
c294dd4ac7
|
fix path and name
|
2018-06-06 12:32:47 -07:00 |
|
David Back
|
afd4b5a8ab
|
update default avatar to fix non-flat feet
|
2018-06-06 11:48:04 -07:00 |
|
Sam Gateau
|
a1899e80c0
|
Merge pull request #13290 from AndrewMeadows/update-queryAACube
update server-side bounding box more correctly for grabbed things
|
2018-06-06 11:46:09 -07:00 |
|
Dante Ruiz
|
25305ab57f
|
updating texture
|
2018-06-06 11:31:39 -07:00 |
|
Seth Alves
|
6c8e514367
|
Merge pull request #13224 from danteruiz/fix-key-conflicts
Allow using the key 1,2,3 to swicth views and also to enter text in web entity or overlay
|
2018-06-06 11:08:04 -07:00 |
|
Dante Ruiz
|
995cfeb3c5
|
cleaning code
|
2018-06-06 10:42:12 -07:00 |
|
Dante Ruiz
|
59c50b7f26
|
remove highlight overlay in favor of materialEntity
|
2018-06-06 08:38:58 -07:00 |
|
MiladNazeri
|
082c1fce52
|
Merge pull request #13251 from ctrlaltdavid/21880
JSDoc updates
|
2018-06-05 19:04:54 -07:00 |
|
howard-stearns
|
335aeaeb38
|
purchases cleanup, wearables, and edition numbers when multiples seen.
|
2018-06-05 17:06:08 -07:00 |
|
howard-stearns
|
6aa551b35c
|
Don't getNextPage when at beginning (even if that is also the end).
|
2018-06-05 17:04:29 -07:00 |
|
amantley
|
f21431ca88
|
added check for the actual face tracker in MyHead.cpp to prevent crash
|
2018-06-05 16:33:28 -07:00 |
|
Anthony J. Thibault
|
b5a3b25adc
|
Tuned hip smoothing times.
|
2018-06-05 16:07:54 -07:00 |
|
Anthony J. Thibault
|
993d035d37
|
Smooth out fly to idle transition, to prevent hip thrusting and pops.
|
2018-06-05 15:45:19 -07:00 |
|
Dante Ruiz
|
b275bbe5a7
|
saving changes
|
2018-06-05 15:44:17 -07:00 |
|
howard-stearns
|
ce41b83bad
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 15:30:04 -07:00 |
|
SamGondelman
|
aec7206901
|
get rid of overlay pipelines and just use forward rendering
|
2018-06-05 14:44:44 -07:00 |
|
Bradley Austin Davis
|
e7e9ca4b2b
|
Disable chromium distance field text rendering on ATI GPUs
|
2018-06-05 14:16:03 -07:00 |
|
howard-stearns
|
3d75a793cc
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-05 13:35:54 -07:00 |
|
amantley
|
5132466ca0
|
kept the transient coeff. and sending the blendshapes accross the
network. and removed procedural updates to face from myhead.cpp
|
2018-06-05 13:32:45 -07:00 |
|
Zach Fox
|
2932ce177d
|
Fix MS15500: Ensure Connection usernames show up in PAL
|
2018-06-05 10:57:25 -07:00 |
|
SamGondelman
|
968758a022
|
CR
|
2018-06-05 09:35:17 -07:00 |
|
Ken Cooke
|
aa19794a94
|
Merge pull request #13243 from danteruiz/fix-copy-paste-cut-delete
fix copy delete cut paste commands and menus
|
2018-06-05 09:17:34 -07:00 |
|
Ken Cooke
|
83dda420ba
|
Merge pull request #13256 from danteruiz/remove-dead-code
remove dead code in Application::keyPressEvent
|
2018-06-05 09:16:28 -07:00 |
|
Anthony J. Thibault
|
558711f906
|
Smooth hips transition between idle and fly.
Also, take dt into account for the critically damped spring lerp calculation.
|
2018-06-04 16:57:41 -07:00 |
|
howard-stearns
|
f72f8c762b
|
goto client-side filtering (preliminary)
|
2018-06-04 16:52:20 -07:00 |
|
Andrew Meadows
|
d220d437cc
|
remove payloadGetLayer() from GameWorkloadRenderer
|
2018-06-04 16:39:29 -07:00 |
|
amantley
|
61592cdada
|
completed first try at all changes for scripted blendshapes
|
2018-06-04 16:37:47 -07:00 |
|
Zach Fox
|
c5ef5cfccb
|
Fix MS15582: In My Purchases, invisible buttons shouldn't be clickable
|
2018-06-04 16:13:18 -07:00 |
|
Andrew Meadows
|
4329ea5240
|
Merge master' into 'workload'
|
2018-06-04 16:11:25 -07:00 |
|
Dante Ruiz
|
f5e2a6834b
|
fixing some issues
|
2018-06-04 16:09:31 -07:00 |
|
David Back
|
7b2a9770ba
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fileChooser
|
2018-06-04 16:00:13 -07:00 |
|
David Rowe
|
a7a0cfeef2
|
Remove some deprecated functions from the Controller API
|
2018-06-05 10:56:19 +12:00 |
|
David Back
|
6b7d9586d1
|
apply fixes to other file dialogs and fix tablet dialog buttons
|
2018-06-04 15:56:10 -07:00 |
|
howard-stearns
|
25ee948662
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 15:30:10 -07:00 |
|
Dante Ruiz
|
48c0b7379a
|
fix vive configuration page
|
2018-06-04 15:16:11 -07:00 |
|
Sam Gondelman
|
38e7b31c32
|
Merge pull request #13176 from SimonWalton-HiFi/low-connectivity
Try reducing concurrent downloads
|
2018-06-04 14:48:46 -07:00 |
|
Zach Fox
|
60aff7a224
|
Whoops
|
2018-06-04 14:41:18 -07:00 |
|
David Rowe
|
b5028a9626
|
Merge branch 'master' into 21880
# Conflicts:
# interface./src/scripting/WindowScriptingInterface.h
|
2018-06-05 09:13:54 +12:00 |
|
Zach Fox
|
7407507f0b
|
Fix MS15574: Tiny memory leak in Wallet.h
|
2018-06-04 14:13:25 -07:00 |
|
howard-stearns
|
5a1b56d573
|
checkpoint with goto feeds working (but without filtering)
|
2018-06-04 13:11:06 -07:00 |
|
howard-stearns
|
e40fc20cb6
|
fix some bugs that had been introduced by various out-of-team prs.
|
2018-06-04 13:00:08 -07:00 |
|
SamGondelman
|
bde3382657
|
merge with master
|
2018-06-04 12:55:17 -07:00 |
|
SamGondelman
|
8af1beca8d
|
add isGroupCulled for model overlays
|
2018-06-04 12:07:57 -07:00 |
|
Alexander Ivash
|
9bf3759e8d
|
allow control spinbox with mouse wheel
|
2018-06-04 21:27:00 +03:00 |
|
Alexander Ivash
|
826d853edf
|
fix blinking 'up' indicator on pressing 'down'
|
2018-06-04 21:26:59 +03:00 |
|
Alexander Ivash
|
56466e61d3
|
fix binding loops disallowing to increment/decrement spinbox value under certain conditions
|
2018-06-04 21:26:57 +03:00 |
|
Alexander Ivash
|
8d213efa75
|
introduce test 'controls gallery' application for controls testing
|
2018-06-04 21:26:56 +03:00 |
|
howard-stearns
|
24a67c6008
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 11:15:39 -07:00 |
|
David Back
|
074892591d
|
fix auto-selecting subdir and not showing Choose when no row selected
|
2018-06-04 11:13:03 -07:00 |
|
John Conklin II
|
08fcad1932
|
Merge pull request #13227 from SamGondelman/entityMirror
Add local-only isVisibleInSecondaryCamera flag to entities
|
2018-06-04 11:06:00 -07:00 |
|
howard-stearns
|
bf7453482a
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-04 10:26:49 -07:00 |
|
John Conklin II
|
29f2ab01d8
|
Merge pull request #13244 from danteruiz/fix-shortcuts
fix copy delete cut paste commands and menus (RC68)
|
2018-06-04 10:02:49 -07:00 |
|
Anthony J. Thibault
|
c3d1daf855
|
Merge branch 'master' into nativeCGCode
|
2018-06-04 09:32:38 -07:00 |
|
Dante Ruiz
|
606b6d8947
|
fix code standard issue
|
2018-06-04 09:16:39 -07:00 |
|
Andrew Meadows
|
9ae19714b5
|
also update queryAACube for children of worn entities
|
2018-06-01 16:38:57 -07:00 |
|
John Conklin II
|
378e84b7ce
|
Merge pull request #13257 from danteruiz/rc68-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil(RC68)
|
2018-06-01 15:10:28 -07:00 |
|
Zach Fox
|
7f344c33a7
|
Docs update
|
2018-06-01 13:51:18 -07:00 |
|
Zach Fox
|
96858c9586
|
MS15529: Add secondary camera snapshot notification flag
|
2018-06-01 13:38:41 -07:00 |
|
howard-stearns
|
29b09d64e6
|
checkpoint with PAL working.
|
2018-06-01 13:33:45 -07:00 |
|
amantley
|
01848fafe0
|
made all changes except those to AvatarData toByteArray function also to do: verify that transientBlendshapes are set to 0 in headData simulate when there are blendshapes from script but no face tracker present
|
2018-06-01 11:37:11 -07:00 |
|
Simon Walton
|
f58e1ebdd9
|
Only take down tablet if it was brought up
|
2018-06-01 10:41:08 -07:00 |
|
howard-stearns
|
84f5f0a653
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-06-01 09:58:08 -07:00 |
|
John Conklin II
|
194c33bf19
|
Merge pull request #13254 from danteruiz/add-back-reload-scripts
adding back reload scripts shortcut and clean up AboutUtil
|
2018-06-01 09:31:13 -07:00 |
|
Simon Walton
|
7d1d7f7bcd
|
Closing the open tablet dialog - try harder
|
2018-05-31 18:31:53 -07:00 |
|
amantley
|
3bda5bf6a0
|
added MyAvatar.hasProceduralBlinkFaceMovement and MyAvatar.hasProceduralEyeFaceMovement properties to MyAvatar.h and cpp and HeadData.h
|
2018-05-31 17:58:37 -07:00 |
|
SamGondelman
|
86ee5c12d8
|
merge and update based on sam's changes
|
2018-05-31 17:53:36 -07:00 |
|
Sam Gateau
|
f372e25a9f
|
Merge pull request #13247 from NissimHadar/DailyTests
Daily tests
|
2018-05-31 14:50:32 -07:00 |
|
howard-stearns
|
e8e12eef8f
|
checkpoint
|
2018-05-31 14:42:52 -07:00 |
|
Simon Walton
|
7598c7aaf3
|
Remove tablet message-box when required
Desktop request was being honoured but not HMD.
|
2018-05-31 13:52:06 -07:00 |
|
samcake
|
386c0f9ab2
|
Re review adjustments
|
2018-05-31 12:16:57 -07:00 |
|
Dante Ruiz
|
caa7f64865
|
fixing show overlays menu item
|
2018-05-31 10:58:04 -07:00 |
|
amantley
|
7cc5e96f2d
|
Merge remote-tracking branch 'upstream/master' into feat/hasScriptedBlendshapes
merging hifi master to update the branch
|
2018-05-31 10:35:31 -07:00 |
|
Zach Fox
|
259803f856
|
MS14615: Prevent memory overuse when minimized
|
2018-05-31 10:30:25 -07:00 |
|
Sam Gateau
|
513acc529e
|
INtroduce RenderConstants header file to define the alias names for Tag and Layer for Hifi REnder Engine
|
2018-05-30 23:31:54 -07:00 |
|
howard-stearns
|
b0d3729d4d
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-30 17:09:57 -07:00 |
|
howard-stearns
|
bdd38cef7a
|
checkpoint
|
2018-05-30 17:09:13 -07:00 |
|
NissimHadar
|
bea21e3a68
|
WIP.
|
2018-05-30 17:06:49 -07:00 |
|
NissimHadar
|
6717a16098
|
WIP.
|
2018-05-30 17:04:19 -07:00 |
|
NissimHadar
|
51b1188bdb
|
WIP.
|
2018-05-30 17:01:47 -07:00 |
|
NissimHadar
|
df668e44ca
|
WIP.
|
2018-05-30 16:59:53 -07:00 |
|
NissimHadar
|
c1bc3bd154
|
WIP.
|
2018-05-30 16:58:35 -07:00 |
|
NissimHadar
|
d01d774f76
|
WIP.
|
2018-05-30 16:51:17 -07:00 |
|
NissimHadar
|
78f04f84c5
|
Merge branch 'master' of github.com:highfidelity/hifi into DailyTests
|
2018-05-30 16:45:53 -07:00 |
|
NissimHadar
|
c8a04911f4
|
Interface respects Show Overlay menu checkbox on start up.
|
2018-05-30 16:45:29 -07:00 |
|
samcake
|
37c1f4fc06
|
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
|
2018-05-30 16:05:46 -07:00 |
|
Andrew Meadows
|
003e444246
|
Merge branch 'master' into 'workload'
|
2018-05-30 16:04:13 -07:00 |
|
John Conklin II
|
6095a3b319
|
Merge pull request #13082 from jherico/feature/shader_cache
Shader load time performance optimiziations
|
2018-05-30 13:55:34 -07:00 |
|
Gabriel
|
6fa58fce1f
|
Update Application.cpp
Remove the mic bar for android
|
2018-05-30 15:40:05 -03:00 |
|
Sam Gondelman
|
46a6334c72
|
Merge pull request #13249 from gcalero/android_remove_mic_bar
Android: Update Application.cpp
|
2018-05-30 14:31:31 -04:00 |
|
Dante Ruiz
|
646b852aef
|
fix headers
|
2018-05-30 11:15:58 -07:00 |
|
Dante Ruiz
|
3942f397d0
|
adding back reload scripts
|
2018-05-30 11:15:47 -07:00 |
|
samcake
|
2e9076c71e
|
Clean up and trying to get ready for merge
|
2018-05-30 11:14:49 -07:00 |
|
Wayne Chen
|
81eea5d8d1
|
Merge pull request #13213 from wayne-chen/filebrowser-case-14515
Adding showHidden properties to file dialogs to allow for showing hidden files/folders
|
2018-05-30 10:43:58 -07:00 |
|
Dante Ruiz
|
c4358aad81
|
remove dead code in Application::keyPressEvent
|
2018-05-30 07:33:32 -07:00 |
|
Dante Ruiz
|
543a721a11
|
fix headers
|
2018-05-29 17:55:42 -07:00 |
|
samcake
|
873cabe284
|
Cleaning the code
|
2018-05-29 17:46:25 -07:00 |
|
Dante Ruiz
|
ea10dc176a
|
adding back reload scripts
|
2018-05-29 17:38:02 -07:00 |
|
howard-stearns
|
a84829392f
|
Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll
|
2018-05-29 16:14:22 -07:00 |
|
David Rowe
|
08cb5c7191
|
Fix JSDoc example typo
|
2018-05-30 10:25:16 +12:00 |
|
David Rowe
|
0db440931e
|
Miscellaneous JSDoc fixes
|
2018-05-30 10:02:30 +12:00 |
|
Andrew Meadows
|
57138b5fb7
|
disable workload region regulation by default
also set default region radiuses large
|
2018-05-29 14:21:16 -07:00 |
|