Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 23:00:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
56104 commits 25 branches 0 tags 1.1 GiB
Commit graph

56104 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
f884de87ad Merge pull request #10637 from highfidelity/RC-42-Hotfix 
Build 42.1 Hotfix Update server-console to watch interface via pid rather than marker
 2017-06-07 19:05:40 -07:00
samcake
3664655512 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-06-07 17:43:50 -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
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
samcake
1b45276de2 Adjust the preview to avoid seeing the masked pixels in HMD mode 2017-06-07 15:55:38 -07:00
Ryan Huffman
2146f96091 Replace static use of qApp with QCoreApplication 2017-06-07 15:33:44 -07:00
Ryan Huffman
f10f717ea2 Add clarifying comment to use of kill in isProcessRunning 2017-06-07 15:33:37 -07:00
Ryan Huffman
3888385a72 Remove the runningMarker timer 2017-06-07 15:33:29 -07:00
Ryan Huffman
ccd473ad0c Remove shutdownWatcher option inside sandbox 2017-06-07 15:33:22 -07:00
Ryan Huffman
37321814b6 Rename watchProcessShutdown to shutdownWith 2017-06-07 15:33:16 -07:00
Ryan Huffman
34630f839f Fix isProcessRunning error in strict mode 2017-06-07 15:33:09 -07:00
Ryan Huffman
a654bfa692 Update server-console to watch interface via pid rather than marker 2017-06-07 15:33:02 -07:00
Liv
c3bf915fd4 Changing loop to avoid unused warnings 2017-06-07 15:04:39 -07:00
howard-stearns
51982b1294 display textures in plugins 2017-06-07 14:39:18 -07:00
seefo
99e9e10882 Made requested changes to OvenCLI constructor 2017-06-07 11:36:56 -07:00
Anthony J. Thibault
606c6415ae Merge branch 'master' into feature/spine-spline 2017-06-07 10:53:46 -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
Zach Fox
d1719fade6 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-07 09:46:04 -07:00
Mohammed Nafees
608becef7d Make the back button work again, uses the browser history directly now. 2017-06-07 15:52:06 +05:30
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
samcake
bac66ee4c7 Introducing the renderview task 2017-06-06 18:00:41 -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
seefo
a3d2fa2630 Made requested changed to Oven CLI 2017-06-06 16:13:18 -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
seefo
46400f4122 Cleaned up oven CLI 2017-06-06 15:05:26 -07:00
Bradley Austin Davis
b4bbf98fe3 Suppress TBB warnings 2017-06-06 15:02:16 -07:00
Bradley Austin Davis
fc6a278217 Fixing dangling thread issues, consolidating thread management 2017-06-06 15:02:16 -07:00
Bradley Austin Davis
a36727732f Fix bad initializer 2017-06-06 15:02:16 -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
Bradley Austin Davis
30c86ff321 Attempt to resolve Tablet scripting interface deadlocks 2017-06-06 14:58:56 -07:00
seefo
9bc1bc47a2 Added CLI to Oven tool 2017-06-06 14:57:42 -07:00
Zach Pomerantz
d416464b62 add Audio to tablet context 2017-06-06 17:55:19 -04:00
Zach Pomerantz
67288528da add Audio.context 2017-06-06 17:55:06 -04:00
Zach Pomerantz
2b99f299c8 testing 2017-06-06 17:54:52 -04: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