samcake
|
727ac91fb3
|
fix warnings and comments
|
2018-03-14 16:11:41 -07:00 |
|
samcake
|
7f8948fcce
|
Merge branch 'workload-master' of github.com:samcake/hifi into workload
|
2018-03-13 10:49:31 -07:00 |
|
samcake
|
f8acca76e2
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
|
2018-03-13 09:31:50 -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 Gateau
|
a2993c7cdb
|
First version wof space working with Transaction & Collection
|
2018-03-13 01:45:21 -07:00 |
|
samcake
|
1af139a4d4
|
FIrst step introducing the Transaction model to access the Proxy of the space
|
2018-03-12 18:01:22 -07:00 |
|
Sam Gateau
|
39edcb649d
|
Merge pull request #12627 from samcake/workload-bis
Workload: Disable drawing Workload view by default
|
2018-03-12 17:50:21 -07:00 |
|
samcake
|
ea9dee1286
|
FIrst step introducing the Transaction model to access the Proxy of the space
|
2018-03-12 17:49:45 -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 |
|
samcake
|
74be67edb1
|
fixing the default state plus upstream master merged again
|
2018-03-12 14:40:09 -07:00 |
|
MiladNazeri
|
e054f16c46
|
Merge pull request #12526 from ctrlaltdavid/21709
Entities API JSDoc
|
2018-03-12 14:40:09 -07:00 |
|
samcake
|
7eaebaf23d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
|
2018-03-12 14:37:58 -07:00 |
|
Andrew Meadows
|
6723a0be4e
|
Merge pull request #12624 from samcake/workload-bis
Workload: Better Freeze view mode in order to debug the Space and View behavior
|
2018-03-12 14:33:35 -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 |
|
samcake
|
b922331b05
|
Address comments from review
|
2018-03-12 13:40:00 -07:00 |
|
samcake
|
3efa92b48e
|
removing comment
|
2018-03-12 13:07:57 -07:00 |
|
SamGondelman
|
4bef033d6f
|
cleanup, don't compress rcc file to fix corruption
|
2018-03-12 13:05:03 -07:00 |
|
samcake
|
b0d1a4d5a3
|
Merge branch 'workload' of https://github.com/highfidelity/hifi into workload-bis
|
2018-03-12 13:03:26 -07:00 |
|
Andrew Meadows
|
e9060ec6e4
|
Merge pull request #12622 from samcake/workload-master
Workload: merge upstream/master
|
2018-03-12 12:41:36 -07:00 |
|
samcake
|
7116d82dc5
|
Merge branch 'workload-master' of github.com:samcake/hifi into workload-bis
|
2018-03-12 12:04:20 -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 |
|
samcake
|
9bec8cdd0b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master
|
2018-03-12 12:01:00 -07:00 |
|
samcake
|
69fe1ace0b
|
THe View rings are rendering corectly, let s ship it
|
2018-03-12 11:59:03 -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 |
|
Sam Gateau
|
9e7260839c
|
Better rendering of the view circles
|
2018-03-12 01:05: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 |
|
David Rowe
|
957d39b0b1
|
Fix rotation and position of meshes attached to eye joints
|
2018-03-11 14:49:23 +13:00 |
|
Sam Gateau
|
e3c8b9c62d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into workload-bis
|
2018-03-09 22:24:58 -08:00 |
|
NissimHadar
|
cb24fe6166
|
Merge branch 'master' of github.com:highfidelity/hifi into addRecursionToAutotester
|
2018-03-09 18:15:03 -08:00 |
|
NissimHadar
|
84cc4c18a4
|
Added date/time to testResultsFolder.
|
2018-03-09 18:13:26 -08:00 |
|
samcake
|
4a7d3e8e0e
|
REndering the view rings better
|
2018-03-09 17:49:50 -08:00 |
|