Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-21 12:20:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
26077 commits 72 branches 59 tags 1.2 GiB
Commit graph

1078 commits

Author SHA1 Message Date
Sam Gondelman
4c83c6918d fixed avatar billboards not displaying 2015-05-29 16:44:16 -07:00
David Rowe
ff7b2016b4 Add option to auto mute microphone after lose face tracking 2015-05-14 08:50:43 -07:00
Brad Hefta-Gaub
77019eafa7 Merge pull request #4831 from jherico/plugins_pt2 
Display plugins part 2
 2015-05-13 20:40:33 -07:00
Bradley Austin Davis
a0097bcff8 Fixing offscreen rendering on retina display, even without a proxy window 2015-05-13 12:26:46 -07:00
Brad Davis
abab54aed8 Working on display plugins 2015-05-11 13:08:53 -07:00
Seth Alves
ead200b77a remove unneeded code 2015-05-11 12:03:10 -07:00
Seth Alves
de9e74a725 put max-octree-pps in Application rather than in the Octree 2015-05-11 12:01:13 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Brad Hefta-Gaub
bfb2b278ee Merge pull request #4791 from jherico/scale 
Fixing scale resolution issues
 2015-05-08 15:54:24 -07:00
Bradley Austin Davis
0751443a01 Merge branch 'master' into scale 2015-05-08 15:03:24 -07:00
Bradley Austin Davis
c31d36be59 Fixing scale resolution issues 2015-05-07 12:01:56 -07:00
Seth Alves
fe06ce2931 pull from upstream 2015-05-06 14:31:22 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Seth Alves
238a41f2b9 pull from upstream 2015-05-06 11:22:18 -07:00
David Rowe
1c21874f00 Make face tracker mute action start / stop face tracker 2015-05-05 16:51:31 -07:00
David Rowe
35dbb9491c Merge branch 'master' into 20518 2015-05-05 13:13:49 -07:00
Seth Alves
8aafce6382 Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1 2015-05-05 12:53:28 -07:00
Andrew Meadows
aa5a59c3dc merge upstream/master into andrew/nova 
Conflicts:
	libraries/entities/src/EntityItem.cpp
	libraries/physics/src/PhysicsEngine.cpp
 2015-05-05 10:24:17 -07:00
ZappoMan
77232e35f8 Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones 2015-05-04 17:16:33 -07:00
ZappoMan
4561c59203 wire up zone to environment atmosphere rendering 2015-05-04 13:49:43 -07:00
Sam Gateau
c7153bcc14 fixing commetns from review 2015-05-04 10:40:11 -07:00
Sam Gateau
c9b296693c bringing the UserInputMapper to the application 2015-05-03 15:45:19 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Andrew Meadows
0a102575ee fix simulation ownership infection 2015-05-01 16:56:00 -07:00
David Rowe
528f73897c Make double click face tracking toggle button reset tracking 2015-04-30 23:14:23 -07:00
David Rowe
d053379831 Add "Mute Face Tracking" menu item 2015-04-30 23:14:21 -07:00
Andrew Meadows
087d0a027d merge upstream/master into andrew/nova 2015-04-28 10:07:49 -07:00
Andrew Meadows
34974272af proposal for PhysicsEngine API in Application 2015-04-28 10:06:05 -07: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
99a6e1f86c Breaking up offscreen UI work 2015-04-24 13:21:21 -07:00
Brad Davis
c4d2bd2cda More coding standard fixes 2015-04-22 19:18:09 -07:00
Brad Davis
7a33474245 Merge remote-tracking branch 'upstream/master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-21 13:02:38 -07:00
Thijs Wenker
85e9a794a3 ability to run multiple interfaces on single Windows machine by switching user accounts (or using run as) 2015-04-21 03:58:39 +02:00
David Rowe
6b085ca668 Move method out of Menu class 2015-04-17 10:53:04 -07:00
Brad Davis
ce6b7e7aec Merge branch 'master' into offscreen 
Conflicts:
	interface/src/Menu.cpp
 2015-04-16 14:02:40 -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 Davis
1563b05278 Merge branch 'master' into offscreen 2015-04-15 10:01:15 -07:00
Brad Davis
d14d5f3d29 Working on new-UI implementations of address bar and login 2015-04-15 00:36:04 -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
David Rowe
3b6a35c38f Merge branch 'master' into 20447 2015-04-13 17:22:34 -07:00
Atlante45
a3f8076641 Quit VRMode before aboutToQuit runs 2015-04-06 17:55:48 +02:00
David Rowe
00f5469fa8 Add menu item that resets DDE tracking 2015-04-04 17:31:32 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
ZappoMan
aaf191b6dc first cut at new avatar preferences UI 2015-04-03 14:31:43 -07:00
David Rowe
49de54de48 Use improved WebWindowClass for friends window 2015-04-01 18:58:59 -07:00
David Rowe
96e888864a Merge branch 'master' into 20422 2015-04-01 14:56:48 -07:00
David Rowe
e519928320 Move friends window to own class 2015-04-01 11:38:32 -07:00
David Rowe
e06f28b7c5 Merge branch 'master' into 20422 
Conflicts:
	examples/users.js
	interface/src/Application.cpp
 2015-03-31 21:01:54 -07:00
ZappoMan
d68143675a first simple pass at using marketplace windows in preferences 2015-03-31 16:24:27 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00