Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 16:33:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
56559 commits 75 branches 59 tags 1.2 GiB
Commit graph

2648 commits

Author SHA1 Message Date
Patrick Manalich
6d0b853668 Comment structure changes for compacting 2017-06-27 14:34:01 -07:00
Patrick Manalich
1ce6be7d63 Additional commentation and setting z dimension to 0 2017-06-27 10:36:39 -07:00
Patrick Manalich
839a504d01 Revision after code review from zach 2017-06-26 17:05:35 -07:00
Patrick Manalich
75b449c778 Preview centered inside glass pane 2017-06-26 15:06:27 -07:00
Patrick Manalich
2ecf0ed061 Preview scaled correctly without backdrop 2017-06-26 15:06:27 -07:00
Patrick Manalich
4d6ba306ff Preview scaled correctly with backdrop 2017-06-26 15:06:27 -07:00
Patrick Manalich
495fa1d9ba Overlay updates with resize (vertical not adjusted) 2017-06-26 15:06:27 -07:00
Patrick Manalich
057e883111 Changing window size while in monitor display 2017-06-26 15:06:27 -07:00
Zach Fox
8bb105a112 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-22 15:29:03 -07:00
Brad Hefta-Gaub
7668fbb7a0 Merge pull request #10755 from seefo/fb5278 
Fixed an issue where toolbar buttons duplicated themselves when reloading scripts
 2017-06-22 13:35:05 -07:00
Zach Fox
af3c249ae5 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-21 17:16:10 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level 
Update chrome for the audio input level meter
 2017-06-20 15:33:17 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
seefo
00a3fc77a1 Fixed an issue where toolbar buttons duplicated themselves when reloading scripts 2017-06-20 11:18:22 -07:00
David Rowe
513e0cd232 Fix import of JSON with parent-child relationships 2017-06-20 16:44:25 +12:00
Zach Fox
e9ba223c09 Uncheck 'disable preview' when opening Spectator app 2017-06-19 13:40:50 -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
Stephen Birarda
39e8510ccb Merge pull request #10720 from seefo/fb5386 
Fixed a bug where you could not print polaroids if you took a gif
 2017-06-16 15:03:45 -07:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Fox
378d8e80cf Remove random component of button mapping name 2017-06-16 10:08:58 -07:00
Zach Fox
e2c6993ae9 Fix bug found by Cain with his patch - thank you! 2017-06-16 10:08:58 -07:00
Zach Fox
3df414df36 Bugfixes and language changes 2017-06-16 10:08:58 -07:00
Zach Fox
65b910bcf6 Support Vive 2017-06-16 10:08:58 -07:00
Zach Fox
8cf9c8708d Allow user to click left thumbstick to switch 'MONITOR SHOWS' 2017-06-16 10:08:58 -07:00
seefo
a4d008eec9 Fixed a bug where you could not print polaroids if you took a gif 2017-06-16 08:57:27 -07:00
Zach Fox
68662bb209 Bugfixes 2017-06-15 10:20:17 -07:00
Zach Fox
a795822919 Comments and disable camera when switching 2017-06-15 10:09:28 -07:00
Zach Fox
498ed4cbe8 showSpectatorInDesktop true for now 2017-06-15 10:09:28 -07:00
Zach Fox
0114962e75 Make the Spectator button only appear in HMD (with debug mode) 2017-06-15 10:09:28 -07:00
Zach Fox
f214712b33 Merge pull request #10678 from zfox23/spectatorCamera_improvements1 
Secondary camera and rendering improvements
 2017-06-14 14:39:38 -07:00
Zach Fox
6b6b6026a4 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-14 13:44:13 -07:00
Zach Fox
03c61e2191 vFoV and clipping plane distances now come from config 2017-06-14 11:53:05 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd only show Audio menu title when appropriate 2017-06-13 17:13:39 -04:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Fox
8962c7bf6a Viewfinder re-flip, add comments regarding why it's necessary 2017-06-13 13:06:03 -07:00
Zach Pomerantz
337b6bca14 update JS with Audio.muted 2017-06-13 16:02:58 -04:00
Anthony Thibault
0d46b78bff Merge pull request #10541 from Menithal/21324 
Reworked Particle Editor UI
 2017-06-13 13:00:54 -07:00
Zach Fox
7b6033f7bc Getting closer to a solution 2017-06-13 11:37:27 -07:00
Matti Lahtinen
35f83afd09 Removed unneccessary print 2017-06-13 20:43:14 +03:00
Menithal
c2c1e607c0 Formating 2017-06-13 20:31:41 +03:00
Zach Fox
4acbb81413 Checkpoint 2017-06-13 10:22:48 -07:00
Menithal
395cc55fb2 Fixed formatting 2017-06-13 20:20:54 +03:00
Menithal
020760cc97 21324: Fixed accidental inccorect bracket 2017-06-13 20:16:56 +03:00
Zach Fox
7d1a7f4c0b Merge branch 'master' of https://github.com/highfidelity/hifi into 
spectator-camera - INCLUDING MERGE CONFLICT FIXES
 2017-06-13 09:42:14 -07:00
Menithal
00701eb5c7 Merge remote-tracking branch 'origin/master' into 21324 2017-06-13 19:08:37 +03:00
Menithal
0edb763dac 21324: Formatting and PR Feedback Changes 2017-06-13 19:06:47 +03:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Seth Alves
92fe8145be Merge pull request #10616 from vladest/create_button_sticked 
Set active button property isActive before Home menu redraw. Makes su…
 2017-06-11 13:43:41 -07:00