Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 21:18:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
65695 commits 76 branches 59 tags 1.2 GiB
Commit graph

65695 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
cc4726b24b Some bugfixes 2018-03-14 15:47:19 -07:00
Zach Fox
f3efdda6b0 Fix content set filter 2018-03-14 14:34:15 -07:00
Zach Fox
6647475f5c Wrong sign 2018-03-14 11:19:55 -07:00
Zach Fox
74e24ec289 Final touches? 2018-03-14 10:58:18 -07:00
Zach Fox
6d45d69ed8 Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-14 09:54:16 -07:00
Zach Fox
70b3d0fe5f Merge branch 'filterBar' into commerce_upgrades_1 2018-03-14 09:53:02 -07:00
Zach Fox
98cdbbb3e6 Small update to dot before merging in filterBar 2018-03-14 09:45:42 -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
Zach Fox
e2326a3733 Initial work for 'messages waiting' light 2018-03-13 17:05:16 -07:00
Zach Fox
882e4d6b45 Parse the string that comes from the backend 2018-03-13 15:13:41 -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
Zach Fox
7b6b08fd26 Upgrade specific edition 2018-03-13 13:51:10 -07:00
Zach Fox
f42255f46b Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1 2018-03-13 13:42:42 -07:00
Zach Fox
86115a8578 Merge branch 'master' of github.com:highfidelity/hifi into filterBar 2018-03-13 13:42:13 -07:00
Zach Fox
a949208988 Design tweaks 2018-03-13 13:23:32 -07:00
Zach Fox
5563edd957 Focus fix; Switch to QQC2 2018-03-13 13:11:59 -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
Zach Fox
50e709c738 Add updates; drop shadow 2018-03-13 12:13:14 -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
Zach Fox
bce7fb1ff1 Improvements 2018-03-12 16:54:10 -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
Zach Fox
9c7d857ecb Fix some focus issues 2018-03-12 16:15:50 -07:00
Zach Fox
f1121db4da It's working! 2018-03-12 15:54:11 -07:00
Gabriel Calero
3117ec9015 Merge remote-tracking branch 'upstream/master' into android_hifi_audio_codec 2018-03-12 19:44:24 -03:00
Zach Fox
db7eea543e Initial progress 2018-03-12 15:11:09 -07: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