Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 02:04:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24136 commits 76 branches 59 tags 1.2 GiB
Commit graph

24136 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
2f970ae962 Terminate DDE process gracefully 2015-04-15 11:07:00 -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
Ryan Huffman
f8e4ff8072 Update Application:stopAllScripts to skip finished scripts 2015-04-15 09:54:30 -07:00
Brad Hefta-Gaub
6d6b66f19a Merge pull request #4641 from huffman/window-close-quit 
Quit application when main window is closed
 2015-04-15 09:42:52 -07:00
Sam Gateau
5ebbdaca05 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-15 09:00:50 -07:00
Sam Gateau
1046356abb FIx the include that was using the wrong \ in the path... 2015-04-15 09:00:20 -07:00
Brad Hefta-Gaub
a105f579ce Merge pull request #4621 from jherico/oculus_crash 
Attempt to stop the crashing on exit caused by the Oculus SDK
 2015-04-15 08:52:17 -07:00
Brad Hefta-Gaub
348dce86c1 Merge pull request #4645 from Atlante45/generated_ratio 
Generated audio moved to developer script
 2015-04-15 08:46:07 -07:00
Brad Hefta-Gaub
6fbda0e81b Merge pull request #4646 from Atlante45/editors_mute_environment 
Only editor can mute environment
 2015-04-15 08:45:56 -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
92ad0b3fc4 Merge branch 'master' of https://github.com/highfidelity/hifi into editors_mute_environment 2015-04-15 17:30:36 +02:00
Atlante45
604a13f8ad Only editor can mute environment 2015-04-15 17:04:59 +02:00
Atlante45
d2775fe9b3 Fix for people running older version of interface 2015-04-15 16:52:41 +02:00
Leonardo Murillo
3f0d9b7532 Merge pull request #4602 from ctrlaltdavid/20447 
CR for Worklist #20447 - Prepare Interface to include DDE face tracking
 2015-04-15 08:49:31 -06: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
5f9d7a00fa Correct default to pink noise 2015-04-15 16:22:18 +02:00
Atlante45
9ea72f2a03 Added generated audio to developer menu script 2015-04-15 16:16:13 +02:00
Atlante45
c2c1ccc2b7 Remove generated audio options from menu 2015-04-15 15:50:22 +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
Clément Brisset
7b149fe898 Merge pull request #4640 from huffman/fix-spinner 
Fix stuck-spinners in entity properties
 2015-04-15 14:36:59 +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
Brad Hefta-Gaub
aad45fbec4 Merge pull request #4637 from AndrewMeadows/thermonuclear 
fix bug where fly speed is limited to walk speed
 2015-04-14 14:29:09 -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
ZappoMan
174e9f2133 more tweaks to preferences UI 2015-04-14 12:38:29 -07:00
Ryan Huffman
4d34ba7bdf Update main window to quit app when closed 2015-04-14 10:57:47 -07:00
ZappoMan
9262585bab first cut at moving avatar appearance into separate dialog box 2015-04-14 10:38:22 -07:00
Ryan Huffman
b6942e2300 Fix stuck-spinners in entity properties 2015-04-14 10:11:52 -07:00
Sam Gateau
c34c5f6075 adding the Fremabuffer to be used for shadows and main rendering 2015-04-14 08:47:52 -07:00
David Rowe
f509d08378 Handle DDE already running 2015-04-13 23:12:13 -07:00
David Rowe
b7f7cebb80 Handle DDE stopping unexpectedly 2015-04-13 22:41:17 -07:00
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
David Rowe
13c038879d Don't repeat constant values 2015-04-13 17:13:03 -07:00
David Rowe
2c4f049851 Change OSX DDE program path per build system requirements 2015-04-13 17:11:27 -07:00