Wayne Chen
|
3994ec4176
|
adding potential fix - moving methods to Application
|
2018-07-05 17:54:27 -07:00 |
|
Simon Walton
|
f77b2903a1
|
Minor tweaks
|
2018-07-05 17:13:27 -07:00 |
|
Clement
|
546ee2b96f
|
cleanup cmake code
|
2018-07-05 14:18:09 -07:00 |
|
amantley
|
0ebc7fc29e
|
fixed the mode computation so that it can keep track of all long term height frequencies. This makes it unnecessary to reset the mode, because it will revert back to the highest frequency
|
2018-07-05 13:41:06 -07:00 |
|
Clement
|
b8f821a6a6
|
Use binary path in args to find crashpad handler
|
2018-07-05 12:05:48 -07:00 |
|
Sam
|
58f004352a
|
Added per pixel GPU stats
|
2018-07-04 17:15:12 +02:00 |
|
Anthony Thibault
|
c840670a54
|
Merge pull request #13519 from hyperlogic/bug-fix/stable-pole-vector-smoothing
Bug fix for unexpected avatar knee shifts for users wearing Vive Trackers.
|
2018-07-03 21:50:57 -07:00 |
|
Thijs Wenker
|
3a32472b0b
|
added test / more docs
|
2018-07-04 02:49:20 +02:00 |
|
amantley
|
6460c9e861
|
fixed case for 0.0 as the filter length
|
2018-07-03 17:11:19 -07:00 |
|
John Conklin II
|
d34d7388a1
|
Merge pull request #13537 from r3tk0n/move_hide_overlays_menu
Moved "Show Overlays" menu item to Developer Menu
|
2018-07-03 15:59:02 -07:00 |
|
Simon Walton
|
ec67b8ad56
|
Address reviewer comments
|
2018-07-03 15:31:34 -07:00 |
|
amantley
|
4995b57712
|
removed print statements and fixed rotation threshold update code
|
2018-07-03 14:31:36 -07:00 |
|
John Conklin II
|
65daee2353
|
Merge pull request #13513 from vladest/double_asset_server_fix
Tablet Asset Server dialog was instantiated twice
|
2018-07-03 13:14:12 -07:00 |
|
r3tk0n
|
4426173021
|
Moved "Show Overlays" menu item to Developer Menu
|
2018-07-03 11:56:34 -07:00 |
|
amantley
|
59dfe80940
|
Merge remote-tracking branch 'upstream/master' into integratedStepping
|
2018-07-03 11:47:09 -07:00 |
|
amantley
|
9e5763ea5c
|
adding the recentering back into the non hmd lean code
|
2018-07-03 11:46:59 -07:00 |
|
amantley
|
3424f412aa
|
Merge pull request #13437 from amantley/lurchfix
Fix for Avatar Lean in Direction of Movement: Bug 16075 (for RC70)
|
2018-07-03 19:38:01 +01:00 |
|
SamGondelman
|
90091d11e4
|
parabola picks, started implementing math
|
2018-07-03 09:47:31 -07:00 |
|
Thijs Wenker
|
d886bc2d9c
|
Merge branch 'master' of github.com:highfidelity/hifi into feat/create/interactive-window
|
2018-07-03 18:19:48 +02:00 |
|
Sam Gateau
|
96b26c94eb
|
Really add safe check for targetDisplayPLugin
|
2018-07-03 16:59:40 +02:00 |
|
Thijs Wenker
|
7390983721
|
introduce scriptable presentationMode instead of automatic mode switching windows
|
2018-07-03 16:49:49 +02:00 |
|
amantley
|
f216316b55
|
removed some comments and whitespace
|
2018-07-02 18:19:31 -07:00 |
|
amantley
|
47110d080f
|
removed clang induced changes to MyAvatar.cpp
|
2018-07-02 17:06:16 -07:00 |
|
Cristian Duarte
|
6b5e5702dd
|
Android - implement pause-resume of requests chain in ResourceCache
|
2018-07-02 20:05:59 -03:00 |
|
amantley
|
7f5f762208
|
fixing merge conflict
|
2018-07-02 15:54:21 -07:00 |
|
amantley
|
096d0d2827
|
reorganized the step detection code, creating a shouldActivateHorizontalCG that calls all the step detection conditionals. The average rotation and the mode are now calculated in MyAvatar::update
|
2018-07-02 15:43:57 -07:00 |
|
John Conklin II
|
3f975cfa84
|
Merge pull request #13506 from sabrina-shanman/fix-osx-crash-on-exit
Fix Mac Crashes On Shutdown
|
2018-07-02 15:27:26 -07:00 |
|
Bradley Austin Davis
|
b862694e32
|
Merge pull request #13505 from samcake/punk
Fixing a bug if the last session display plugin is an invalid name, resolve to default
|
2018-07-02 14:55:04 -07:00 |
|
Cristian Duarte
|
6b3a9def7a
|
Merge branch 'hifi_master' into android_stop_downloads_bg
|
2018-07-02 17:37:40 -03:00 |
|
John Conklin II
|
58a9bdc86f
|
Merge pull request #13511 from r3tk0n/mouse_menu2
Fix SpinnerSliderPreference Class, Update Mouse Sensitivity Menu
|
2018-07-02 12:33:35 -07:00 |
|
vladest
|
0657992e9c
|
Tablet Asset Server dialog was instantiated twice
|
2018-07-01 19:56:51 +02:00 |
|
Anthony J. Thibault
|
fff4348a0f
|
Bug fix for poleVector smoothing
Needs to occur in sensor space rather then avatar space.
|
2018-06-29 17:54:21 -07:00 |
|
Gabriel Calero
|
762e8f4bf0
|
Refactor WebViewActivity using fragment. Try SlidingDrawer.
|
2018-06-29 20:43:58 -03:00 |
|
r3tk0n
|
39f491d9d0
|
Update PreferencesDialog.cpp
Removing errant newline
|
2018-06-29 16:17:15 -07:00 |
|
r3tk0n
|
4feba7e66e
|
Correction of string literals
Last update to string literals, miscommunication.
|
2018-06-29 16:12:31 -07:00 |
|
r3tk0n
|
5158a9c4fd
|
Update Mouse Sensitivity Settings Text
Changed text for clarity to new users.
|
2018-06-29 16:11:18 -07:00 |
|
r3tk0n
|
9b59dc5809
|
Changed SpinnerSliderPreference.qml to general-case UI element as originally intended,
updated PreferencesDialog.cpp's Avatar Scale slider to hard-coded bounds [0.25, 4.0].
|
2018-06-29 15:22:57 -07:00 |
|
amantley
|
44d9edec3c
|
added the properties for filter length and rotation threshold to MyAvatar class This will help us test the right combo for head based turning
|
2018-06-29 14:42:23 -07:00 |
|
amantley
|
c9c222a253
|
added the failsafe code to the stepping
|
2018-06-29 11:33:42 -07:00 |
|
Gabriel Calero
|
a6d093d8c9
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-29 15:09:32 -03:00 |
|
sabrina-shanman
|
9dc03f5013
|
Destroy GeometryCache explicitly in Application destructor
|
2018-06-29 10:39:16 -07: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 |
|
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
|
5029767493
|
InteractiveWindow scripting API
|
2018-06-28 19:04:08 +02: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
|
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 |
|
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 |
|
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 |
|
Seth Alves
|
dcebbada28
|
fix various crashes-upon-exits
|
2018-06-26 10:08:44 -07: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 |
|
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 |
|
Gabriel Calero
|
0a70e844bf
|
Merge remote-tracking branch 'upstream/master' into web_overlay_android
|
2018-06-25 17:41:51 -03:00 |
|
Gabriel Calero
|
fedc0a9e61
|
Support web3d overlays in android
|
2018-06-25 16:37:03 -03: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 |
|
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
|
3ef41664dc
|
Implement MS16052: Use quality '50' when saving PNG Snapshots
|
2018-06-19 10:32:01 -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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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
|
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
|
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 |
|
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 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -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 |
|
Zach Fox
|
bf5d6de780
|
Merge branch 'master' of github.com:highfidelity/hifi into MS14314_multipleSnapshots
|
2018-06-12 11:19:05 -07:00 |
|
Dante Ruiz
|
f1d11f9566
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-imporvments
|
2018-06-12 10:21:12 -07:00 |
|
Andrew Meadows
|
d31ee52d79
|
revert PR-13162 from RC68
|
2018-06-12 03:51:55 -07: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 |
|
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
|
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 |
|
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 |
|
SamGondelman
|
a7d75b121f
|
fix avatarHash crash
|
2018-06-08 11:20:41 -07:00 |
|
Zach Fox
|
d4a19e7bc9
|
Fix MS15721: Delete app.json if installed script isn't running
|
2018-06-08 10:52:14 -07:00 |
|
Atlante45
|
83e1db14cf
|
Set UAL default value earlier to be caught by crashpad
|
2018-06-07 19:40:30 -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 |
|