Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-28 10:17:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24152 commits 23 branches 0 tags 1.2 GiB
Commit graph

8112 commits

Author SHA1 Message Date
Sam Gateau
48364cb598 refined the names of the key light porperties in Stage 2015-04-21 11:04:14 -07:00
Sam Gateau
58c1827f69 bring back the glPushPop in transform legacy mode 2015-04-20 15:56:44 -07:00
Sam Gateau
687ca7fee5 Update the cookies.js to be able to edit and test direction and color, validate that the SunDirection and color and on/off is working 2015-04-17 19:00:40 -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
f1e0d5855e Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-17 11:33:39 -07:00
Sam Gateau
525d1040ed Merge branch 'master' of https://github.com/highfidelity/hifi into yellow 2015-04-17 11:32:35 -07:00
Sam Gateau
edb388ed83 Fixing the function with no implementation 2015-04-17 11:32:05 -07:00
Stephen Birarda
64d17f101a obfuscate set access token from AM log 2015-04-17 10:44:01 -07:00
Clément Brisset
516acee1c7 Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart 
Fix stop/reload all scripts affecting already-stopped scripts
 2015-04-17 16:29:23 +02: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
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
94c6053d52 fix formatting 2015-04-16 12:15:03 -07:00
Andrew Meadows
21d669f2f1 use computed shape type 2015-04-16 12:13:41 -07:00
Andrew Meadows
83d54eb46b merge upstream/master into andrew/bispinor 2015-04-16 12:07:22 -07:00
Sam Gateau
9466cf9345 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-16 10:27:13 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
Sam Gateau
cd1bbb2855 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 10:16:28 -07:00
Sam Gateau
8b97d2585a fixing syntax issues 2015-04-15 10:16:04 -07:00
Brad Hefta-Gaub
72f9ae3e85 Merge pull request #4643 from ctrlaltdavid/fix-auto-start-animation 
Fix auto start animation
 2015-04-15 10:14:26 -07:00
Clément Brisset
d6ee1c708d Merge pull request #4642 from ZappoMan/avatarUI 
New Avatar UI
 2015-04-15 19:13:23 +02:00
Ryan Huffman
2e61ef01da Update ScriptEngin::stop to only take effect when not finished 2015-04-15 09:55:36 -07:00
Sam Gateau
5ebbdaca05 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 09:00:50 -07:00
Atlante45
2f2be70eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio 2015-04-15 17:30:57 +02:00
Atlante45
62d3b39c25 less loud generated noise 
Prevents the audio mixer from muting you because of too much noise
 2015-04-15 16:22:52 +02:00
Atlante45
b1cfd33438 Add generated audio controls to scripting interface 2015-04-15 15:49:47 +02:00
Atlante45
8f8e4d8dc6 Add generated audio methods to audio interface 2015-04-15 15:49:11 +02:00
Atlante45
bd3b25383a Some code cleanup 2015-04-15 14:20:50 +02:00
Sam Gateau
598abe6722 Cleaning up Frambuffer.h 2015-04-14 18:48:06 -07:00
Sam Gateau
9be2a4a9f0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-14 18:29:26 -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
aec42cf2dc enforce ShapeType agreement for ModeEntityItem 2015-04-14 15:39:49 -07:00
Andrew Meadows
8623a0606c remove accidentally commited debug code 2015-04-14 15:39:24 -07:00
Andrew Meadows
5b81b5b11b removing SHAPE_TYPE_CONVEX_HULL from entities lib 2015-04-14 14:56:32 -07:00
Andrew Meadows
7da1c51877 whoops, missed a file 2015-04-14 14:55:42 -07:00
Andrew Meadows
da9091a99d remove SHAPE_TYPE_CONVEX_HULL from libs and tests 2015-04-14 14:54:43 -07:00
Andrew Meadows
9388ae4212 fix warning about unused variable 2015-04-14 14:52:21 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
Triplelexx
722ac46668 Merge branch 'master' into myavatar-targetvelocity 2015-04-14 00:11:10 +01:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation 
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
 2015-04-13 23:57:08 +01:00
Andrew Meadows
86f89a1d6f fix bug where fly speed is limited to walk speed 2015-04-13 13:23:15 -07:00
Sam Gateau
534cbdfab0 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-13 12:22:30 -07:00
Sam Gateau
51ce3129b9 connecting the dots for a framebuffer GLBackend, need to be tested 2015-04-13 12:22:08 -07:00
Sam Gateau
05689c0413 Bringin the Framebuffer to GLBackend and refining the interface 2015-04-13 11:13:30 -07:00
Seth Alves
8479f0d4c1 don't compute shape info until both render and collision geometries are fully loaded 2015-04-13 09:34:38 -07:00