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

5719 commits

Author SHA1 Message Date
r3tk0n
a66c76bf38 Fixing typos. 2019-02-25 13:47:31 -08:00
r3tk0n
5d3a778b0b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco-fargrab-rotation 2019-02-25 13:10:47 -08:00
r3tk0n
d79681470e Saving changes before merging master... 2019-02-25 13:10:25 -08:00
r3tk0n
c6a3496b25 Add utility functions for adjusting target rotation and position. 2019-02-24 12:36:44 -08:00
r3tk0n
58906d84eb Add grip button polling. 2019-02-21 15:22:21 -08:00
shanzzam
adb6f559dc Changing twitter handle from inc to VR 2019-02-20 18:31:32 -08:00
r3tk0n
7092513b7d Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 17:42:58 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf 
Case 21271: Remove unnessary picks for quest
 2019-02-19 14:20:56 -08:00
r3tk0n
ebbf48a11b Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-02-19 12:02:50 -08:00
r3tk0n
03058775f6 Remove debug prints. 2019-02-19 11:27:13 -08:00
r3tk0n
f52b096bb9 Change far grab to chorded input 'superpower' 2019-02-19 11:26:42 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
7677e3bf44 just in case 2019-02-16 20:41:57 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
Roxanne Skelly
1154414a07 remove unneeded marketplaceInject.js 2019-02-15 12:36:35 -08:00
David Back
158e255319
Merge pull request #14902 from huffman/fix/duplicating-grabbed-entities 
Case 21029: Fix duplicating non-dynamic grabbed entities in edit.js
 2019-02-15 11:25:42 -08:00
David Back
af25a7bf6e
Merge pull request #14919 from dback2/selectAllClearAll 
Case 19930: Entity List - add select/clear all to entity type dropdown
 2019-02-15 10:12:30 -08:00
David Back
e944e284a6 design feedback 2019-02-14 17:37:58 -08:00
David Back
f6baa2432a design feedback 2019-02-14 17:27:05 -08:00
David Back
46ff3a8405 add select/clear all buttons to entity type dropdown 2019-02-14 16:16:33 -08:00
Ryan Huffman
e800a6e030 Update hard-coded vec3 zero with Vec3.ZERO 2019-02-14 15:56:17 -08:00
Shannon Romano
453c081d9b
Merge pull request #14901 from huffman/fix/dropdown-close-on-click 
Case 19999: Update edit.js to auto close dropdowns when clicking outside
 2019-02-14 14:48:03 -08:00
Bradley Austin Davis
d45d87031d
Merge pull request #14782 from SamGondelman/NOverlaysFinal 
Case 20723, Case 20334: Internally, replace all overlays with local entities
 2019-02-14 13:49:47 -08:00
SamGondelman
b418e43ef2 ctrlaltdavid's minitablet fix 2019-02-12 13:15:58 -08:00
Ryan Huffman
2728654d35 Fix duplicating non-dynamic grabbed entities in edit.js 2019-02-12 10:09:28 -08:00
Ryan Huffman
fcfb1b7a4a Update edit.js to auto close dropdowns when clicking outside 2019-02-12 10:06:25 -08:00
SamGondelman
a9767e4c22 working on mini tablet 2019-02-11 15:46:29 -08:00
Ryan Huffman
16b48046c6 Fix not being able to type text into particle url field 2019-02-11 15:27:30 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
Brad Hefta-Gaub
8faff57033
Merge pull request #14830 from thoys/fix/create/zoneShapeVisualizersIgnorePickray 
MS20909: ignore pickRay for zone shape visualizers
 2019-02-08 19:12:58 -08:00
John Conklin II
b46fb7cfe7
Merge pull request #14860 from thoys/fix/create/entityListUnderscoreFirstSorting 
Case 19385: local compare in entity list sorting
 2019-02-08 14:56:32 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
Sam Gateau
632d6e8a73
Merge pull request #14863 from danteruiz/android-apps-directories 
Case 20877: Support CMake time configuration of QmlFileSelectors
 2019-02-07 09:30:49 -08:00
Dante Ruiz
f07b5c8490 update urls 2019-02-06 14:25:25 -08:00
danteruiz
d0fecac0d8 +android -> +android_interface 2019-02-06 11:37:52 -08:00
Thijs Wenker
2247dd3471 local compare in entity list sorting 2019-02-06 18:24:40 +01:00
Roxanne Skelly
78aa1783a0 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-04 15:04:55 -08:00
Roxanne Skelly
e23c589de7 QmlMarketplace - fix issue with footer not appearing in marketplaces list 2019-02-04 15:04:18 -08:00
Roxanne Skelly
39ad36a4d0 QmlMarketplace - bugfixes and Markup rendering of descriptions 
* Render markup in descriptions (bold, italic, quote, etc.)
* Back button from marketplaces list now works properly
* Layout fixes
 2019-02-01 15:27:17 -08:00
SamGondelman
c6080d0795 fix edit selection + log problem 2019-02-01 14:37:42 -08:00
SamGondelman
ba8320f561 fix 2d overlay deletion 2019-02-01 14:31:26 -08:00
SamGondelman
b80d2a9b06 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-01 13:33:04 -08:00
Thijs Wenker
80f5cbc8ab also ignore picking on the material entity 2019-01-31 22:14:15 +01:00
Thijs Wenker
15066faaf7 ignore pickRay for zone shape visualizers 2019-01-31 19:45:29 +01:00
SamGondelman
7d47bfa2e4 david's comments 2019-01-30 11:50:32 -08:00
SamGondelman
834e44dd3a make polyline's with faceCamera not depend on normal 2019-01-30 11:02:24 -08:00
Thijs Wenker
132d293c3c skip child entities of mismatching entityHostType when copy/delete/duplication of entities 2019-01-30 03:15:32 +01:00
r3tk0n
1751864042 Fix this references in module run function. 2019-01-29 16:13:11 -08:00