sabrina-shanman
|
f33ee55f9e
|
Create CollisionPick API
|
2018-07-19 10:33:21 -07:00 |
|
John Conklin II
|
81f5631ce9
|
Merge pull request #13386 from ElderOrb/FB13949
AvatarApp
|
2018-07-09 15:20:18 -07:00 |
|
John Conklin II
|
e6801c303a
|
Merge pull request #13432 from SimonWalton-HiFi/avatar-identity-request
Implement AvatarRequestIdentity and use if interface gets unknown avatar data
|
2018-07-09 10:07:19 -07:00 |
|
John Conklin II
|
01610a1520
|
Merge pull request #13559 from wayne-chen/fixCopyAddress-case-16444
Fix AddressManager copyAddress/copyPath functionality
|
2018-07-06 14:11:08 -07:00 |
|
John Conklin II
|
6e13b0e141
|
Merge pull request #13453 from gcalero/web_overlay_android
Support web3d overlays in android
|
2018-07-06 13:02:56 -07:00 |
|
Wayne Chen
|
eb4704620c
|
reverting unintended line from previous debug
|
2018-07-06 11:06:16 -07:00 |
|
Wayne Chen
|
0facbedbbc
|
adding Q_INVOKABLE method for copying to Application clipboard
|
2018-07-06 11:03:58 -07:00 |
|
Alexander Ivash
|
929fec731c
|
remove 'Avatar' top level menu & 'Avatar...' item in settings menu per request from Mukul
|
2018-07-06 21:00:54 +03:00 |
|
John Conklin II
|
7aaf17a3c8
|
Merge pull request #13496 from thoys/feat/interactive-window
InteractiveWindow scripting API
|
2018-07-06 10:58:12 -07:00 |
|
Thijs Wenker
|
1b63dfa20a
|
- OSX fixes (right camera after coming from native window, disappearing content)
- Fix show() to show the window after it was minimized
|
2018-07-06 17:50:48 +02:00 |
|
Wayne Chen
|
3994ec4176
|
adding potential fix - moving methods to Application
|
2018-07-05 17:54:27 -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 |
|
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 |
|
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 |
|
vladest
|
0657992e9c
|
Tablet Asset Server dialog was instantiated twice
|
2018-07-01 19:56:51 +02:00 |
|
Gabriel Calero
|
762e8f4bf0
|
Refactor WebViewActivity using fragment. Try SlidingDrawer.
|
2018-06-29 20:43:58 -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 |
|
Thijs Wenker
|
5029767493
|
InteractiveWindow scripting API
|
2018-06-28 19:04:08 +02: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 |
|
Gabriel Calero
|
e15fc787d3
|
Remove the duplicated AccountManager used for android
|
2018-06-27 19:04:27 -03:00 |
|
Stephen Birarda
|
e90ea82ef5
|
move AddressManager to NodeList thread, fix AccountManager invokes
|
2018-06-27 11:41:37 -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 |
|
Seth Alves
|
dcebbada28
|
fix various crashes-upon-exits
|
2018-06-26 10:08:44 -07:00 |
|
Simon Walton
|
0dca842102
|
Add avatar identity requests to analytics
|
2018-06-22 17:06:33 -07:00 |
|
Andrew Meadows
|
4424a8df11
|
Merge pull request #13303 from highfidelity/workload
workload project part 1
|
2018-06-20 15:39:01 -07:00 |
|
Brad Davis
|
787fb1b9bd
|
Fix crash in display plugin caused by audio device changed
|
2018-06-19 16:13:57 -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
|
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 |
|
Andrew Meadows
|
a18ba36dd2
|
merge 'master' into 'workload'
|
2018-06-18 13:40:08 -07:00 |
|
Andrew Meadows
|
6d422e4678
|
Merge 'master' into 'workload'
|
2018-06-18 10:30:13 -07:00 |
|
Gabriel Calero
|
583c46b3a0
|
Merge remote-tracking branch 'upstream/master' into breakpad_android
|
2018-06-15 21:21:03 -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 |
|
Anthony J. Thibault
|
24689224ce
|
removed redundant machine_fingerprent crashpad annotation.
|
2018-06-15 11:40:45 -07: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 |
|
Anthony J. Thibault
|
84601446bf
|
Add main thread id & machine fingerprint to crashpad annotations
|
2018-06-14 12:57:30 -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 |
|
Clement
|
920263ef49
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2018-06-12 17:00:25 -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 |
|
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 |
|
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 |
|