Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 14:07:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
69267 commits 25 branches 0 tags 1.1 GiB
Commit graph

25722 commits

Author SHA1 Message Date
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
Gabriel
cf499ca047
Update Application.cpp 
Remove the mic bar for android
 2018-05-29 16:42:09 -03:00
NissimHadar
5fb7ec7b72 Updated jsdoc 2018-05-29 11:50:23 -07:00
NissimHadar
855084b6d5 Updated jsdoc. 2018-05-29 11:29:59 -07:00
NissimHadar
c49bcbe4e9 Removed "Don't show toolbar in test mode.." as this functionality is available through JS commands. 2018-05-29 11:20:29 -07:00
milad
3455dd296b Vec3 fix 2018-05-29 09:57:10 -07:00
NissimHadar
0af1599b53 Added jsdoc to TestScriptingInterface. 2018-05-29 09:45:03 -07:00
samcake
82503a9e64 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-29 08:59:37 -07:00
NissimHadar
658c0e329f Corrected comment. 2018-05-28 19:57:54 -07:00
David Rowe
a9c4eab099 Fix up JSDoc for Window.takeSnapshot() and related 2018-05-28 12:46:51 +12:00
David Rowe
b31a4d0b64 Add JSDoc stubs for new HifiAbout API 2018-05-28 10:40:42 +12:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
NissimHadar
20d2128a10 Corrected timing bug. 2018-05-25 17:36:55 -07:00
howard-stearns
17be460adf checkpoint 2018-05-25 16:37:06 -07:00
Dante Ruiz
68b18def22 fix copy delete cut paste commands and menus 2018-05-25 15:49:19 -07:00
Dante Ruiz
9a25a74834 fix copy delete cut paste commands and menus 2018-05-25 15:34:17 -07:00
howard-stearns
d30d84f1bd checkpoint that has two ways to do filtering 2018-05-25 15:30:27 -07:00
NissimHadar
00300f4b2f Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-25 15:02:43 -07:00
NissimHadar
87220e501a Don't show tablet in test mode, so that it won't appear in snapshots. Its location is not fixed - this will cause image comparisons to fail) 2018-05-25 15:02:00 -07:00
John Conklin II
eeed3ae82d
Merge pull request #13211 from druiz17/login-fix 
Fixing Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password"
 2018-05-25 11:33:29 -07:00
John Conklin II
1d9f33a637
Merge pull request #13220 from NissimHadar/fixCameraMode 
Correct `Camera.mode` command.
 2018-05-25 10:47:31 -07:00
John Conklin II
82bb664cb3
Merge pull request #13235 from druiz17/fix-qml-crash-v2 
Remove offscreenUi desktop qml object from being a contextProperty for Web3DOverlay
 2018-05-25 10:46:11 -07:00
samcake
051776ab1d Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-25 10:30:45 -07:00
Andrew Meadows
cd568867b2 disable regulation of workload views by default 2018-05-25 08:30:11 -07:00
Andrew Meadows
85beca6b67 tweak to dynamic workload regions regulation 2018-05-25 08:30:11 -07:00
NissimHadar
54b64c59d7 Merge branch 'master' of github.com:highfidelity/hifi into DailyTests 2018-05-25 08:29:09 -07:00
John Conklin II
0d8fb90fa8
Merge pull request #13222 from SamGondelman/mirror 
Fix image and text overlay drifting
 2018-05-25 08:26:33 -07:00
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -07:00
Dante Ruiz
adee5e9ef7 fix crash 2018-05-24 18:02:15 -07:00
Dante Ruiz
e34d67fee4 fix crash 2018-05-24 17:54:53 -07:00
NissimHadar
d01482bf68 Now looks for an actual change in the boom length (vs a change has been requested). 2018-05-24 17:44:39 -07:00
NissimHadar
9ed8c04097 Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode 2018-05-24 17:40:21 -07:00
Clement
19100c9550 Coding Standard 
Spacing
    Self-Sufficient Headers
 2018-05-24 17:30:32 -07:00
samcake
559d436dfa Fixing the merge conflicts 2018-05-24 16:57:10 -07:00
NissimHadar
77d6ea6bec Added hide/show for task bar (Windows only). 2018-05-24 16:48:03 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
howard-stearns
235971f8bf checkpoint 2018-05-24 15:23:45 -07:00
samcake
44a8d880fa Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 14:31:53 -07:00
David Rowe
bc757ddd41 Fix typo 2018-05-25 09:04:06 +12:00
John Conklin II
04bf8f851f
Merge pull request #13219 from samcake/one 
Bringing Evolution to the Job Engine Task library developed in the workload project to master
 2018-05-24 13:30:16 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
