Wayne Chen
e5a87aa58c
removing unused variables
2018-09-10 16:56:13 -07:00
Wayne Chen
dcacfdba7c
adding popup property to qml
2018-09-10 16:22:55 -07:00
John Conklin II
ae547f8950
Merge pull request #13881 from jherico/feature/no_uniforms
...
Remove all uniforms from our shaders
2018-09-10 15:42:01 -07:00
Wayne Chen
e7616c7d34
added logging + activity logging
2018-09-10 15:06:14 -07:00
Wayne Chen
e721844b10
Merge branch 'master' of https://github.com/highfidelity/hifi into loginOnLaunch
2018-09-10 10:10:16 -07:00
Sam Gateau
983badf80a
Merge pull request #13663 from SamGondelman/lod
...
Enable LOD manager on android
2018-09-08 13:43:36 -07:00
David Rowe
7dba2e6a2e
Merge branch 'master' into M17428-f
2018-09-08 12:45:11 +12:00
Stephen Birarda
adac872a11
clear other avatars in agent on avatar mixer disconnect
2018-09-07 15:04:14 -07:00
Sam Gondelman
57275422f2
Merge branch 'master' into lod
2018-09-07 10:01:26 -07:00
Wayne Chen
ef3449f96d
Merge branch 'interstitial-final-page' of https://github.com/danteruiz/hifi into interstitalMerged
2018-09-06 17:36:47 -07:00
Dante Ruiz
2f9119529a
editing the interstitial page
2018-09-06 17:06:17 -07:00
Anthony Thibault
acc7f1f168
Moved AnimStats into its own qml panels.
...
Added state machine tracking as well.
2018-09-06 16:18:58 -07:00
Dante Ruiz
ec2d89fd25
fixing toolbar disappering
2018-09-06 11:16:58 -07:00
Dante Ruiz
200f6d540a
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-09-06 09:59:51 -07:00
Brad Davis
105a615745
Fix no-ui crashes
2018-09-06 08:59:05 -07:00
Wayne Chen
581aa0c02d
Merge branch 'fly-login-upon-launch' of https://github.com/sethalves/hifi into loginOnLaunch
2018-09-05 20:04:34 -07:00
Sam Gateau
912e0abb0a
Merge pull request #13891 from samcake/black
...
Improving the LOD manager behavior for better scaling
2018-09-05 16:01:09 -07:00
John Conklin II
dc02ff66f5
Merge pull request #13907 from birarda/feat/mixer-trait-state-reset
...
mark and cycle trait instances needing to be sent on mixer reconnect
2018-09-05 12:43:27 -07:00
Seth Alves
1bea6c9ea3
if not already logged in, show login dialog at launch-time rather than connect-to-domain-time
2018-09-05 10:38:12 -07:00
Wayne Chen
2e17140c07
fixing loadServerlessDomain function to be from 404 redirect
2018-09-04 18:24:01 -07:00
Wayne Chen
c47788efe4
merging with dante's PR
2018-09-04 18:00:06 -07:00
Wayne Chen
9e0fa08cf1
adding property to location, updating domain
2018-09-04 17:46:23 -07:00
Wayne Chen
c95cb97b9b
adding working version with networking signals
2018-08-31 19:29:48 -07:00
Stephen Birarda
20912349a4
cycle avatar entity IDs for new avatar mixer
2018-08-31 16:53:58 -07:00
Wayne Chen
b6d23843dd
adding fix to domain redirection URL
2018-08-30 22:32:02 -07:00
Wayne Chen
e3f5f4c55a
Merge branch '404DomainRedirect' of https://github.com/wayne-chen/hifi into 404DomainRedirect
2018-08-30 19:55:51 -07:00
Wayne Chen
82c7495615
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-30 19:41:06 -07:00
Sam Gateau
e0f4c8239e
Merge branch 'master' of https://github.com/highfidelity/hifi into black
2018-08-30 19:16:53 -07:00
Sam Gateau
a7fd35747d
Merge pull request #13896 from AndrewMeadows/workload-feedback
...
Filter timings used in feedback logic for workload region sizes
2018-08-30 19:11:49 -07:00
Wayne Chen
5f43f5b276
adding different method for handling redirect
2018-08-30 17:40:13 -07:00
sam gateau
8179de35b0
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 14:46:40 -07:00
David Back
cee270780b
Merge pull request #13908 from dback2/androidCrashStateVariables
...
Fix Android StateController assert
2018-08-30 13:37:13 -07:00
Sam Gateau
9e2a540bab
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-30 12:12:24 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870
...
Fixup PR13870: Make the feature work in Master
2018-08-30 11:08:23 -07:00
David Back
8b1fcfcce9
fix double windows platform
2018-08-30 10:16:27 -07:00
Dante Ruiz
8c77820e30
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-30 09:45:41 -07:00
Zach Fox
b8cd5dd8b9
Fixup PR13870: Make the feature work in Master
2018-08-29 16:58:19 -07:00
Wayne Chen
eb29c9c4a2
updating with default landing location
2018-08-29 16:53:22 -07:00
Wayne Chen
3810984056
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-29 16:18:16 -07:00
Sam Gateau
349f782697
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-29 16:07:50 -07:00
David Back
96d2ba660c
Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping
2018-08-29 12:05:51 -07:00
Andrew Meadows
f9d14e1351
filter time-cost drivers for region regulation
2018-08-29 11:17:59 -07:00
Sam Gateau
3c0e284e98
Merge branch 'master' of github.com:highfidelity/hifi into black
2018-08-29 08:48:04 -07:00
Wayne Chen
6689c15564
Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect
2018-08-28 19:22:34 -07:00
Sam Gateau
37b4cf6223
Picking pid values
2018-08-28 17:39:35 -07:00
Sam Gateau
0da22db837
Picking pid values
2018-08-28 16:05:57 -07:00
Wayne Chen
8a9ad421e7
adding serverless file + redirection if conn fail
2018-08-28 15:50:14 -07:00
David Rowe
e5c733e7f2
Merge branch 'master' into M17428-c
2018-08-29 08:20:00 +12:00
David Back
b6edb2c9d6
platform states, edit controller mapping, separate mac/win delete
2018-08-27 14:53:13 -07:00
danteruiz
e4293d9ad5
fixing some entity visual problems
2018-08-26 21:50:01 -07:00
Sam Gateau
294fe51fde
Trying to simplify the LOD culling test
2018-08-24 16:48:23 -07:00
Dante Ruiz
af19849a75
fixing merge conflict
2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123
script update and visuallyReady entities
2018-08-24 15:46:39 -07:00
SamGondelman
98d145dc24
fix crash on shutdown in domain with material
2018-08-24 15:19:48 -07:00
John Conklin II
477fba4b15
Merge pull request #13847 from AndrewMeadows/workload-avatars-002
...
workload tracks other avatars and adds/removes from physics simulation accordingly
2018-08-24 12:43:51 -07:00
Andrew Meadows
10d0833c19
use DynamicsWorld::numCollisionObjects instead of our own count
2018-08-23 15:57:54 -07:00
Zach Fox
dddb2141f0
Implement Wallet Security feature - Auto Logout checkbox
2018-08-23 15:45:29 -07:00
Andrew Meadows
777b90bdc0
add 'physics body count' to debug stats
2018-08-23 12:59:28 -07:00
Andrew Meadows
87223946ad
add/remove avatars according to workload region
2018-08-23 12:59:28 -07:00
Andrew Meadows
15665b25e8
give OtherAvatars a proxy in workload
2018-08-23 12:59:28 -07:00
Dante Ruiz
db8e1bdfa3
compile error fix
2018-08-22 16:47:18 -07:00
David Rowe
883479d654
Merge branch 'master' into M17428-c
2018-08-23 10:43:44 +12:00
Dante Ruiz
f5441b2721
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de
revert some changes and fix toolbar issue
2018-08-22 15:20:56 -07:00
John Conklin II
50684f00c8
Merge pull request #13856 from sethalves/dont-squash-delete-events
...
don't squash delete events during shutdown so that QtWebEngine process gets destoryed
2018-08-22 12:44:35 -07:00
Seth Alves
579b2435c2
don't squash delete events during shutdown so that QWebEngine process gets destroyed
2018-08-22 11:04:26 -07:00
Stephen Birarda
3e2d4dc696
fixes and improvments addressing CR comments
2018-08-21 10:53:52 -07:00
Dante Ruiz
b2fb2c7f98
fix build error
2018-08-21 10:45:59 -07:00
Stephen Birarda
e33f349d53
fix flagging for avatar entity update/delete
2018-08-21 10:32:05 -07:00
Stephen Birarda
be7eb57205
handle whitelist avatar URL override via traits
2018-08-21 10:31:14 -07:00
Dante Ruiz
db3d3d3d93
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-21 09:56:59 -07:00
David Rowe
4b12e18c27
Merge branch 'master' into M17428-c
2018-08-21 16:52:30 +12:00
Wayne Chen
acc7d493ec
Merge pull request #13812 from SimonWalton-HiFi/safe-landing
...
Safe landing client-side improvements
2018-08-20 20:36:17 -07:00
David Rowe
8a8bf6dc04
Reduce default size of tablet in HMD mode
2018-08-21 10:49:19 +12:00
John Conklin II
b28aa3951f
Merge pull request #13802 from jherico/feature/scribe_programs
...
Migrating to scribe program descriptors
2018-08-20 14:48:54 -07:00
Simon Walton
a891b74fac
Reset SafeLanding in all cases
...
Also remove unused data member, elevate load priority only
for entities with collisions, handle case of no nearby entities.
2018-08-20 12:31:21 -07:00
Dante Ruiz
2261ad2bcb
clean up the interstitial page
2018-08-20 11:14:48 -07:00
John Conklin II
1edf1b4337
Merge pull request #13555 from SamGondelman/destroy
...
Trying to fix dependency shutdown
2018-08-16 13:14:58 -07:00
John Conklin II
02f53c4ee5
Merge pull request #13808 from dback2/createEntitiesGrabbable
...
Use Create Entities as Grabbable option when adding asset to world
2018-08-16 09:22:23 -07:00
Ryan Huffman
5d44877f56
Fix functionality sometimes getting stuck if window loses focus
2018-08-15 13:32:58 -07:00
John Conklin II
032e67fd8e
Merge pull request #13748 from ElderOrb/FB16831
...
FB16831 qml-related warnings in log
2018-08-14 16:40:07 -07:00
sabrina-shanman
e5cb078133
Merge branch 'master' of github.com:highfidelity/hifi into safe-teleport-target
2018-08-13 14:51:37 -07:00
unknown
8a22d0adc7
set grabbable user data in addAssetToWorldCheckModelSize
2018-08-11 11:04:44 -07:00
Dante Ruiz
75cc1c62c0
mostly done interstitial page
2018-08-10 16:53:34 -07:00
Simon Walton
3c665b7de8
Don't delete sequence numbers outside of range as range may change
2018-08-10 14:40:08 -07:00
unknown
8c185aa04e
fix menu option
2018-08-10 12:13:09 -07:00
unknown
45b9871fdb
when adding asset to world set grabbable
2018-08-10 12:10:49 -07:00
unknown
5641c59f5f
Merge branch 'master' of https://github.com/highfidelity/hifi into createEntitiesGrabbable
2018-08-10 09:49:37 -07:00
Brad Davis
f03370c826
Migrating to scribe program descriptors
2018-08-09 17:58:34 -07:00
Simon Walton
875407b3fe
New approach to physics readiness - now (mostly) working
2018-08-09 16:24:04 -07:00
John Conklin II
59977fe1d3
Merge pull request #13764 from r3tk0n/17249-safe-landing
...
Relocate Avatar Spawn Point from the Hips to the Feet
2018-08-09 12:45:30 -07:00
Simon Walton
4395e1fa26
Safe Landing checkpoint
2018-08-09 11:11:58 -07:00
Dante Ruiz
faa5411757
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-09 08:42:14 -07:00
David Back
8db0711b5b
set grabbable user data in addModelEntity, pass grabbable from asset browser
2018-08-08 16:33:47 -07:00
Simon Walton
88bd4e3d9a
WIP - safe landing infrastructure
2018-08-08 12:32:45 -07:00
Dante Ruiz
a9fd034f09
switching to location api
2018-08-07 16:02:54 -07:00
David Back
a905a76c70
reload script cache with reload content
2018-08-07 11:53:11 -07:00
Dante Ruiz
6a4a56cee3
imporving the interstitial page script
2018-08-06 17:42:21 -07:00
MuteTab
de5c7f6dcd
Change lambda for address manager position getter.
2018-08-06 16:02:00 -07:00
Sam Gondelman
7dd80d0180
Merge pull request #13240 from jherico/feature/glsl_layouts
...
Update shader pipeline, improve mac startup time
2018-08-06 15:30:46 -07:00
SamGondelman
e3756a6dae
Merge branch 'destroy' of github.com:SamGondelman/hifi into destroy
2018-08-06 11:21:51 -07:00
SamGondelman
9806bce403
weak pointers to nodeList
2018-08-06 11:21:32 -07:00
Sam Gondelman
2edefe3209
Merge branch 'master' into destroy
2018-08-06 09:51:14 -07:00
Dante Ruiz
cca76f7022
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-06 08:02:03 -07:00
sabrina-shanman
870940b3a0
Merge branch 'master' into safe-teleport-target
2018-08-03 18:14:43 -07:00
sabrina-shanman
a460cfac29
Do not store physics engine pointer in PickScriptingInterface
2018-08-03 17:55:54 -07:00
Sam Gateau
c1951da2bb
Merge pull request #13737 from jherico/fix/fb16633_a
...
Don't allow Web surfaces created by non-client scripts to access files
2018-08-03 15:25:41 -07:00
Brad Davis
ae8f841912
Shader refactoring for explicit bindings
2018-08-03 14:58:11 -07:00
Brad Davis
d6bcdcde3f
Fix DISABLE_QML behavior
2018-08-03 14:58:11 -07:00
Dante Ruiz
2377626203
exposing physics progress
2018-08-03 10:47:58 -07:00
Dante Ruiz
683b42e35b
Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page
2018-08-03 09:59:35 -07:00
Dante Ruiz
b9cfbfb3be
adding interstitial page file to default sctipts
2018-08-03 09:59:21 -07:00
Alexander Ivash
5a2506e94f
FB16831 qml-related warnings in log
...
fix is based on exposing C++ objects to QML before root object is created (as root object might already require C++ objects)
2018-08-03 17:10:41 +03:00
Brad Davis
3c7f1a0c4b
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-02 15:34:19 -07:00
Dante Ruiz
048196ec6f
disble sending avatar and audio packets during interstitial mode
2018-08-02 11:39:06 -07:00
Simon Walton
88fafc7a1f
Merge pull request #13704 from SimonWalton-HiFi/delay-physics
...
Enable physics after ES indicates all nearby entities received
2018-08-01 18:15:00 -07:00
SamGondelman
1ba28de5b6
try to fix nodelist not getting destroyed
2018-08-01 17:52:27 -07:00
SamGondelman
8a9c27ed92
Merge remote-tracking branch 'upstream/master' into destroy
2018-08-01 16:07:48 -07:00
Brad Davis
4b317a84d8
Don't allow Web surfaces created by non-client scripts to access files
2018-08-01 15:12:45 -07:00
John Conklin II
fd1a431729
Merge pull request #13689 from ctrlaltdavid/M15244
...
Move scriptable caches' APIs into scripting interfaces
2018-08-01 11:50:13 -07:00
John Conklin II
fcf32dbc6b
Merge pull request #13642 from ctrlaltdavid/M13352
...
Fix HMD.mountedChanged() API signal
2018-08-01 11:28:11 -07:00
Dante Ruiz
0b7d6cb720
start interstitial page work
2018-07-31 14:10:19 -07:00
Simon Walton
a320308eaf
Fix sequence number encoding issue
...
Don't mix QDataStream and readPrimitive. Also fix logic
issues in completion check; move new packet type; don't
reset known sent entities upon initial completion;
other reviewer recommendations.
2018-07-31 13:54:22 -07:00
Simon Walton
8c512ec19b
Send spherical view from Interface rather than creating in ES
2018-07-30 18:03:45 -07:00
Sam Gondelman
8201997a16
Merge pull request #13660 from SamGondelman/parabolic
...
Parabolic Picking + Pointers
2018-07-30 10:49:02 -07:00
Simon Walton
be1bbc07c2
Don't wait for (nonexistant) ES when in serverless mode
2018-07-30 10:20:55 -07:00
Simon Walton
2ac6ca3291
Remove old physics-enabling code
2018-07-27 17:32:35 -07:00
John Conklin II
9770331259
Merge pull request #13687 from danteruiz/fix-script-memory-issue
...
Fix ScriptEngine begin held onto after script stopped runnning
2018-07-27 12:31:31 -07:00
Simon Walton
3d390203e2
More fixes for clang & gcc
...
C++14 issues, I think.
2018-07-27 11:34:08 -07:00
Seth Alves
41af82a7f6
Merge pull request #13702 from r3tk0n/17016-flying-settings
...
17016 flying settings
2018-07-27 10:07:13 -07:00
Sam Gondelman
3284f7b9d6
Merge pull request #13654 from huffman/fix/mirror-mode-create
...
Fix computePickRay when in mirror mode
2018-07-27 09:05:58 -07:00
Simon Walton
0cec9a72d6
Implement client-side enable physics once indicated EntityData has arrived
...
Also now use Entity Server Protocol sequence numbers.
2018-07-26 18:10:38 -07:00
r3tk0n
f8c611b1d0
Divorce HMD and Desktop flying settings, implement setters and getters, change loadData and saveData in MyAvatar.cpp
2018-07-26 15:35:12 -07:00
David Rowe
baf88ab508
Revise scriptable resource caches' interfaces
2018-07-26 16:12:16 +12:00
Simon Walton
a15e78a0f4
Missed an identifier change
2018-07-25 17:36:53 -07:00
David Rowe
16e06de9cd
Move scriptable caches into scripting interfaces
...
Removed non-working getResource() API functions.
2018-07-25 22:10:14 +12:00
Simon Walton
47e99cdeac
Initial code for AC side of Enabling Physics plan
...
When interface sets query flag send only entities
close to main frustrum origin, until no more available,
then send unreliabe sequence # reliably.
2018-07-24 16:50:37 -07:00
Dante Ruiz
b750a005cf
fix script memory issue
2018-07-24 16:31:12 -07:00
sabrina-shanman
5ec277e458
Move bullet references in collision pick API to PhysicsEngine
2018-07-24 15:47:49 -07:00
John Conklin II
99c26e6363
Merge pull request #13674 from r3tk0n/16984-CompositorHelper
...
Added _aboutToQuit guard on eventFilter()
2018-07-24 11:37:19 -07:00
MuteTab
52e5bdb360
Added _aboutToQuit guard on eventFilter()
2018-07-23 14:27:38 -07:00
SamGondelman
e9ab2b8f27
enable LOD manager on android
2018-07-20 17:07:49 -07:00
r3tk0n
bc91affa70
Bring this PR inline with RC70.1 PR.
2018-07-20 15:13:44 -07:00
Ryan Huffman
1f259d235d
Fix computePickRay when in mirror mode
...
In mirror mode the view frustum is unaffected - instead we flip the
final image. To compensate for this, we need to flip the x coordinate of
our pick point when picking in mirror mode.
2018-07-19 15:30:11 -07:00
SamGondelman
956c1511b6
Merge remote-tracking branch 'upstream/master' into parabolic
2018-07-19 15:23:25 -07:00
David Rowe
a3e677e64f
Code review
2018-07-20 08:32:21 +12:00
MuteTab
63089df2dd
Re-added missing semi-colon.
2018-07-19 12:42:45 -07:00
MuteTab
a99f9310da
Add first-run checks for flying settings.
2018-07-19 12:41:24 -07:00
sabrina-shanman
f33ee55f9e
Create CollisionPick API
2018-07-19 10:33:21 -07:00
David Rowe
5e624246a8
Fix HMD.mountedChanged() API signal
2018-07-19 13:00:57 +12:00
SamGondelman
845ddda695
parabola-overlay and -avatar intersection, handle case where acceleration == 0
2018-07-17 12:41:03 -07:00
Sam Gondelman
b53772f9ca
Merge pull request #13431 from Cristo86/android_stop_downloads_bg
...
Android - Prevent pending downloads to happen when going back to home
2018-07-12 15:22:56 -07:00
John Conklin II
b59e9f9899
Merge pull request #13582 from Zvork/scale
...
Render Scale Resolution applied only to 3D rendering not HUD
2018-07-12 10:56:03 -07:00
John Conklin II
7ea46e26cf
Merge pull request #13587 from wayne-chen/updateControlsReference-case-9539
...
MS9539: Update Controls Reference pages
2018-07-12 10:53:00 -07:00
John Conklin II
de33ca512f
Merge pull request #13553 from Atlante45/feat/crashpad-mac
...
Add Crashpad to Mac
2018-07-11 19:16:24 -07:00
Wayne Chen
179ba6506e
Adding check for WindowsMR to the showHelp menu
2018-07-11 11:56:14 -07:00
Olivier Prat
703fc20856
Separate scale between 3D rendering and HUD
2018-07-11 12:17:36 +02:00
Olivier Prat
9f4fd47b85
Not using render resolution scale in application and display plugin
2018-07-11 10:11:49 +02:00
Wayne Chen
81aac274ed
Updating controls reference page
2018-07-10 17:34:03 -07:00
SamGondelman
d2699e8e5b
some more attempted cleanup
2018-07-10 10:50:01 -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
Cristian Luis Duarte
be8351dc0d
Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background
2018-07-06 20:43:52 -03:00
Clement
23e5dd0d2c
annotate with fingerprint immidiately
2018-07-06 15:52:30 -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
SamGondelman
7954865141
trying to fix dependency shutdown
2018-07-05 14:34:37 -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
Cristian Duarte
6b5e5702dd
Android - implement pause-resume of requests chain in ResourceCache
2018-07-02 20:05:59 -03: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
Cristian Duarte
6b3a9def7a
Merge branch 'hifi_master' into android_stop_downloads_bg
2018-07-02 17:37:40 -03: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
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
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
