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

57406 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
David Kelly
0544c1e561 build issue 2017-07-20 08:18:37 -07:00
David Kelly
110efd63c8 enabled property so we can turn it off during edit, etc... 2017-07-20 08:08:49 -07:00
David Kelly
b236a21adc no clicks on 'highlight' overlay 2017-07-20 07:28:45 -07:00
David Kelly
0023832938 simple fixes 2017-07-19 17:38:19 -07:00
David Kelly
ebce1ce9de Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting 2017-07-19 17:13:11 -07:00
Zach Fox
2dce254928 Actually increase target size 2017-07-19 17:11:45 -07:00
Zach Fox
5c74a3bbeb Improve hand controller + overlay interaction 2017-07-19 17:09:57 -07:00
Zach Fox
2dc3844116 Improve reliability of hand lasers; increase size of target 2017-07-19 17:07:57 -07:00
David Kelly
40ec770bc1 Highlight using simple yellow bounding box 2017-07-19 17:06:17 -07:00
David Kelly
2bd46d35df Merge pull request #10998 from davidkelly/dk/marketplaceItemsOnly 
Overlay appears only on marketplace items
 2017-07-19 16:04:47 -07:00
David Kelly
920ac17caf minor renaming 2017-07-19 15:46:28 -07:00
David Kelly
5f82a76cc9 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly 2017-07-19 15:41:36 -07:00
David Kelly
ecd419e0d3 cr feedback 2017-07-19 15:32:03 -07:00
Zach Fox
4374d4d1e5 Small improvements to overlay 2017-07-19 15:27:48 -07:00
David Kelly
44c9f0e65e Overlay appears only on marketplace items 2017-07-19 15:13:26 -07:00
David Kelly
d9207c7fdf Merge pull request #10997 from davidkelly/dk/openMarketplace 
Open marketplace when we know the marketplaceID of an entity
 2017-07-19 15:03:35 -07:00
David Kelly
f0091f16a1 cr feedback 2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12 Open marketplace when we know the marketplaceID of an entity 2017-07-19 14:11:14 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
David Kelly
c09c5b2861 Merge pull request #10996 from zfox23/HoverOverlay_CubeOverlay 
1st version of (i) overlay interface for lasers and mouse
 2017-07-19 10:11:35 -07:00
Zach Fox
f06ec715f2 Quick bugfix 2017-07-19 09:59:44 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Andrew Meadows
d48f45f7e6 Merge pull request #10990 from druiz17/bug-help-issue 
fixed another instance of the tablet getting stuck on the help screen
 2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013 Merge pull request #10970 from Atlante45/feat/ac-shutdown-info 
AC shutdown info + PPID watcher on Unix
 2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb made requested changes 2017-07-19 16:28:16 +01:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
Brad Hefta-Gaub
044b8fc19a Merge pull request #10993 from druiz17/bug-rogue-laser 
Do not show lasers when editing in 2D mode.
 2017-07-18 16:53:11 -07:00
Zach Fox
82111a8f6a Timer for hand controller lasers 2017-07-18 16:40:18 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Brad Davis
43476afff5 Merge pull request #10995 from AndrewMeadows/fix-debug-build 
fix broken debug build
 2017-07-18 16:00:18 -07:00
Brad Davis
90048cdb4b Merge pull request #10991 from jherico/minimized_deadlock 
Ensure we continue calling idle when minimized
 2017-07-18 15:59:28 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
Andrew Meadows
8dafc30bf9 fix debug build: stub pure virtual function 2017-07-18 15:57:00 -07:00
Dante Ruiz
b3ec306063 better version 2017-07-18 23:48:21 +01:00
Clément Brisset
18be917358 Merge pull request #10574 from humbletim/21180 
CR #21180 Camera control app
 2017-07-18 15:35:32 -07:00
David Kelly
4d4d9421d3 Merge pull request #10983 from davidkelly/dk/marketplaceIDHack 
Get marketplaceID into imported entities
 2017-07-18 15:25:49 -07:00
Dante Ruiz
8cbe63f296 removed search laser in edit mode for 2d mode 2017-07-18 22:45:54 +01:00
Zach Fox
084f4d2ab0 Why were Web3DOverlays done this way? 2017-07-18 14:42:59 -07:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d Ensure we continue calling idle when minimized 2017-07-18 13:44:58 -07:00
Chris Collins
e99683fdcf Merge pull request #10985 from jherico/audio_deadlock 
Trying to resolve QML / Audio deadlocks
 2017-07-18 12:40:03 -07:00
Dante Ruiz
06a69c8bd7 fixed another tablet stuck on help screen 2017-07-18 20:27:55 +01:00
Brad Hefta-Gaub
0ba9d65732 Merge pull request #10989 from druiz17/bug-whitespace-script-url 
Fixed not being able to load a script url that has a white space
 2017-07-18 11:39:10 -07:00
David Kelly
c4d5d16eb3 cr feedback 2017-07-18 11:12:06 -07:00
Andrew Meadows
6e59e451c4 Merge pull request #10986 from Atlante45/fix/avatar-audio-timer 
Use timer instead of dedicated thread to tick AC scripted avatar audio
 2017-07-18 10:25:35 -07:00
Andrew Meadows
888f2f64a5 Merge pull request #10981 from druiz17/bug/delete-avatar-entity 
Fixed not being able to delete avatar entities when switching domains
 2017-07-18 10:09:34 -07:00
Dante Ruiz
bcc15dd4ae Merge branch 'master' of github.com:highfidelity/hifi into bug-whitespace-script-url 2017-07-18 17:59:56 +01:00
Dante Ruiz
976fec66f8 fixed loading script whitespace 2017-07-18 17:59:42 +01:00
Clément Brisset
bcc9cf7c60 Merge pull request #10947 from Atlante45/fix/ignore-ac-crash 
Fix Avatar/Audio Mixer crash
 2017-07-18 09:59:30 -07:00