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

24093 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
619d1ba191 rename to measureAcceleration 2015-04-16 14:09:33 -07:00
Andrew Meadows
1acb90e23a merge upstream/master into andrew/isothermal 2015-04-16 13:48:47 -07:00
Andrew Meadows
b7ca69d4e1 fix typo 2015-04-16 13:46:26 -07:00
Andrew Meadows
5180e7e715 measure linear velocity of moving objects 2015-04-16 13:44:17 -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
Seth Alves
4d1df0f12e Merge pull request #4652 from AndrewMeadows/bispinor 
more consistency of ShapeType for model entities
 2015-04-16 12:32:02 -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
Clément Brisset
3c67c69745 Merge pull request #4651 from ZappoMan/HMDToolsTweaks 
Some small tweaks
 2015-04-16 16:10:43 +02:00
ZappoMan
ffb5ea50b1 expose avatar settings to JS 2015-04-15 17:00:50 -07:00
ZappoMan
1a1fe11111 switch HMD tools hot-key 2015-04-15 17:00:20 -07:00
Andrew Meadows
f09fd226e3 Merge pull request #4649 from birarda/master 
add vim plugin files to gitignore
 2015-04-15 14:27:29 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
Stephen Birarda
faf7850d7c remove plugin specific ignored files 2015-04-15 12:38:24 -07:00
Stephen Birarda
9213561977 add vim plugin files to gitignore 2015-04-15 11:34:59 -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
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