Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-17 02:25:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76117 commits 76 branches 59 tags 1.2 GiB
Commit graph

76117 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roxanne Skelly
7204a0c5c8 Merge branch 'master' of https://github.com/highfidelity/hifi into QmlMarketplace 2019-02-12 10:33:14 -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
189ccfde4a clement's comments from PR14858 2019-02-12 09:51:11 -08:00
SamGondelman
d2ecc21f0b Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-12 09:46:40 -08:00
Mark
9d81ace243 Fixed MS21059: Avatar App Keyboard Raise in Desktop 2019-02-12 09:45:51 -08:00
SamGondelman
61346437da working on material mapping 2019-02-12 09:22:31 -08:00
NissimHadar
6225d97357 Check for adb and python when needed. 
Look for adb and python in PATH.
 2019-02-12 09:06:04 -08:00
Sam Gateau
0c2c581c64 Add the gles backend MS texture ad framebuffer support 2019-02-11 22:52:35 -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
9ad783135c Bringing back brownBis to just msaa support 2019-02-11 19:42:05 -08:00
Sam Gateau
8a4f7fe2b6 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-11 18:57:33 -08:00
sabrina-shanman
2c5446dfb5 Merge branch 'master' into gltf_mat-support 2019-02-11 17:46:23 -08:00
Jeff Clinton
123c2301da
Merge pull request #14858 from SamGondelman/fst 
Case 21046: Fix Subsurface Scattering and ResourceCache "extra" bug
 2019-02-11 17:40:44 -08:00
Simon Walton
73296aa986
Change update rate to 1 Hz 2019-02-11 16:59:18 -08:00
danteruiz
50dd865bdc fix spatially nestable parent overwrite 2019-02-11 16:48:34 -08:00
SamGondelman
77a8ddb3f0 Merge remote-tracking branch 'upstream/master' into materialMapping 2019-02-11 16:35:05 -08:00
Ryan Huffman
71669af696
Merge pull request #14896 from huffman/fix/particle-effect-url 
Case 20502: Fix not being able to type text into particle url field
 2019-02-11 16:32:26 -08:00
Cristian Luis Duarte
009f24dda1 Android - Make minWidth of message dialog wider so error messages like protocol version error fits in two lines 2019-02-11 21:28:31 -03:00
sabrina-shanman
e16e968e98 Merge branch 'fst' of github.com:SamGondelman/hifi into gltf_mat-support 2019-02-11 16:23:15 -08:00
Brad Davis
b896e2577b Fix QML file selectors 2019-02-11 16:17:06 -08:00
SamGondelman
d96b0534ab fix resource texture crash 2019-02-11 16:12:13 -08:00
Sam Gateau
51e7c6a83b
Merge pull request #14878 from raveenajain/glb_files 
Case 20966: glb files
 2019-02-11 16:08:33 -08:00
SamGondelman
4202685a4b Merge remote-tracking branch 'upstream/master' into fst 2019-02-11 16:07:36 -08:00
SamGondelman
a9767e4c22 working on mini tablet 2019-02-11 15:46:29 -08:00
Brad Davis
e534270f9a Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins 2019-02-11 15:41:32 -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
96f32a9f72 fix keyboard focus thing 2019-02-11 15:17:32 -08:00
SamGondelman
f53ccf7363 fix create, working on mini tablet 2019-02-11 14:54:53 -08:00
Cristian Luis Duarte
37b5f11489 Merge remote-tracking branch 'origin/master' into connection_failure_dialog 2019-02-11 19:53:11 -03:00
David Rowe
8e0ff9b4de Fix up some "Client Entity" JSDoc API classifications 2019-02-12 11:50:09 +13:00
David Rowe
5428bb19dc Add "Avatar Script" JSDoc API classification 2019-02-12 11:49:49 +13:00
John Conklin II
6410879e33
Merge pull request #14879 from mattr1x/add-metrics-to-prebuild 
Add prebuild metrics logging for CI system
 2019-02-11 14:47:04 -08:00
Simon Walton
4f2223ced3
Change max update to 10 Hz 2019-02-11 14:17:55 -08:00
Roxanne Skelly
4f8de7ed0b Case 21123, Case - marketplace license display has weird crud in it (new qml version) 2019-02-11 12:48:04 -08:00
Roxanne Skelly
a0199c5884 Case 21119, 21120 
Case 21119 - text filter doesn't change as you type in new (qml) marketplace
Case 21120 - text filter doesn't clear in new (qml) marketplace
 2019-02-11 12:27:02 -08:00
Sam Gateau
54e36f0825
Merge pull request #14892 from NissimHadar/21111-simplifyRecursiveScripts 
Case 21111: simplify recursive scripts
 2019-02-11 12:02:12 -08:00
Simon Walton
44c163b7cc Tweak inventory-delete message to be more accurate 2019-02-11 10:30:51 -08:00
SamGondelman
d988de4a17 Merge remote-tracking branch 'upstream/master' into NOverlaysFinal 2019-02-11 10:27:12 -08:00
raveenajain
cfc13de39d Merge branch 'master' of https://github.com/highfidelity/hifi into glb_files 2019-02-11 10:25:46 -08:00
SamGondelman
4f03157f39 working on fst material mapping 2019-02-11 10:20:55 -08:00
sabrina-shanman
0fda6bd3e0 Merge 'samuel/fst' into gltf_mat-support 2019-02-11 09:28:29 -08:00
sabrina-shanman
5840f272ed Store mapped single channel texture with alpha of 255 just to be safe 2019-02-11 09:07:45 -08:00
sabrina-shanman
f7d7136b3e Do not have hash specialization just for ColorChannelMapping 2019-02-11 09:06:26 -08:00
sabrina-shanman
0f291612c3 Fix invalid processImage calls in TextureBaker.cpp 2019-02-11 09:04:41 -08:00
NissimHadar
d3e0aa5d8c Make sure only top-level recursive script runs recursively. 2019-02-10 20:32:38 -08:00
SamGondelman
20841a0eea fix skybox loading I think and pull in sabrina's ktx caching fix 2019-02-09 16:42:34 -08:00
NissimHadar
b2fb7a737b Ready for testing. 2019-02-09 13:21:36 -08:00
NissimHadar
dff98f462f Removed unnecessary of spaces. 2019-02-09 13:13:13 -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