Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-05 20:39:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55721 commits 76 branches 59 tags 1.2 GiB
Commit graph

55721 commits

This branch
This branch
All branches
Author SHA1 Message Date
howard-stearns
ce2053e3b8 control-0 toggles display, and display itself only toggles when camera is 
on
 2017-06-08 10:41:09 -07:00
howard-stearns
d15657616a comments 2017-06-08 10:40:20 -07:00
howard-stearns
8db81ee5c9 wire up preview vs camera display in scripts 2017-06-07 16:19:36 -07:00
howard-stearns
bc1eb5c4a3 sizing 2017-06-07 16:18:04 -07:00
howard-stearns
51982b1294 display textures in plugins 2017-06-07 14:39:18 -07:00
Zach Fox
d1719fade6 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-07 09:46:04 -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
Howard Stearns
0418622315 Merge pull request #10629 from zfox23/SpectatorCamera_BasicTabletApp 
Spectator Camera: Basic tablet app
 2017-06-06 16:51:26 -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
Zach Fox
cbeea7abc4 Make the camera an avatar entity 2017-06-06 16:37:25 -07:00
Zach Fox
a30b678ecb No more dynamic camera...for now. 2017-06-06 16:27:58 -07:00
Zach Fox
6e9b083be1 Function renaming; turn cam off when changing domains 2017-06-06 15:49:15 -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
Zach Fox
383ef542a1 Remove 'debugSelfie.js'; Change 'HMD' to 'VR headset' 2017-06-06 14:59:26 -07:00
Zach Fox
b50cf6cee6 Quick feedback from Alan 2017-06-06 14:50:01 -07:00
Zach Fox
ca05e3d0b6 Improvements to switch; switch settings persist 2017-06-06 14:17:38 -07:00
Zach Fox
afb7e72b25 Separator; Switch.qml updates; etc 2017-06-06 13:51:07 -07:00
Zach Fox
557d1c65a3 Another checkpoint; added Switch.qml 2017-06-06 11:59:23 -07:00
Zach Fox
9970802142 Another checkpoint 2017-06-06 11:59:22 -07:00
Zach Fox
1fc7094b2c Checkpoint 2017-06-06 11:59:22 -07:00
Zach Fox
e9bb982651 First checkpoint! 2017-06-06 11:59:22 -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
Howard Stearns
7ad940080e Merge pull request #10511 from howard-stearns/spectator-camera-prototype 
Spectator camera prototype
 2017-06-06 09:51:43 -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
NeetBhagat
ae9a928740 Merge branch 'master' into 21255 
# Conflicts:
#	interface/src/Application.cpp
 2017-06-06 19:06:50 +05:30
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
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
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
Ken Cooke
45db8c3bef Rebase optimizations on NVTT 2.1.0 instead of master 2017-06-05 11:18:54 -07:00
howard-stearns
4ccfef9702 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype 2017-06-05 11:18:40 -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
Zach Fox
87fca16e0d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-05 10:48:12 -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
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
Ken Cooke
024499bdc4 Optimized NVTT library with fast gamma conversion 2017-06-04 12:59:15 -07:00
Sam Cake
d38a396e9d Fixing warning 2017-06-03 08:59:47 -07:00
Anthony J. Thibault
7da73d0ff1 teleport.js should still function on avatars with no feet. 2017-06-02 18:01:40 -07:00