Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 08:02:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76250 commits 67 branches 56 tags 1.2 GiB
Commit graph

7539 commits

Author SHA1 Message Date
shanzzam
adb6f559dc Changing twitter handle from inc to VR 2019-02-20 18:31:32 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake 
case 20058: Android - Handshake implementation
 2019-02-20 13:33:52 -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
John Conklin II
051ab61b66
Merge pull request #14951 from SamGondelman/ssao 
Case 20993: Fix AO
 2019-02-19 11:19:03 -08:00
SamGondelman
27f05db825 fix ao 2019-02-18 01:12:00 -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
Sam Gateau
afb6c838eb REverting all the changes from the brown branch not used 2019-02-11 20:13:37 -08:00
Sam Gateau
8a4f7fe2b6 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-11 18:57:33 -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
Sam Gateau
48d671c6c3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-07 18:54:19 -08:00
SamGondelman
e74ff18bef Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:49:27 -08:00
SamGondelman
25ca52d892 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-07 09:48:13 -08:00
Cristian Duarte
babb972d89 Merge remote-tracking branch 'hifi/master' into android_handshake 2019-02-07 14:44:22 -03: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
Sam Gateau
8ec9c8502d Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-06 12:09:38 -08:00
danteruiz
d0fecac0d8 +android -> +android_interface 2019-02-06 11:37:52 -08:00
Shannon Romano
61459d5756
Merge pull request #14775 from roxanneskelly/QmlMarketplace 
Qml marketplace
 2019-02-06 11:20:49 -08:00
Thijs Wenker
2247dd3471 local compare in entity list sorting 2019-02-06 18:24:40 +01:00
Sam Gateau
d8f6583047 Merge branch 'master' of github.com:highfidelity/hifi into brown 2019-02-06 09:01:38 -08:00
Sam Gateau
35491bf5b0 Multisampling works in 4.1 2019-02-06 00:05:17 -08:00
danteruiz
30bd9774b2 script engine to load platform specific files 2019-02-05 13:11:54 -08:00
Sam Gateau
4089f8c5b0 Adding Color filter to the tone mapper 2019-02-04 23:45:35 -08: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