Alexia Mandeville
|
35551f045c
|
Updating with jshint edits
|
2018-03-21 15:35:10 -07:00 |
|
Alexia Mandeville
|
f356de5fdf
|
Updating repo script to match marketplace script
|
2018-03-16 11:51:03 -07:00 |
|
John Conklin II
|
a7dc2cd12e
|
Merge pull request #12645 from sethalves/rename-getpos3
Rename getpos3
|
2018-03-15 10:02:00 -07:00 |
|
Bradley Austin Davis
|
b25beeb10b
|
Merge pull request #12640 from jherico/fix/web_process
Don't leave trash web processes when changing web entity urls
|
2018-03-14 19:40:13 -07:00 |
|
Ken Cooke
|
b1dd63cfd3
|
Merge pull request #12619 from kencooke/audio-src-kernel-128
Improved audio quality for streaming music
|
2018-03-14 18:30:23 -07:00 |
|
Sam Gondelman
|
46bbfc2680
|
Merge pull request #12643 from gcalero/keyboard_crashing
Possible fix for keyboard crash
|
2018-03-14 15:53:17 -07:00 |
|
Gabriel Calero
|
d0f1aa9020
|
Refactor fix for keyboard crash
|
2018-03-14 19:18:42 -03:00 |
|
Seth Alves
|
ee515a44e7
|
Merge branch 'master' of github.com:highfidelity/hifi into rename-getpos3
|
2018-03-14 14:56:50 -07:00 |
|
Gabriel Calero
|
e744edc6a0
|
Possible fix for keyboard crash
|
2018-03-14 18:11:23 -03:00 |
|
Stephen Birarda
|
0c0ce1d6b8
|
Merge pull request #12508 from SimonWalton-HiFi/server-script
Stop server-script URLs when deleted from entity properties (case 11244)
|
2018-03-14 14:01:01 -07:00 |
|
Sam Gondelman
|
815260933a
|
Merge pull request #12642 from gcalero/android_change_default_mode
Change default mode to My View in Android
|
2018-03-14 13:47:16 -07:00 |
|
Gabriel Calero
|
04decfa89c
|
Merge remote-tracking branch 'upstream/master' into android_change_default_mode
|
2018-03-14 16:49:41 -03:00 |
|
Sam Gondelman
|
ba0c273614
|
Merge pull request #12641 from SamGondelman/android
Update gpu-gles based on TAA PR
|
2018-03-14 12:41:24 -07:00 |
|
SamGondelman
|
e59af8892a
|
make same changes to gles backend from taa pr
|
2018-03-14 12:09:59 -07:00 |
|
Brad Davis
|
baa4dc3383
|
Don't leave trash web processes when changing web entity urls
|
2018-03-14 11:38:46 -07:00 |
|
Gabriel Calero
|
884da98466
|
Change default mode to My View (android)
|
2018-03-14 14:50:44 -03:00 |
|
Seth Alves
|
2fd6bc4130
|
rename Mesh api getPos3 to getPos, deprecate but still support getPos3
|
2018-03-14 10:24:44 -07:00 |
|
Sam Gateau
|
2487e34ee8
|
Merge pull request #12633 from SamGondelman/aa
Fix HUD sphere rendering after TAA changes
|
2018-03-14 09:26:25 -07:00 |
|
SamGondelman
|
3b877db992
|
fix hud sphere
|
2018-03-13 14:58:29 -07:00 |
|
John Conklin II
|
a0e2fc3665
|
Merge pull request #12564 from SimonWalton-HiFi/record-avatar-pr
Fixes for missing avatar on record replays
|
2018-03-13 14:10:10 -07:00 |
|
Sam Gateau
|
2dde65d74f
|
Merge pull request #12631 from SamGondelman/aa
Apply TAA to text and web entities/overlays
|
2018-03-13 13:00:42 -07:00 |
|
SamGondelman
|
4adc357534
|
apply taa to text and web entities/overlays
|
2018-03-13 11:57:14 -07:00 |
|
Seth Alves
|
3ee41c71e4
|
Merge pull request #12529 from Atlante45/fix/nvtt-mac
Fix NVTT for mac
|
2018-03-13 11:28:42 -07:00 |
|
John Conklin II
|
5be2f0acc7
|
Merge pull request #12490 from Zvork/taa
Temporal Anti-Aliasing
|
2018-03-13 09:03:50 -07:00 |
|
John Conklin II
|
615c98816f
|
Merge pull request #12620 from ctrlaltdavid/21778
Fix rotation and position of avatar meshes attached to eye joints
|
2018-03-13 08:17:50 -07:00 |
|
Ken Cooke
|
bcf893db18
|
Merge pull request #12586 from kencooke/audio-peakmeters-fix
Fix crash when closing the Audio menu
|
2018-03-13 07:52:37 -07:00 |
|
Sam Gondelman
|
db2b79f4fb
|
Merge pull request #12626 from gcalero/android_hifi_audio_codec
Android hifi audio codec
|
2018-03-12 16:21:21 -07:00 |
|
Gabriel Calero
|
3117ec9015
|
Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec
|
2018-03-12 19:44:24 -03:00 |
|
Bradley Austin Davis
|
f48db825c3
|
Merge pull request #12615 from jherico/fix/ktx_loading
Fix local KTX files never being removed from pending downloads
|
2018-03-12 15:04:40 -07:00 |
|
Sam Gondelman
|
c59d29f4ee
|
Merge pull request #12623 from SamGondelman/android
Android: Fix corruption on startup
|
2018-03-12 15:03:07 -07:00 |
|
John Conklin II
|
7f7d20738a
|
Merge pull request #12553 from vladest/mac_combobox_misplaced
Fix CheckBox on Mac
|
2018-03-12 14:47:39 -07:00 |
|
Ken Cooke
|
c9e253ab14
|
Merge pull request #12621 from ctrlaltdavid/21791
Fix CPU and GPU not throttling when Interface minimized from maximized
|
2018-03-12 14:43:47 -07:00 |
|
MiladNazeri
|
e054f16c46
|
Merge pull request #12526 from ctrlaltdavid/21709
Entities API JSDoc
|
2018-03-12 14:40:09 -07:00 |
|
Gabriel Calero
|
7778ddfdcb
|
Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec
|
2018-03-12 18:33:05 -03:00 |
|
Gabriel Calero
|
25f207a6db
|
Add hifi audio codec in Android build
|
2018-03-12 18:29:57 -03:00 |
|
David Rowe
|
75189e292d
|
Fix OSX / Linux warning
|
2018-03-13 10:22:50 +13:00 |
|
SamGondelman
|
19807676fa
|
whoops
|
2018-03-12 14:19:34 -07:00 |
|
SamGondelman
|
9953e7051f
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-03-12 14:15:31 -07:00 |
|
David Rowe
|
945858876e
|
Use std::vector<> instead of QVector
|
2018-03-13 09:53:25 +13:00 |
|
SamGondelman
|
4bef033d6f
|
cleanup, don't compress rcc file to fix corruption
|
2018-03-12 13:05:03 -07:00 |
|
John Conklin II
|
1c403b7532
|
Merge pull request #12616 from NissimHadar/bug12435
Mitigation of Manuscript issue 12435
|
2018-03-12 12:01:42 -07:00 |
|
Sam Gondelman
|
3c88ae692c
|
Merge pull request #12608 from jherico/fix/android_hifi_icon
Update Hifi icon for android
|
2018-03-12 11:26:57 -07:00 |
|
Olivier Prat
|
aad571f6bd
|
Merge branch 'master' of http://github.com/highfidelity/hifi into taa
|
2018-03-12 14:22:57 -04:00 |
|
Olivier Prat
|
bafd6340a2
|
Removed unused fonts in scripts
|
2018-03-12 14:21:48 -04:00 |
|
John Conklin II
|
5bd49ce9dc
|
Merge pull request #12617 from samcake/punk
Fix shadow: other avatars casting shadow, graphics settings checkboxes & menu layout
|
2018-03-12 10:49:48 -07:00 |
|
John Conklin II
|
8b05973939
|
Merge pull request #12613 from NissimHadar/fixShadowUI
Correct can cast shadow flag being visible on entities that can't cast shadows
|
2018-03-12 10:45:33 -07:00 |
|
Sam Gateau
|
a6a43b90ee
|
Merge pull request #12554 from NissimHadar/addRecursionToAutotester
Pull test images from GitHub
|
2018-03-12 08:59:07 -07:00 |
|
David Rowe
|
5acc605ba0
|
Fix OSX / Linux warning
|
2018-03-12 16:03:31 +13:00 |
|
David Rowe
|
3001225cb7
|
Fix CPU and GPU not throttling when Interface minimized from maximized
|
2018-03-12 15:49:20 +13:00 |
|
Bradley Austin Davis
|
e33539f575
|
Remove unused variable
|
2018-03-10 18:44:24 -08:00 |
|