Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-08 07:53:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
65083 commits 67 branches 56 tags 1.2 GiB
Commit graph

1168 commits

Author SHA1 Message Date
John Conklin II
48f0cded05
Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting 
Leopoly_Phase1_010 Graphics Scripting
 2018-02-27 07:53:25 -08:00
Atlante45
277e556b48 Create a standard function to init Hifi Apps 2018-02-22 17:06:09 -08:00
SamGondelman
4c6169ec78 merge and a little cleanup 2018-02-20 15:45:34 -08:00
SamGondelman
4f0f6709c1 fix build errors 2018-02-20 13:56:06 -08:00
Andrew Meadows
8231a56b22 pull task out of render and into its own lib 2018-02-13 08:56:11 -08:00
Andrew Meadows
a8ad846f2b cleanup 2018-02-13 08:54:44 -08:00
Andrew Meadows
be38a4bc71 creating workload lib 2018-02-13 08:54:44 -08:00
Sam Gateau
714e3f445d
Merge pull request #11537 from jherico/threaded_qml 
Migrating QML rendering off the main thread
 2018-02-12 15:32:33 -08:00
Sam Gateau
f3918ad216
Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests 
Fix shared unit tests
 2018-02-09 17:18:35 -08:00
Andrew Meadows
64ec4dac7a remove broken DEV_BUILD context 2018-02-07 16:49:42 -08:00
Andrew Meadows
b3452f274e use glm::nan() for platform-agnostic code 2018-02-07 16:49:22 -08:00
Andrew Meadows
f0bb4d3da7 fix API bitrot and remove extra whitespace 2018-02-07 16:48:43 -08:00
Andrew Meadows
572edab79f remove dupe const 2018-02-07 16:48:31 -08:00
Bradley Austin Davis
0455fb37b6 Merge remote-tracking branch 'upstream/master' into fix/shader_length 2018-02-06 15:55:01 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
Bradley Austin Davis
f291715f87 Merge remote-tracking branch 'zvork/scribe' into fix/shader_length 2018-02-06 10:36:15 -08:00
Andrew Meadows
96c97547f9
Merge pull request #12205 from jherico/no_widgets 
Remove some unneeded Qt dependencies
 2018-02-05 15:32:54 -08:00
Bradley Austin Davis
f611990b10 Fix overlimit shader char strings 2018-02-05 15:27:19 -08:00
Olivier Prat
92279b5939 Merged with master 2018-02-05 18:24:05 +01:00
Olivier Prat
ac92b3c130 Merge branch 'master' of http://github.com/highfidelity/hifi into scribe 2018-02-02 14:01:59 +01:00
samcake
062bfbd7b6 Merging with master 2018-01-30 18:33:34 -08:00
Atlante45
bc819c698e Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back 2018-01-30 16:09:30 -08:00
samcake
f078ff611a Refining the declaraion signatures and adding the binary capture 2018-01-30 15:10:52 -08:00
Olivier Prat
5e6300ce46 Merged with master 2018-01-30 09:52:30 +01:00
Brad Davis
0781d8eaf0 Remove some unneeded Qt dependencies 2018-01-28 22:18:24 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -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
Anthony J. Thibault
58d3d8ef3d 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.

(cherry picked from commit a252e90f96)
 2018-01-24 21:14:29 -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
Olivier Prat
95882e0cde Merged with master 2018-01-24 10:51:54 +01:00
Seth Alves
64a55f1393 fix asan build 2018-01-23 20:36:11 -08:00
Brad Davis
d2fe9e2710 PR feedback 2018-01-19 20:24:34 -08:00
Brad Davis
bdfa1273ba Merge remote-tracking branch 'upstream/master' into android 2018-01-18 17:33:10 -08:00
Clément Brisset
956f45b5af
Merge pull request #11932 from birarda/bug/baking-folder-number 
fix sparse rectification for small textures, export for same model at diff URL
 2018-01-18 14:25:33 -08:00
Olivier Prat
efa6a8c0b5 Merged with master 2018-01-17 15:49:46 +01:00
Olivier Prat
49549ced17 Fixed compilation with new shader system 2018-01-17 10:52:58 +01:00
Brad Davis
6a06bf405a Merge remote-tracking branch 'upstream/master' into android 2018-01-16 18:24:44 -08:00
Olivier Prat
3911ce59cc Scribe now outputs .h and .cpp. Need to change how shader source is referenced in C++ code 2018-01-16 19:02:12 +01:00
humbletim
b91d536dd0 rename model:: -> graphics:: 2018-01-16 12:46:16 -05:00
humbletim
08ccda9cfc rename libraries/model(src/model) -> libraries/graphics(src/graphics) 2018-01-16 12:44:44 -05:00
Olivier Prat
cdb94d0832 Merge branch 'master' of git://github.com/highfidelity/hifi into scribe 2018-01-16 16:43:50 +01:00
Brad Davis
1da29862e7 Fix for OSX build 2018-01-15 11:57:06 -08:00
Brad Davis
db30e9c45f Fixing PR builds 2018-01-15 09:47:31 -08:00
Brad Davis
58530c595a Pre-merge cleanup 2018-01-14 19:48:12 -08:00
Brad Davis
c924cbf2a7 Remove explicit gpu-gl dependencies 2018-01-13 12:20:41 -08:00
Sam Gateau
df0660f823 Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles 2018-01-13 01:00:41 -08:00
Brad Davis
ab7aa52a10 GLES emulaton on windows 2018-01-12 19:17:35 -08:00
Olivier Prat
814de4ab81 Scribe now outputs shaders as cpp files. 2018-01-12 11:59:19 +01:00
Anthony J. Thibault
fbea22e0f0 Renamed imag component to dual, using the correct nomenclature 
Also removed incomplete test from unit tests.
 2018-01-08 18:21:23 -08:00
Anthony J. Thibault
532c8a23f9 tests 2018-01-04 16:09:03 -08:00