Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 00:33:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
57167 commits 25 branches 0 tags 1.1 GiB
Commit graph

23605 commits

Author SHA1 Message Date
Olivier Prat
b68ec4f933 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 22:36:52 +02:00
Andrew Meadows
4f75558b49 Merge pull request #10963 from sethalves/fix-sort-joints 
put result of Avatar::getJointNames back in index-order
 2017-07-13 12:44:32 -07:00
Seth Alves
59d88cb564 Merge pull request #10941 from sethalves/audio-injector-smart-pointers 
Audio injector smart pointers
 2017-07-13 11:00:02 -07:00
Olivier Prat
4d5f2ebdfe Removed unused variable that prevented build on Linux 2017-07-13 18:45:08 +02:00
Olivier Prat
96f0c35b79 Yet some more compilation fixes for Mac and Linux 2017-07-13 18:22:18 +02:00
Olivier Prat
93218da473 Fixed compilation errors on Mac and Linux 2017-07-13 17:51:16 +02:00
Olivier Prat
736ecf0082 Fixed infinite recursion in collectMetaSubItems due to meta sending itself as sub-item 2017-07-13 14:43:41 +02:00
Olivier Prat
21a11d72c4 Added define to activate/deactivate transition support (fade) in Scene 2017-07-13 12:44:26 +02:00
Olivier Prat
53a92c1506 Fade edit is working again and time based transitions are garbage collected 2017-07-13 12:31:10 +02:00
Olivier Prat
4081cd2cbf Merge branch 'fader' of http://github.com/samcake/hifi into fade 2017-07-13 11:19:28 +02:00
Olivier Prat
edcfecd5d4 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-13 11:05:14 +02:00
Olivier Prat
2d2722bfc5 Added async transition query on scene 2017-07-13 11:05:04 +02:00
Sam Gateau
1557b985c4 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2017-07-13 09:30:33 +02:00
Sam Gateau
b065b99b0b fix linux compilation maybe 2017-07-13 09:30:04 +02:00
Seth Alves
85d0b68284 try again on putting result of Avatar::getJointNames in index order 2017-07-12 20:36:37 -07:00
Seth Alves
44de1dd2be put result of Avatar::getJointNames back in index-order 2017-07-12 19:25:39 -07:00
Seth Alves
06618e81d0 remove unneeded <> 2017-07-12 13:14:32 -07:00
Seth Alves
59ad3d50ec Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-12 12:45:58 -07:00
Seth Alves
ddf2312dc6 code review 2017-07-12 12:45:52 -07:00
Stephen Birarda
f6d9a79fb5 Revert "Revert "fix for invisible avatars after radius ignore"" 2017-07-12 10:36:53 -07:00
Olivier Prat
0f60cca617 Merged cleaned up fader branch from Sam 2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672 Cleaning up changes, removing comments and dead code etc... 2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
Seth Alves
b556ddc0ef remove unneeded AudioInjectorPointer constructor 2017-07-12 07:24:19 -07:00
Sam Gateau
49779754ff Remove unecessary shaders and apply the custom shader pipeline to polyvox 2017-07-12 15:50:06 +02:00
Sam Gateau
258f1654f2 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2017-07-12 14:14:27 +02:00
Sam Gateau
98cc8c0683 Refining the custom shader pipeline design and registration mechanism 2017-07-12 14:13:58 +02:00
Seth Alves
084a989a7a stopAndDeleteLater is now just stop 2017-07-11 21:21:42 -07:00
Seth Alves
3897ab2723 don't call deleteLater on smartpointered object 2017-07-11 20:16:00 -07:00
Seth Alves
972dc4d1b2 more const ref 2017-07-11 19:56:34 -07:00
Seth Alves
c52e7e180a use const AudioInjectorPointer& in some places 2017-07-11 19:42:03 -07:00
Seth Alves
81489ea6c4 use QEnableSharedFromThis 2017-07-11 18:44:37 -07:00
Seth Alves
dbd46fc4b8 Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers 2017-07-11 17:48:29 -07:00
Seth Alves
0b2f13dacc don't use deleteLater on smartpointered object 2017-07-11 17:07:44 -07:00
Seth Alves
59c586bc5d remove unused code 2017-07-11 16:58:19 -07:00
Seth Alves
3c8c87cff5 i hate you, milkman dan 2017-07-11 16:48:28 -07:00
Andrew Meadows
782155e9ea Merge pull request #10876 from Atlante45/fix/ac-crash 
Fix AC crash (buffer overflow)
 2017-07-11 14:26:08 -07:00
Seth Alves
3670a04d8e switch bare pointers to AudioInjector objects to be QSharedPointers 2017-07-11 14:24:58 -07:00
Olivier Prat
7552cca316 First alpha version of bubble collision fade events. Missing a lot of information. 2017-07-11 19:26:15 +02:00
Olivier Prat
381e0c64a8 Working avatar fade in / fade out except that it is also triggered on bubble collisions 2017-07-11 16:43:27 +02:00
Olivier Prat
aba8be595e Separated fade categories from transition event types 2017-07-11 11:37:24 +02:00
Sam Gateau
1f2f539507 Merge branch 'orange' of https://github.com/samcake/hifi into hobbes 2017-07-11 10:26:26 +02:00
Atlante45
c32f4ab0d3 CR 2017-07-10 14:24:53 -07:00
Seth Alves
9b5dfc8d3a Merge pull request #10929 from druiz17/luanch-crash-fix 
Fixed crash when launching interface from fresh install
 2017-07-10 11:31:59 -07:00
Andrew Meadows
ab6f615f96 Merge pull request #10910 from Atlante45/fix/audio-mixer-crash 
Fix Audio Mixer crash
 2017-07-10 09:55:44 -07:00
Dante Ruiz
cc86cda737 Merge branch 'master' of github.com:highfidelity/hifi into luanch-crash-fix 2017-07-10 17:49:20 +01:00
Dante Ruiz
75e1b265d5 comment out code that causes a crash on launch from fresh install 2017-07-10 17:48:53 +01:00
Andrew Meadows
96b88dccd7 Merge pull request #10913 from samcake/orange 
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
 2017-07-10 09:46:09 -07:00
Olivier Prat
9758a6ded0 Edition picking again (but without bounding box highlighting) 2017-07-10 17:57:02 +02:00
Sam Gateau
746812ff78 Merging with origin orange 2017-07-10 17:25:13 +02:00