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

57955 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
6621b43fae Make some swatches start with "no color"; color them when clicked 2017-08-08 16:34:45 +12:00
David Rowe
1231491a72 Add color picker 2017-08-07 17:29:58 +12:00
David Rowe
5d1732c5aa Merge branch 'master' into vr-edit-a 2017-08-05 20:45:12 +12:00
David Rowe
0f44e36128 Fix buttons sometimes staying pressed 2017-08-05 18:04:39 +12:00
David Rowe
4e87c13020 Tidy group buttons' enabling 2017-08-05 17:52:54 +12:00
David Rowe
bff3ad342d Tidy command and callback handling 2017-08-05 17:37:40 +12:00
David Rowe
e6456ca501 Tidy and fix options handling 2017-08-05 17:08:56 +12:00
Brad Hefta-Gaub
95c28b2fa1 Merge pull request #11119 from highfidelity/anshuman64-entervr 
Capitalize "ENTER VR"
 2017-08-04 18:03:20 -07:00
anshuman64
22afb25d44 Capitalize "ENTER VR" 2017-08-04 17:19:26 -07:00
David Rowe
23fab65f27 Tidying 2017-08-05 12:08:36 +12:00
David Rowe
24f36c1ae5 Default current color and remember current color over tool/app toggles 2017-08-05 12:07:33 +12:00
Brad Hefta-Gaub
cce0ba9596 Merge pull request #11043 from jherico/threaded_render_checkpoint 
Updates from Threaded Rendering project
 2017-08-04 15:28:00 -07:00
Brad Davis
0e508432c4 PR comments 2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb Merge pull request #11110 from Armads/WL21423 
Camera mode on startup is determined by user settings and HMD status
 2017-08-04 13:16:34 -07:00
Brad Hefta-Gaub
8f98d0b7c8 Merge pull request #11114 from ElderOrb/case6677 
6677: Change "Desktop" App to Say "Exit VR"
 2017-08-04 13:09:47 -07:00
beholder
d05e1677c3 6677: Change "Desktop" App to Say "Exit VR" 2017-08-04 23:04:15 +03:00
Brad Hefta-Gaub
0f85769098 Merge pull request #11116 from vladest/fix_menu_caps 
Cleanup top menu on menu re instantiation
 2017-08-04 12:37:14 -07:00
Brad Hefta-Gaub
0d0a1af166 Merge pull request #11085 from jherico/script_console_crash 
Fix for potential crash in JS console
 2017-08-04 11:44:20 -07:00
vladest
9058a8e2ca Cleanup top menu on menu reinstantiation 2017-08-04 16:36:00 +02:00
David Rowe
ceba5769e0 Apply color to entities when click them 2017-08-04 18:07:42 +12:00
David Rowe
75b481adab Update icon color as current color is changed 2017-08-04 17:52:53 +12:00
David Rowe
d0143c2c19 Add color swatch buttons and "current color" circle 2017-08-04 17:33:00 +12:00
David Rowe
ed497afdc3 Add "Color" tool button, icon, and empty options panel 2017-08-04 14:08:57 +12:00
David Rowe
2237290b2e Add labels to buttons 2017-08-04 13:22:48 +12:00
Anthony Thibault
732d0de48d Merge pull request #10976 from humbletim/21446 
WL 21446: Add doppleganger "move-as-you-move" roomscale functionality
 2017-08-03 17:22:49 -07:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects 
Added Vive pucks as an input channel and added new puck-attach script
 2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays 
Context Overlays
 2017-08-03 16:28:14 -07:00
seefo
67b5921079 Changed puck-attach to make tracked entities collisionless 2017-08-03 16:01:12 -07:00
seefo
498ac5d0ab Updated version of puck-attach.js 2017-08-03 15:08:06 -07:00
David Rowe
4d8226ac02 Abstract out some common constants missing from the API 2017-08-04 09:23:40 +12:00
Chris Collins
ddb7d0f1ba Merge pull request #11112 from kencooke/audio-gate-bugfix 
Possible fix for "screeching noise" after audio input device changes
 2017-08-03 13:55:47 -07:00
David Rowe
110355796c Add delete tool 2017-08-04 08:55:43 +12:00
druiz17
27f508ad9b Merge pull request #11088 from vladest/fix_opened_running_scripts 
Fix opened running scripts
 2017-08-03 13:09:50 -07:00
Chris Collins
6d57b4df38 Merge pull request #11108 from jherico/installer_remove_pdb 
Fix installer issues
 2017-08-03 12:51:58 -07:00
Armads
dff4e6e32c WL21423 Changing order of camera setup steps 2017-08-03 15:40:38 -04:00
David Rowe
e2dccc1420 Merge branch 'master' into vr-edit-a 2017-08-04 07:33:18 +12:00
vladest
a439cc1837 Make connection to tablet shown signal more consistent, eliminates missed signals 2017-08-03 20:58:44 +02:00
vladest
b049b0f415 Merge conflicts 2017-08-03 19:43:42 +02:00
Brad Davis
4756d4af66 Merge pull request #6 from marko8904/pr11108 
Switching to completely silent VC++ redistributable installation
 2017-08-03 09:50:29 -07:00
Marko Kudjerski
2279e174e6 Switching to completely silent VC++ redistributable installation 2017-08-03 09:41:41 -07:00
Ken Cooke
6ea4ed80cd Suppress initial PacketType::SilentAudioFrame on audio gate startup 2017-08-03 09:19:08 -07:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389 
WL21389 PR1:  Representation of collision shapes need updating (details below).
 2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
Armads
24718e2424 WL21423 Camera mode on startup is determined by user settings and HMD status 2017-08-03 09:03:23 -04:00
David Rowe
e29bed7f07 Don't auto-grab if trigger fully pressed when laser starts intersecting 2017-08-03 20:26:21 +12:00
David Rowe
1ba658ee45 Implement grouping and ungrouping 2017-08-03 19:52:39 +12:00
Brad Hefta-Gaub
0f73496a44 Merge pull request #11055 from misslivirose/fix-chat-bubble-length 
Fix chat bubble length
 2017-08-02 23:29:09 -07:00
Brad Hefta-Gaub
8f34250a69 Merge pull request #11109 from kencooke/audio-wasapi-qt591 
Update WASAPI plugin
 2017-08-02 23:27:29 -07:00
David Rowe
1e1cb3a02e Fix scale tool highlight color 2017-08-03 13:24:38 +12:00