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

57436 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
5cd05da31e strict comparisons 2017-07-20 15:16:40 -07:00
Zach Fox
3698fe9b6b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-20 15:10:06 -07:00
David Kelly
8f8f695e73 Merge pull request #11015 from davidkelly/dk/placeholderHighlighting 
registration point fix
 2017-07-20 15:08:38 -07:00
David Kelly
c8015e4eb6 cleanup, fixed build issue 2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6 whitespace issue 2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16 registration point 2017-07-20 14:18:07 -07:00
Clément Brisset
c128a3ff86 Merge pull request #11001 from Atlante45/fix/debug-builds 
Fix debug builds startup crash
 2017-07-20 13:31:55 -07:00
Clément Brisset
d2e64a52e1 Merge pull request #11013 from Atlante45/update-sit 
Update sit script in the repo
 2017-07-20 13:28:29 -07:00
Zach Fox
bab58efc3c Merge pull request #11014 from zfox23/contextOverlays_improvements2 
Five major improvements to context-overlays
 2017-07-20 13:27:48 -07:00
Zach Fox
46d09a12fe Fix bug where overlay would get stuck 2017-07-20 13:26:43 -07:00
Zach Fox
e18fec140a Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2 2017-07-20 13:03:34 -07:00
David Kelly
927699eb92 Merge pull request #11012 from davidkelly/dk/placeholderHighlighting 
Turn off ContextOverlay for edit, pal
 2017-07-20 13:01:21 -07:00
Zach Fox
a1a7ab945a Make dimensions better 2017-07-20 12:58:15 -07:00
David Kelly
f365ce8abd typo 2017-07-20 12:58:06 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
Atlante45
c0da0cb439 Update sit script in the repo 2017-07-20 11:56:41 -07:00
Brad Hefta-Gaub
cdb7652423 Merge pull request #11007 from MiladNazeri/patch-2 
Update CONTRIBUTING.md
 2017-07-20 11:55:26 -07:00
David Kelly
3bf81034a3 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting 2017-07-20 11:31:25 -07:00
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
Seth Alves
38a955b886 Merge pull request #11011 from trentpolack/21434-obj-vertexcolors 
WL21434 - Add vertex color support for OBJ files.
 2017-07-20 10:37:37 -07:00
David Kelly
c75a925bb6 Merge pull request #11003 from davidkelly/dk/placeholderHighlighting 
Highlight using simple yellow bounding box
 2017-07-20 10:10:50 -07:00
trent
559e2e0ebb Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex. 2017-07-20 13:09:17 -04:00
trent
ff3e9263ef Stupid tabs. 2017-07-20 11:40:42 -04:00
trent
786535a001 Merge branch 'master' of https://github.com/highfidelity/hifi into 21434-obj-vertexcolors 2017-07-20 11:38:54 -04:00
trent
d71b0802a7 Added vertex color support to OBJReader.h|cpp. 2017-07-20 11:38:42 -04: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
MiladNazeri
13274fb9a3 Update CONTRIBUTING.md 
Same issue as the readme.md change.
 2017-07-20 10:20:56 -04:00
Ken Cooke
87d9dfd243 Merge pull request #11002 from ctrlaltdavid/21461 
Fix noise reduction checkbox not always working
 2017-07-19 19:22:28 -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 Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12:00
David Kelly
40ec770bc1 Highlight using simple yellow bounding box 2017-07-19 17:06:17 -07:00
Atlante45
70a5916ef3 Fix debug builds startup crash 2017-07-19 16:18:01 -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
Clément Brisset
d76039387a Merge pull request #10992 from Atlante45/fix/heap-use-after-free 
Fix potential data corruption in the FileCache
 2017-07-19 10:44:02 -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