Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 22:13:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63893 commits 71 branches 56 tags 1.2 GiB
Commit graph

63893 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
bac80292a7 Merge remote-tracking branch 'gcalero/android_audio_fixes' into android 2018-02-12 12:13:34 -08:00
Brad Davis
a45fec682d Enable QML on android 2018-02-12 12:11:59 -08:00
Brad Davis
18f2387fa1 Fix windows/android Qt build 2018-02-12 11:20:43 -08:00
Gabriel Calero
a2f6548d1d Make slot declarations non-conditional 2018-02-12 13:45:56 -03:00
Bradley Austin Davis
97c878e4fe Fix Windows android build 2018-02-09 15:06:09 -08:00
Bradley Austin Davis
784cb31484
Merge pull request #12377 from samcake/master-android 
Fixing the forward rendering and more clean up for android
 2018-02-09 10:35:21 -08:00
samcake
4419dfe622 Addressing review comments 2018-02-09 10:02:16 -08:00
Sam Gateau
0e25b7bd35 Fixing the normal map computation 2018-02-08 23:27:12 -08:00
Sam Gateau
f20e1a727e Removing the specular pipeline since we now take care of it with the base shader, remove unused shader include files adding the tone map pass 2018-02-08 23:07:39 -08:00
samcake
b66da1897d improving the forward rendering pass, removing the specular variation and making it defautl 2018-02-08 17:59:07 -08:00
samcake
caacd3e5cf Trying to fix the forwaard rendering 2018-02-07 18:46:47 -08:00
Bradley Austin Davis
fd007e845d Squashed scribe changes 2018-02-07 10:29:29 -08:00
Bradley Austin Davis
6b8bfdb750 Use version IDs in scribe tool downloads 2018-02-06 17:35:00 -08:00
Brad Davis
08e52e5ef3 Fix additional highp 2018-02-02 14:15:21 -08:00
Brad Davis
e3e45e16c1 Disable LOD adjustment on android 2018-02-02 13:46:08 -08:00
Brad Davis
dca3061107 Fix material key on Android 2018-02-02 13:45:24 -08:00
Brad Davis
b1fb4c2d0f Re-enable KTX cache on android 2018-02-02 13:43:46 -08:00
Brad Davis
d087530423 Add nvtt to android build 2018-02-02 13:42:26 -08:00
Brad Davis
3e3a585b92 Fixing compile warnings 2018-01-30 21:54:29 -08:00
Brad Davis
87a41ef176 Force the forward pipelines to setup the lighting data 2018-01-28 14:56:15 -08:00
Brad Davis
07aee1ef68 Ensure the fragment normal is noramlized 2018-01-28 14:55:28 -08:00
Brad Davis
7565e08657 Make ambient light header GLES safe 2018-01-28 14:40:25 -08:00
Brad Davis
29d6813963 Fixing header ordering 2018-01-28 14:39:51 -08:00
Gabriel Calero
a91118027d Remove dead code and extra logs 2018-01-26 18:14:43 -03:00
Brad Davis
f3d451c2ef Fix GLES compilation for shader 2018-01-25 19:33:42 -08:00
Brad Davis
1b35ff9b85 Use a distinct KTX cache location for GLES 2018-01-25 19:32:45 -08:00
Brad Davis
361b767586 Merge branch 'fix/render_config' into android 2018-01-25 14:50:41 -08:00
Brad Davis
ab4e2d99f1 Don't try to set the current directory to a QRC path 2018-01-25 13:04:54 -08:00
Brad Davis
867bb99b51 Fix help screen URL 2018-01-25 13:04:08 -08:00
Brad Davis
d4aef1ea88 Fix URLs in QSS files to use QRC base path 2018-01-25 13:03:42 -08:00
Brad Davis
ac94327ec7 Fix loading of the context overlay information icon 2018-01-25 12:44:55 -08:00
Brad Davis
bde5282541 Fix loading of the render config JSON 2018-01-25 12:43:49 -08:00
Bradley Austin Davis
00538c69cd
Merge pull request #12257 from jherico/source_tree_qml 
Fix resource loading from source tree
 2018-01-25 12:29:24 -08:00
Andrew Meadows
289356dfe7
Merge pull request #12227 from ZappoMan/sendDataDescription 
some settings cleanup
 2018-01-25 11:30:14 -08:00
Brad Davis
3915a2d4ba Fix resource loading from source tree 2018-01-25 11:07:39 -08:00
ZappoMan
cb01bd14b9 Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription 2018-01-25 10:39:43 -08:00
Seth Alves
e3f859329d
Merge pull request #12245 from sethalves/fix-asan-build 
fix asan build
 2018-01-25 10:15:29 -08:00
John Conklin II
5ac2e9da15
Merge pull request #12251 from zfox23/commerce_fixMacSecurityPic 
Fix MacOS Security Pic visibility; fix incorrect button state when changing pic
 2018-01-25 09:42:32 -08:00
John Conklin II
1865432b47
Merge pull request #12180 from Zvork/locallights 
Local lights on translucent objects
 2018-01-25 09:36:58 -08:00
Seth Alves
7c09b210c6
Merge pull request #12253 from hyperlogic/bug-fix/avatar-eye-offset 
Bug fix for incorrect positioned eyes on other peoples avatars
 2018-01-25 07:51:35 -08:00
Anthony J. Thibault
a252e90f96 Bug fix for incorrect positioned eyes on other peoples avatars 
There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer.
A unit test was added to verify that writeBitVector() and readBitVector() are correct.
 2018-01-24 18:58:08 -08:00
Zach Fox
94e1c425ab Fix MacOS Security Pic visibility; fix incorrect button state when changing pic 2018-01-24 17:03:16 -08:00
John Conklin II
049cf43de0
Merge pull request #12242 from hyperlogic/bug-fix/twisted-knees 
Bug fix for twisted knees on some avatars.
 2018-01-24 16:19:49 -08:00
Zach Fox
6f54921cb1
Merge pull request #12236 from zfox23/commerce_fixSecurityImageSelectionClear 
Fix security image index clear after back nav
 2018-01-24 13:43:49 -08:00
Andrew Meadows
a0e07a2c4b
Merge pull request #12232 from luiscuenca/showHelp 
Fix Interface first launch should show help
 2018-01-24 12:11:34 -08:00
MiladNazeri
3da8e5249c
Merge pull request #12226 from kencooke/audio-options-pitch 
Add "pitch" property to allow pitch shifting an audio effect
 2018-01-24 10:38:24 -08:00
Sam Gateau
b27047f1fc
Merge pull request #12244 from NissimHadar/newAutoTester 
Implemented new recursive functionality.
 2018-01-24 09:04:57 -08:00
Zach Fox
6566c5c5e6
Merge pull request #12238 from zfox23/commerce_fixPurchasesFilter 
Fix the text filter in My Purchases
 2018-01-24 08:42:55 -08:00
Olivier Prat
c92a9975ba Merged with master 2018-01-24 09:53:38 +01:00
Seth Alves
64a55f1393 fix asan build 2018-01-23 20:36:11 -08:00