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

55761 commits

This branch
This branch
All branches
Author SHA1 Message Date
humbletim
e25b567ff1 comment-out debug requires, bump back to 60fps 2017-06-19 16:11:18 -04:00
humbletim
1a9db003e5 doppleganger + attachments 2017-06-19 16:01:59 -04:00
humbletim
89ebf4998f relocate/archive original doppleganger mirror into unpublishedScripts/marketplace/doppleganger-mirror 2017-06-19 10:28:56 -04:00
Howard Stearns
5352e85418 Merge pull request #10553 from howard-stearns/do-not-get-stuck-in-floor 
Do not get stuck in floor
 2017-06-07 20:11:38 -07:00
seefo
8d5b90afe7 Merge pull request #10600 from seefo/snapshot 
Added Polaroid Feature to Snapshot
 2017-06-07 17:05:29 -07:00
seefo
26bd6b67ae Final touches to polaroid feature 2017-06-07 16:52:16 -07:00
howard-stearns
9cf027a68c pr feedback 2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
howard-stearns
9b5b352bc7 Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor 2017-06-07 16:21:08 -07:00
Anthony Thibault
0bbbcbba67 Merge pull request #10594 from sethalves/head-controller 
Head controller
 2017-06-07 10:53:13 -07:00
Seth Alves
69520ff3db pull from upstream, code review 2017-06-07 10:28:02 -07:00
Seth Alves
b1c7c251ac Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-07 10:09:46 -07:00
Brad Hefta-Gaub
e5ac3eeea7 Merge pull request #10548 from NeetBhagat/21255 
On Oculus Rift on/off, switch automatically to/from desktop mode
 2017-06-06 18:05:56 -07:00
David Kelly
06527ac0a2 Merge pull request #10611 from davidkelly/dk/4873 
protect _text member of Text3DOverlay with mutex
 2017-06-06 16:50:57 -07:00
Stephen Birarda
d7b1f882c4 Merge pull request #10627 from seefo/readme 
Updated Windows build guide's markdown
 2017-06-06 15:22:26 -07:00
seefo
aa13812e3f Fixed multiline in BUILD_WIN.md 2017-06-06 15:20:26 -07:00
Brad Davis
171d3212fe Merge pull request #10623 from jherico/qml_engine_singleton 
Migrate to single QML engine
 2017-06-06 15:00:43 -07:00
Stephen Birarda
0ccd0d3fd6 Merge pull request #10621 from highfidelity/stable 
Merge Stable back into Master
 2017-06-06 10:39:03 -07:00
seefo
40823bf582 Updated Windows build guide's markdown 2017-06-06 10:11:46 -07:00
NeetBhagat
c3621d7c32 Resolved two issues: 
1) While in HMD mode -> open Tablet -> Click Desktop.  Desktop mode will be on.
2) Menu sync problem while switching modes.
 2017-06-06 22:31:14 +05:30
Seth Alves
ad1ee97324 remove cruft 2017-06-06 09:50:40 -07:00
Andrew Meadows
f1dd5fbb14 Merge pull request #10613 from hyperlogic/bugfix/teleport-with-no-feet 
teleport.js should still function on avatars with no feet.
 2017-06-06 09:33:00 -07:00
Anthony J. Thibault
90d241ca3c Account for avatar scale 2017-06-06 09:10:46 -07:00
seefo
b729707ce7 Removed old comments in SnapshotReview.js 2017-06-06 09:10:25 -07:00
NeetBhagat
ae9a928740 Merge branch 'master' into 21255 
# Conflicts:
#	interface/src/Application.cpp
 2017-06-06 19:06:50 +05:30
Howard Stearns
3de243b093 Include the radius of the sphere at the avatar's feet. 2017-06-05 18:48:11 -07:00
Brad Hefta-Gaub
77a6ecfdaa Merge pull request #10618 from kencooke/nvtt-optimized-gamma 
Optimized NVTT library with fast gamma conversion
 2017-06-05 16:24:09 -07:00
Seth Alves
20c9228050 Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller 2017-06-05 15:53:23 -07:00
Seth Alves
7a276f027f fix orientation used for 3d audio 2017-06-05 15:53:01 -07:00
Seth Alves
9fcc1e15b8 remove some cruft 2017-06-05 15:52:47 -07:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Clément Brisset
67970182aa Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors 
Fix generateBasisVectors() helper
 2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub
51e00b9de9 Merge pull request #10614 from samcake/brown 
Introduce a stencil mask pass in the rendering to optimize HMD
 2017-06-05 14:14:11 -07:00
howard-stearns
91fff7d54d Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-05 13:44:56 -07:00
howard-stearns
d8a5938a75 Merge branch 'do-not-get-stuck-in-floor' of https://github.com/howard-stearns/hifi into do-not-get-stuck-in-floor 2017-06-05 13:32:47 -07:00
Seth Alves
dcbd279bd8 Merge pull request #10589 from vladest/create_in_landscape 
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
 2017-06-05 12:46:03 -07:00
Seth Alves
3ab67cf27e fix forward gaze in HMD while not looking at anyone 2017-06-05 11:44:27 -07:00
Seth Alves
c83549a679 Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-05 11:36:28 -07:00
Seth Alves
5eb902179f Merge branch 'master' of github.com:highfidelity/hifi into head-controller 2017-06-05 11:36:16 -07:00
Ken Cooke
45db8c3bef Rebase optimizations on NVTT 2.1.0 instead of master 2017-06-05 11:18:54 -07:00
Andrew Meadows
85a1e1d691 Merge pull request #10608 from ctrlaltdavid/21379 
Fix icon for polylines in entities editor properties page
 2017-06-05 11:06:23 -07:00
Andrew Meadows
793ed1313d change variable name for more readable code 2017-06-05 10:30:52 -07:00
Chris Collins
6cc6cd3bf6 Merge pull request #10604 from highfidelity/RC-42 
Beta Release 42 - Includes up to Developer Release 6626
 2017-06-05 09:13:19 -07:00
Seth Alves
27669d44a7 in deriveBodyFromHMDSensor, avoid using invalid head pose 2017-06-05 08:58:40 -07:00
Andrew Meadows
6970576bb8 use helper constants in helper code 2017-06-05 08:54:05 -07:00
Andrew Meadows
205e5d7309 add unit tests and fix final bugs 2017-06-05 08:54:05 -07:00
Andrew Meadows
506f522802 use correct format for float literals 2017-06-05 08:54:05 -07:00
Andrew Meadows
1621d31a8e cleanup usage of GLMHelpers::generateBasisVectors() 2017-06-05 08:54:05 -07:00
Andrew Meadows
81764f0f71 fix GLMHelpers::generateBasisVectors() 2017-06-05 08:54:05 -07:00
Andrew Meadows
347104204e fix StorageTests on linux 2017-06-05 08:54:05 -07:00