Commit graph

66944 commits

Author SHA1 Message Date
Cristian Luis Duarte
ffb38eb490 Add hifi scheme for scheme-less addresses 2018-04-12 20:45:35 -03:00
John Conklin II
ec10fcb7b7
Merge pull request #12868 from SamGondelman/missingAlpha
Fix for missing alpha on server restart
2018-04-12 16:42:34 -07:00
Cristian Luis Duarte
20acfdfb82 First Android Go To implementation (from the Home screen) 2018-04-12 20:31:36 -03:00
John Conklin II
5322195eee
Merge pull request #12867 from ctrlaltdavid/21836-a
Fix location.protocol value for serverless domains
2018-04-12 16:28:31 -07:00
Clement
157ca8cd68 Update docs with correct qt version 2018-04-12 16:21:26 -07:00
John Conklin II
3d90f93cf1
Merge pull request #12812 from SamGondelman/compression
Support ETC2/EAC compressed textures
2018-04-12 16:04:08 -07:00
John Conklin II
67a8e6c82e
Merge pull request #12824 from SamGondelman/matFix
Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch
2018-04-12 15:30:11 -07:00
John Conklin II
9123c05eb3
Merge pull request #12859 from samcake/one
Fix a bug when switching shadow on/off in front of mirror
2018-04-12 15:25:05 -07:00
Cristian Luis Duarte
fe3c6cf8d6 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 19:23:59 -03:00
Cristian Luis Duarte
dc3914d6eb Android - new (empty) activity GotoActivity 2018-04-12 19:23:42 -03:00
Anthony J. Thibault
da319b9af6 Changed version constants into a enum class, to fix macosx warnings. 2018-04-12 15:09:01 -07:00
Gabriel Calero
bd4a7ce4fa Hide jump button while moving. Fix jump button right alignment in pixel 2018-04-12 19:02:03 -03:00
John Conklin II
40ae2913eb
Merge pull request #12847 from SamGondelman/clientMat
Fix client-only materials on non-avatars
2018-04-12 14:53:34 -07:00
Stephen Birarda
e2e0a50dd2
Merge pull request #12879 from highfidelity/RC66
RC66 merge back to master
2018-04-12 14:12:59 -07:00
Gabriel Calero
aaaa17be7b Merge branch 'android_goto_splash' of https://github.com/gcalero/hifi into android_goto_splash 2018-04-12 18:00:05 -03:00
Gabriel Calero
476e1cf7ae Adjust UI with pixel perfect precision. Support devices with on-screen bars. 2018-04-12 17:59:38 -03:00
Cristian Luis Duarte
0f39ab0bb9 Android GotoAcitivity is now HomeActivity (leaving the place for the upcoming 'Go To activity' itself 2018-04-12 17:47:58 -03:00
Ken Cooke
2593d224c5 CR feedback 2018-04-12 13:24:31 -07:00
John Conklin II
1834325970
Merge pull request #12788 from sethalves/fix-immediate-last-edited-by
set lastEditedBy in local tree whenever a script adds or edits an entity
2018-04-12 13:02:05 -07:00
John Conklin II
9ccf23ec94
Merge pull request #12866 from birarda/serverless-baked-skybox
RC66: use serverless content with baked skybox and help textures
2018-04-12 12:54:37 -07:00
John Conklin II
e47dca77ec
Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership
entity-server will expire stale simulation ownership
2018-04-12 12:04:52 -07:00
Cristian Luis Duarte
a7328f0934 Fix View not attached to windown manager crash when starting the app in landscape mode on Pixel XL 2018-04-12 15:55:20 -03:00
Sam Gateau
77a27b2be7
Merge pull request #12835 from NissimHadar/speedUp1
ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG
2018-04-12 11:48:09 -07:00
Sam Gateau
0857bf06b6
Merge pull request #12857 from NissimHadar/addMDtoAutoTester
Added recursive creation of MD files.
2018-04-12 11:45:18 -07:00
Seth Alves
46a741be7b
Merge pull request #12068 from vladest/move_to_qqc2
Move to qqc2
2018-04-12 11:26:55 -07:00
Anthony J. Thibault
568af7a072 Fix for avatar recording playback on avatars with many joints
Before this fix, playback of avatar recording frames could overflow the maximum UDP packet size (MTU).
This is playback of a recording was causing all the rotations and translations to be transmitted,
even if the translations were not any different then the avatar default pose.

This explicitly records the rotationIsDefaultPose and translationIsDefaultPose in the recording stream.
This does not break backwards compatibility.
However, it does require new recordings for avatars with large numbers of bones.
2018-04-12 11:24:26 -07:00
Sam Gateau
20ae247185
Merge pull request #12784 from Zvork/zeye
Potential bug correction when constructing eye position from Z-buffer depths in shaders
2018-04-12 11:10:09 -07:00
Simon Walton
a584d67acd Tweaks for clang error and gcc warning 2018-04-12 10:44:41 -07:00
John Conklin II
ef133806be
Merge pull request #12813 from ctrlaltdavid/21826
Fix Controller.getActions(), .getHardware(), and .getStandard()
2018-04-12 10:42:25 -07:00
John Conklin II
b0a88617a0
Merge pull request #12807 from ElderOrb/FB13962
Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)
2018-04-12 10:37:05 -07:00
Dante Ruiz
43b92299d6 changing highlighting percentage 2018-04-12 10:35:29 -07:00
John Conklin II
67b1313fb6
Merge pull request #12669 from ElderOrb/FB13143
Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser
2018-04-12 10:34:58 -07:00
John Conklin II
213c35dab4
Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage
Bugfix for #12759 Overlays.editOverlay not applying subImage property
2018-04-12 10:34:17 -07:00
John Conklin II
7bcaa12c50
Merge pull request #12679 from FlameSoulis/getAnimatationRoles-fix
Typo corrected: getAnimatationRoles to getAnimationRoles
2018-04-12 10:32:09 -07:00
Cristian Luis Duarte
b031c1c070 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_goto_splash 2018-04-12 14:32:07 -03:00
Simon Walton
5c141aa5e9 Add --disableWatchdog command-line option
Watchdog still runs but doesn't abort on timeout.
Also fixes for previous tracing improvements.
2018-04-12 09:28:28 -07:00
Dante Ruiz
74f7a33a74 undo some changes 2018-04-12 09:24:32 -07:00
Dante Ruiz
5fdcd12375 add baking of skyboxes 2018-04-12 09:20:46 -07:00
Seth Alves
32e7e5087e
Merge pull request #12668 from alexiamandeville/marketplace-update
Updating repo script to match marketplace script
2018-04-12 09:20:03 -07:00
Olivier Prat
2adac241d0 Fixed incorrect fragment to eye dir computation in haze 2018-04-12 15:11:10 +02:00
Simon Walton
888fca2127 Qualify getName in task template to satisfy gcc 2018-04-11 18:31:09 -07:00
Simon Walton
adcf991125 Improvements to profiling data capture
Use code-provided task names for profile blocks; record QML URLs for
loadInternal.
2018-04-11 17:36:32 -07:00
NissimHadar
c458b587ac Completed creation of testsOutline.md. 2018-04-11 16:50:27 -07:00
John Conklin II
5c26166bd6
Merge pull request #12841 from SamGondelman/simAssert
Fix asserts on domain switch
2018-04-11 16:02:45 -07:00
David Rowe
c2f0f7ef5f Doc review 2018-04-12 10:54:35 +12:00
Sam Gateau
f355bd86c2
Merge pull request #12783 from samcake/blue
Hack: Adding more budget options for memory texture
2018-04-11 15:46:08 -07:00
Gabriel Calero
865e3a05f1 Move jump button to the right. Adjust position of buttons 2018-04-11 19:33:43 -03:00
Stephen Birarda
2759f3a51c
Merge pull request #12869 from highfidelity/RC66
RC66 merge back to master
2018-04-11 15:11:34 -07:00
David Rowe
7a9e3388fa Merge branch 'master' into 21801 2018-04-12 09:48:51 +12:00
Gabriel Calero
8010fd2420 New view selector behaviour. Update icons 2018-04-11 18:43:39 -03:00