55bf70991b cleanup wording and formatting for version in window title 2018-05-24 12:03:03 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00
samcake
40370f860a Merge branch 'workload' of https://github.com/highfidelity/hifi into workload 2018-05-23 17:26:08 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
Andrew Meadows
d50da2babc Merge 'master' into 'workload' 2018-05-23 14:51:05 -07:00
Dante Ruiz
c2ceb48a28 fixing key conflicts 2018-05-23 14:16:05 -07:00
SamGondelman
940b112f62 fix image and text overlay drifting 2018-05-23 11:58:50 -07:00
samcake
5bede45c85 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 11:26:07 -07:00
Wayne Chen
345138f4ff Changing showHidden property to be always true 2018-05-23 10:30:08 -07:00
NissimHadar
e07e716d40 Fixed stupid gcc warning. 2018-05-23 07:35:25 -07:00
NissimHadar
06203d44d8 Correct Camera.mode command. 2018-05-22 17:08:28 -07:00
milad
1a4fa92a29 Merge commit 'refs/pull/13206/head' of https://github.com/highfidelity/hifi into gravprep-redo 2018-05-22 14:33:53 -07:00
Wayne Chen
e3414c320e changing property to alias to reflect folderListModel 2018-05-22 11:03:31 -07:00
Wayne Chen
1774b401c8 allowing file dialogs to show hidden files/folders via showHidden property 2018-05-22 10:24:04 -07:00
Simon Walton
f702374db3 Just have one const for concurrent downloads 2018-05-22 10:16:44 -07:00
Dante Ruiz
5fb08d0d9c fix speech api not showing up 2018-05-21 14:21:21 -07:00
David Rowe
fa54461788 Update some recent JSDoc additions 2018-05-22 08:52:39 +12:00
Alexander Ivash
d659696b60 FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-05-21 13:29:41 -07:00
howard-stearns
fc6bfe9e44 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-21 10:41:45 -07:00
samcake
b4807becb6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 10:41:25 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Sam Gondelman
6eb6a5b767
Merge pull request #13197 from gcalero/your_last_location 
Add "Your Last Location" to Android Home
 2018-05-21 09:28:56 -07:00
David Rowe
6d4f704279 Regularize some JSDoc usage 2018-05-21 09:32:10 +12:00
milad
46efb2b868 merging onto mac 2018-05-19 22:44:18 -07:00
druiz17
bd3a9865bf moving control speech to developer menu 2018-05-19 18:27:28 -07:00
druiz17
f2807e38f9 fix goto shortcut 2018-05-19 17:36:46 -07:00
samcake
3aaa01788c Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-18 17:42:30 -07:00
samcake
36a08fdd84 Friday night end of the day, last compilation.... almost 2018-05-18 17:41:28 -07:00
Dante Ruiz
8a2b54c2b7 fixing mistakes 2018-05-18 17:09:41 -07:00
howard-stearns
d385a255c4 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-18 16:53:08 -07:00
Dante Ruiz
3b59af3ed7 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-18 16:42:31 -07:00
Dante Ruiz
60dd7e49ab making requested changes 2018-05-18 16:41:39 -07:00
Sam Gateau
07f1ab8c98
Merge pull request #13194 from SamGondelman/resolution 
Fix Scale Resolution option
 2018-05-18 15:23:01 -07:00
Dante Ruiz
6eb5a78611 fixing code that breaks andriod build 2018-05-18 10:33:03 -07:00
Andrew Meadows
a9c193b672 merge 'workload-014' into 'workload' 2018-05-18 10:12:04 -07:00
Brad Davis
ae07036f20 Add ideal resource texture memory stat 2018-05-18 09:23:53 -07:00
Dante Ruiz
ea771c2325 make final changes 2018-05-18 09:21:41 -07:00
Liv
40ff3f966f
Merge pull request #13165 from ctrlaltdavid/21872-b 
JSDoc stubs for various APIs
 2018-05-18 09:11:55 -07:00
Gabriel Calero
7a6b7b8ba3 Add Your Last Location in Android Home 2018-05-18 12:26:41 -03:00
Andrew Meadows
a23126a6b2 Merge 'master' into 'workload' 2018-05-18 07:38:02 -07:00