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

56574 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Cake
5b6f6ab84f Trying to fix the getCOnfig from QML... 2017-06-20 00:25:51 -07:00
David Rowe
513e0cd232 Fix import of JSON with parent-child relationships 2017-06-20 16:44:25 +12:00
samcake
03f3a7eefd Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 21:02:07 -07:00
Brad Davis
ded1a1eb02 Prevent cache ejection of textures in use 2017-06-19 21:01:14 -07:00
Thijs Wenker
07fefdcb2f Merge pull request #10748 from samcake/brown 
Fix the local lights issue
 2017-06-20 05:17:18 +02:00
samcake
ba9dbbb4d4 Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me... 2017-06-19 17:34:50 -07:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Zach Pomerantz
497ee3a522 add Audio.inputLevel 2017-06-19 17:07:43 -07:00
Stephen Birarda
3619294761 Merge pull request #10745 from seefo/fb5367 
Added a restart button to domain server settings page
 2017-06-19 16:35:36 -07:00
Stephen Birarda
603c47f0da Merge pull request #10656 from birarda/bug/range-bigger-than-file 
fix ATP range requests for small ktx files
 2017-06-19 16:10:09 -07:00
Stephen Birarda
cf9a97cf10 use length sent by AssetServer to verify asset size 2017-06-19 15:15:45 -07:00
Stephen Birarda
b3824c6a25 Merge pull request #10740 from birarda/feat/replicants 
some cleanup for audio/avatar replicated packet checking
 2017-06-19 15:13:28 -07:00
Zach Pomerantz
7512332104 replace mic-mute icons with red variants 2017-06-19 15:07:28 -07:00
Zach Pomerantz
6adfe34661 make mute red check 2017-06-19 15:07:28 -07:00
seefo
0c7f1cda0f Added a restart button to domain server settings page 2017-06-19 15:01:50 -07:00
Howard Stearns
ddce665613 Merge pull request #10739 from zfox23/spectatorCamera_mergeable_20170619 
Spectator Camera - Mergeable Rendering Components
 2017-06-19 14:55:43 -07:00
Zach Pomerantz
5c0e9e7496 improve wording for MyAvatar.qmlPosition doc 2017-06-19 14:52:32 -07:00
Zach Pomerantz
f0bc080502 fix tab 2017-06-19 14:51:30 -07:00
Brad Davis
8aeeab30e7 Merge pull request #10689 from Atlante45/fix/ktx 
Fix KTX performance problems
 2017-06-19 14:44:52 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Zach Pomerantz
d3d36324c0 play sample output sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
071a8a783c add sample sound 2017-06-19 14:41:01 -07:00
Zach Pomerantz
1bf16c4318 update fonts 2017-06-19 14:41:00 -07:00
howard-stearns
91656a5fe5 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options 2017-06-19 14:22:12 -07:00
Zach Fox
2e215e6544 Fix build problems 2017-06-19 14:04:51 -07:00
Zach Fox
cbdffce88e Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619 2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Brad Davis
ed6620fc51 Merge pull request #10718 from jherico/frame_thread 
Cleanup and refactoring
 2017-06-19 13:31:44 -07:00
Stephen Birarda
3f580031d1 Merge pull request #10742 from seefo/fb5368 
Domain server settings will now tell user if saving will restart DS
 2017-06-19 13:23:15 -07:00
seefo
1619d877d3 Made requested changes to domain server settings.js 2017-06-19 13:21:13 -07:00
howard-stearns
c6d66d439b report and quit command line switches 2017-06-19 12:57:26 -07:00
seefo
705ce4c789 Changed domain server restart/save button behavior to be correct 2017-06-19 12:09:20 -07:00
seefo
3d4b9c82aa Changed indentation to be consistent 2017-06-19 11:56:45 -07:00
seefo
3224bf5af0 Domain server settings will now tell user if saving will restart DS 2017-06-19 11:52:49 -07:00
Matti Lahtinen
82df64d5e7 flyingAllowed to zoneAllowsFlying 2017-06-19 21:44:43 +03:00
Chris Collins
655dbd0703 Merge pull request #10741 from highfidelity/RC-44 
Beta Release 44 - Includes up to Developer Release 6702
 2017-06-19 11:33:58 -07:00
Brad Davis
a004e5fbe8 PR feedback 2017-06-19 11:21:08 -07:00
Brad Davis
a9096aa7f0 Prevent deadlocks from different locking orders in FileCache 2017-06-19 11:21:08 -07:00
Seth Alves
39fb94d76d fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at 2017-06-19 11:21:08 -07:00
Atlante45
c4c6142935 Merge branch 'master' of https://github.com/highfidelity/hifi into fix/ktx 2017-06-19 11:06:51 -07:00
Atlante45
8d45c4da7c Fix comments 2017-06-19 11:02:31 -07:00
Chris Collins
16822720cc Merge pull request #10725 from highfidelity/RC-44 
Beta Release 44 - Includes up to Developer Release 6702
 2017-06-19 10:58:24 -07:00
Brad Davis
f790a9bf5c Merge pull request #10735 from jherico/cache_eject_crash 
Fix for occasional crash on switching domains
 2017-06-19 10:53:34 -07:00
Stephen Birarda
2933a20a0c some cleanup for audio/avatar replicated packet checking 2017-06-19 10:45:33 -07:00
Zach Fox
5245237bb2 Removing unmergeable files before PR 2017-06-19 10:33:22 -07:00
Zach Fox
08eb07242d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-19 10:31:31 -07:00
Brad Davis
1d4b443113 Prevent cache ejection of textures in use 2017-06-19 09:51:11 -07:00
Vladyslav Stelmakhovskyi
9fb947ea3c Merge branch 'master' into fix_audio_qt59 2017-06-19 16:17:31 +02:00
David Rowe
61bb853cdd Fix hand position 2017-06-19 17:26:55 +12:00