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

11632 commits

Author SHA1 Message Date
David Rowe
931c46345e Move visibility methods into DiscoverabilityManager 2015-04-17 14:15:50 -07:00
Philip Rosedale
3814fbc0c2 Merge pull request #4658 from ctrlaltdavid/dde-filtering 
DO NOT MERGE - DDE filtering
 2015-04-17 15:41:03 -04:00
David Rowe
ee48024831 Remove uninitialized method reference 2015-04-17 11:31:48 -07:00
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00
David Rowe
c823fcd083 Code tidying 2015-04-17 10:35:48 -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
Clément Brisset
e780d8e482 Merge pull request #4648 from ctrlaltdavid/dde-shutdown 
Terminate DDE process gracefully
 2015-04-17 16:28:32 +02:00
ZappoMan
41e7b75a8d revert mac version of HMD tools back to meta-H 2015-04-16 17:14:18 -07:00
David Rowe
d60ee3b6e2 Add velocity filtering to DDE eyelids 2015-04-16 16:28:22 -07:00
David Rowe
c46f21152f Add velocity filtering to DDE head movement 
Based on filtering code in Faceshift.cpp.
 2015-04-16 15:47:02 -07:00
David Rowe
3e484ee208 Add menu item for enabling DDE filtering 2015-04-16 15:04:25 -07:00
David Rowe
23d56f5bd0 Remove current DDE filtering 2015-04-16 14:51:55 -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
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
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
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
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
Atlante45
2f2be70eb8 Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio 2015-04-15 17:30:57 +02:00
Atlante45
c2c1ccc2b7 Remove generated audio options from menu 2015-04-15 15:50:22 +02: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
2c5201f116 Fix animation not automatically starting at start-up 2015-04-14 16:54:14 -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
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
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
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
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
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
Thijs Wenker
cf403a7ad8 Merge branch 'master' of https://github.com/worklist/hifi into 20367 2015-04-09 23:47:20 +02:00
Thijs Wenker
0cb5ee5bd1 - Scripts JS object renamed to ScriptDiscoveryService. 
- Renamed Example script file for the ScriptDiscoveryService.
- Moved ScriptDiscoveryService functions to the RunningScriptWidget
 2015-04-09 23:46:49 +02:00
samcake
91d6046051 Merge pull request #4622 from jherico/starfield_hack_fix 
Ensure blending is enabled during starfield rendering
 2015-04-09 09:45:14 -07:00