Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 20:16:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
24635 commits 69 branches 56 tags 1.2 GiB
Commit graph

11775 commits

Author SHA1 Message Date
Philip Rosedale
d7cc76e48b Merge pull request #4735 from jherico/menu_fix 
Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events
 2015-05-02 00:35:49 -07:00
Philip Rosedale
0322e64a79 Merge pull request #4718 from ctrlaltdavid/20513 
CR for 20513 - Adapt DDE control of eyes to be predominantly open or closed
 2015-04-30 20:13:59 -07:00
Brad Hefta-Gaub
3477bc5323 Merge pull request #4732 from sethalves/json-skip-default-values 
Json skip default values
 2015-04-30 17:56:24 -07:00
Brad Davis
57b7be3abe Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events 2015-04-30 17:43:16 -07:00
David Rowe
e45ecbe2c8 Merge branch 'master' into 20513 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
	interface/src/devices/DdeFaceTracker.h
 2015-04-30 17:22:35 -07:00
David Rowe
807eab9fc4 Fix typo 2015-04-30 12:59:09 -07:00
Seth Alves
a0ad7a22a6 Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values 2015-04-30 11:28:33 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -07:00
David Rowe
b6890be73d Adjust eyebrow filter strength 2015-04-30 08:06:46 -07:00
David Rowe
42a4fd8884 Add velocity filtering of DDE eyebrows 2015-04-30 07:55:02 -07:00
David Rowe
81e23eab28 Coding standard 2015-04-29 22:15:49 -07:00
Brad Hefta-Gaub
40d2e97d44 Merge pull request #4673 from ctrlaltdavid/20496 
CR for 20496 - Modify lobby.js to work as avatar selector
 2015-04-29 21:51:08 -07:00
Andrew Meadows
5a388a0c14 Merge pull request #4722 from birarda/avatar-mixer-debug 
add option to display AvatarData receive stats with display name
 2015-04-29 10:00:24 -07:00
Brad Hefta-Gaub
7414201845 Merge pull request #4721 from ctrlaltdavid/20514 
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
 2015-04-28 20:44:09 -07:00
Stephen Birarda
f9a25d7089 add Menu option to toggle Avatar receive stats 2015-04-28 18:27:54 -07:00
Stephen Birarda
f2dcacffd0 show avatar data receive rate by default with display name 2015-04-28 18:27:42 -07:00
samcake
ff2b1af18c Merge pull request #4720 from ZappoMan/hackTest 
Fix entities rendering wrong when avatar scale !== 1.0
 2015-04-28 17:30:15 -07:00
Stephen Birarda
404cd67bb7 Merge pull request #4716 from sethalves/assignment-client-exits 
assignment-client shouldn't try to save contents of its nonexistent address bar
 2015-04-28 19:40:44 -04:00
ZappoMan
664d126465 remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit 2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693 dont change camera scale with avatar scale 2015-04-28 16:26:17 -07:00
samcake
85cd6cbff2 Merge pull request #4700 from jherico/vr_menus 
VR menus
 2015-04-28 15:59:46 -07:00
ZappoMan
bfbad539e0 hack test 2015-04-28 14:54:58 -07:00
David Rowe
9576ad19a7 Move "Stereo Audio" option into developerMenu.js 
And rename it "Stereo Input" to better relect what it does.
 2015-04-28 14:14:10 -07:00
Seth Alves
28ad80936a assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address. 2015-04-28 13:21:14 -07:00
David Rowe
1d7420d0dc Adapt DDE control of eyes to be predominantly open or closed 2015-04-28 12:53:11 -07:00
Andrew Meadows
e646ff6847 Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth 
Fix audio-driven mouth viewed by others
 2015-04-28 09:28:22 -07:00
Clément Brisset
bc8f6708b6 Merge pull request #4698 from ctrlaltdavid/fps-facetracker 
Facetracker FPS refactor
 2015-04-28 14:04:17 +02:00
Brad Davis
f49f37ac89 Merge pull request #4670 from thoys/fix-run_one_interface_per_user 
Multiple instances of interface on Windows (one per user)
 2015-04-28 01:22:21 -07:00
Brad Davis
c685874b05 Merge pull request #4705 from birarda/avatar-mixer-throttling 
add macro to recursively correctly handle OS X bundle resources
 2015-04-28 01:19:36 -07:00
Brad Davis
b4e9dbedbc Merge remote-tracking branch 'upstream/master' into vr_menus 2015-04-28 00:28:57 -07:00
Brad Davis
d1d1830b2f Importing peferred dialog look from browser branch 2015-04-28 00:26:24 -07:00
Brad Davis
b0eccc40c2 Fix crash cause when Menu::instance() is before offscreen ui startup 2015-04-27 22:58:09 -07:00
David Rowe
d6eb04c3b0 Fix audio-driven mouth viewed by others 2015-04-27 21:43:57 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
10b5935063 Let QML take care of more of the height/width stuff 2015-04-27 18:11:19 -07:00
ZappoMan
62a421361c fix crash in scripts using useAvatar methods 2015-04-27 16:58:34 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -07:00
Brad Davis
59b8b80148 Merge remote-tracking branch 'upstream/master' into vr_menus 
Conflicts:
	interface/src/Menu.cpp
 2015-04-27 16:02:13 -07:00
Brad Davis
1beaf18d1b Prevent the login dialog from spawning the address bar on enter keys 2015-04-27 16:00:23 -07:00
Brad Davis
fd28baac8c Working on message box and addressbar tweaks 2015-04-27 15:42:20 -07:00
Andrew Meadows
72deb2e49b merge upstream/master into andrew/thermonuclear 
Conflicts:
	libraries/entities/src/EntityItem.h
	libraries/physics/src/EntityMotionState.cpp
 2015-04-27 12:54:21 -07:00
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -07:00
Seth Alves
bdc6bb3c2d Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic 2015-04-27 12:20:58 -07:00
Brad Davis
76ce34a74b Scanning for code style 2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f Tweaking VR menu for PR 2015-04-27 11:35:57 -07:00
Brad Davis
1a912787c2 Merge branch 'ui-refactor' into vr_menus 2015-04-27 11:05:14 -07:00
Brad Davis
a12bfd95f4 Merge remote-tracking branch 'upstream/master' into ui-refactor 
Conflicts:
	libraries/render-utils/src/MatrixStack.h
 2015-04-27 10:59:57 -07:00
Brad Davis
0b1df891af Backporting visual work from branch 2015-04-27 10:53:58 -07:00
Seth Alves
b23427a3c8 hook up menu-items to control debug rendering of collision hulls and owned simulations 2015-04-27 10:32:47 -07:00
Seth Alves
2cdbe8bf7b merge from upstream 2015-04-27 09:57:36 -07:00