Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-16 22:06:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
24055 commits 6 branches 1 tag 1.1 GiB
Commit graph

24055 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
9213561977 add vim plugin files to gitignore 2015-04-15 11:34:59 -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
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
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
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
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
Andrew Meadows
86f89a1d6f fix bug where fly speed is limited to walk speed 2015-04-13 13:23:15 -07:00
Andrew Meadows
fe482b35ff Merge pull request #4635 from sethalves/fix-extents-race 
don't compute shape info until both render and collision geometries are ...
 2015-04-13 10:19:06 -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
Andrew Meadows
f969517ab0 Merge pull request #4633 from Atlante45/master 
Fix ghost avatars
 2015-04-13 08:45:01 -07:00
Andrew Meadows
0a5ae8e7e1 Merge pull request #4610 from thoys/20367 
CR for Job #20367 - Enable getPublicScripts, and getRunningScripts
 2015-04-13 08:42:39 -07:00
Clément Brisset
ccfb912b89 Merge pull request #4632 from ctrlaltdavid/fix-typo 
Fix typo
 2015-04-13 15:59:33 +02:00
Atlante45
809c7919aa Fix ghost avatars 2015-04-13 15:57:36 +02:00
David Rowe
caaf090b87 Fix typo 2015-04-12 13:02:27 -07:00
Philip Rosedale
4ad5a6c138 Merge pull request #4630 from Atlante45/fix_quick_turn 
Fix quick turn
 2015-04-10 13:43:36 -07:00
Andrew Meadows
e9159304d2 Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol 
Acceleration and owner in wire protocol
 2015-04-10 09:07:47 -07:00
Atlante45
910e13edeb Merge branch 'master' of https://github.com/highfidelity/hifi into fix_quick_turn 2015-04-10 17:51:32 +02:00
Atlante45
176f1beb08 Fix camera quick turn 2015-04-10 17:50:41 +02:00
Philip Rosedale
61e6c0461b Merge pull request #4628 from huffman/fix-selection-error 
Fix error in entity properties not showing selections
 2015-04-09 20:52:21 -07:00
Ryan Huffman
5a9ee73476 Fix error in entity properties not showing selections 2015-04-09 20:10:02 -07:00
Philip Rosedale
d24264bd81 Merge pull request #4626 from sethalves/island 
more changes to vhacd tool -- useful for generating hull for low-poly island
 2015-04-09 15:34:48 -07:00
Andrew Meadows
f93ee340fc Merge pull request #4627 from sethalves/no-upper-size-limit-for-collisions 
don't keep large things out of physics engine
 2015-04-09 15:14:39 -07:00
Seth Alves
4ada3fc9a4 don't keep large things out of physics engine 2015-04-09 15:12:51 -07:00