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

416 commits

Author SHA1 Message Date
Brad Davis
d0af5580c8 Fix mouse wheel and clickthrough bugs in offscreen UI 2015-04-23 10:28:03 -07:00
Brad Davis
de179256d3 Kill all the whitespace 2015-04-22 20:19:19 -07:00
Brad Davis
eab4ad9ea9 More coding standard stuff 2015-04-22 20:16:41 -07:00
Brad Davis
44efcdf82a More coding standard 2015-04-22 20:08:49 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
8d8c4babba Coding standard fixes 2015-04-22 19:06:22 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Sam Gateau
58c1827f69 bring back the glPushPop in transform legacy mode 2015-04-20 15:56:44 -07:00
Brad Davis
16efa2a46f Improving toggle visibility and loading behavior 2015-04-17 16:59:04 -07:00
Sam Gateau
11879f6142 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 13:04:00 -07:00
Sam Gateau
edb388ed83 Fixing the function with no implementation 2015-04-17 11:32:05 -07:00
Bradley Austin Davis
4b73481604 Respond to changes in the device pixel ratio in the test window 2015-04-17 10:19:31 -07:00
Brad Davis
fd0c130dc2 Working on simplifying new dialog creation 2015-04-16 22:20:49 -07:00
Bradley Austin Davis
759acfa175 Working on getting the offscreen UI working on retina 2015-04-16 19:30:31 -07:00
Sam Gateau
b5b146b81b Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution 
Expose these to javascript
 2015-04-16 17:35:37 -07:00
Sam Gateau
3872c01340 Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-16 14:38:18 -07:00
Sam Gateau
f06556ba12 migrate the various list to sort the rendering from explicit names to a more generic key based map 2015-04-16 14:37:39 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -07:00
Brad Davis
d72bb71030 Merge pull request #4636 from samcake/orange 
Introduce the gpu::Framebuffer and its sidekick the gpu::Swapchain
 2015-04-16 13:39:04 -07:00
Andrew Meadows
83d54eb46b merge upstream/master into andrew/bispinor 2015-04-16 12:07:22 -07:00
Bradley Austin Davis
36ca9132cc More build failure fixes 2015-04-16 01:02:13 -07:00
Bradley Austin Davis
f700607a65 Working on OSX functionality 2015-04-15 23:08:55 -07:00
Brad Davis
aba2b395a6 Working on testing the QML ui 2015-04-15 12:35:30 -07:00
Sam Gateau
cd1bbb2855 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 10:16:28 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -07:00
Sam Gateau
fec52f6b10 Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly 2015-04-14 18:27:24 -07:00
David Rowe
85e5216fc1 Condense logic 2015-04-14 16:54:29 -07:00
David Rowe
2c5201f116 Fix animation not automatically starting at start-up 2015-04-14 16:54:14 -07:00
Sam Gateau
87030236cb working version with the gpu::SAmpler and the gpu::Framebuffer 2015-04-14 15:53:24 -07:00
Andrew Meadows
9388ae4212 fix warning about unused variable 2015-04-14 14:52:21 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
Clément Brisset
36631dd3a3 Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting 
CR for Animation fixes
 2015-04-09 11:39:13 +02:00
Sam Gateau
ad9129b552 Fixing all the shaders for entities to work correctly with the now supported color attribute field 2015-04-07 14:26:45 -07:00
David Rowe
43a130dabe Fix Stop button not working at the end of a non-looped animation 2015-04-07 14:02:42 -07:00
Sam Gateau
f0efade06d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1 Merge branch 'temp1' of https://github.com/samcake/hifi into orange 2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9 Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly 2015-04-07 11:20:55 -07:00
Sam Gateau
88afb3cedc solution to the color attribute case 2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Sam Gateau
dee651069c adding support for color attribute in FBX, and displaying it correctly 2015-04-06 23:33:13 -07:00
Seth Alves
cd5245d0d6 logging group for render-utils 2015-04-06 18:16:01 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
Sam Gateau
4aa695d5f3 fixed an issue with skinned normaled map models not doing the correct transformation 2015-04-06 12:24:01 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41 COmmented the review questions in code 2015-04-06 10:03:47 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Sam Gateau
17743c6013 FIxed the broken shadows 2015-04-03 17:58:21 -07:00