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

76046 commits

This branch
This branch
All branches
Author SHA1 Message Date
NissimHadar
86aaba016f Narrow filter on zip folder selection. 2019-02-13 15:15:46 -08:00
NissimHadar
12c122ce9c Bump up version number. 2019-02-13 15:14:36 -08:00
NissimHadar
77b679606f Corrected bug in zip folder name. 2019-02-13 15:13:55 -08:00
danteruiz
562e159ab4 the proper fix for browser qml issues 2019-02-13 10:45:07 -08:00
Shannon Romano
8a07e2b31a
Merge pull request #14895 from ctrlaltdavid/M21132 
Case 21132: Add "Avatar Script" classification to relevant JSDoc APIs
 2019-02-13 10:35:00 -08:00
Andrew Meadows
ba91bab224 remove cruft 2019-02-13 10:05:32 -08:00
Andrew Meadows
c79e3e5a6d add some trace contexts for easier debugging 2019-02-13 10:02:58 -08:00
Andrew Meadows
152edd477c change trace context to rendering 2019-02-13 10:00:51 -08:00
Shannon Romano
6ca4a2776e
Merge pull request #14903 from NissimHadar/21129-improveNitpickUsability 
Case 21129: improve nitpick usability
 2019-02-13 09:54:53 -08:00
Shannon Romano
1330b108d6
Merge pull request #14890 from sabrina-shanman/gltf_mat-support 
(case 20980) Add support for Roughness/Metallic in GLTF models
 2019-02-13 08:16:00 -08:00
NissimHadar
9ed1470175 Corrected case. 2019-02-12 19:10:34 -08:00
sabrina-shanman
efd22172b4 Add final missing CMake includes 2019-02-12 17:27:04 -08:00
danteruiz
a111aa1724 fix blocks app 2019-02-12 16:45:45 -08:00
sabrina-shanman
08ef9b6f84 Remove unused duplicate ColorChannel enum 2019-02-12 16:44:37 -08:00
sabrina-shanman
b2e3b87ef4 Add two missing CMake includes 2019-02-12 16:24:13 -08:00
Anthony Thibault
5db764f5df
Merge pull request #14908 from hyperlogic/bugfix/bug-eyes 
Revert "Pack all non-instanced traits"
 2019-02-12 16:23:19 -08:00
sabrina-shanman
b2af6d1374 Have only one ColorChannel enum as header in image library 2019-02-12 16:14:41 -08:00
Andrew Meadows
d4c52e4b1c fix implicit cast warning for Visual Studio 2019-02-12 15:37:09 -08:00
Andrew Meadows
8bdac589b8 use RingBuffer for gradual garbage collection 2019-02-12 15:37:09 -08:00
Andrew Meadows
c9b142531b add more tracing details in PrePhysics 2019-02-12 15:37:09 -08:00
Andrew Meadows
d7f38bac17 fix ShapeInfoTests to use reduced HashKey API 2019-02-12 15:37:09 -08:00
Andrew Meadows
a3567dea3a clean HashKey API, reduce dependency tree 2019-02-12 15:37:09 -08:00
Andrew Meadows
17ab0cb92e more robust ShapeManager garbage collector 2019-02-12 15:37:09 -08:00
Shannon Romano
10e5e9e0c3
Merge pull request #14900 from MarkBrosche/avatarAppKeyboardFix 
Fixed MS21059: Avatar App Keyboard Raise in Desktop
 2019-02-12 15:02:28 -08:00
Andrew Meadows
ed8481ead9 fix grab bugs 2019-02-12 14:04:56 -08:00
Shannon Romano
7e643fcc19
Merge pull request #14893 from SimonWalton-HiFi/inventory-confirmation-message 
Adjust Inventory's send-to-trash confirm message
 2019-02-12 14:04:10 -08:00
Dante Ruiz
5e9b63b352 fix-qml-crash-on-mac 2019-02-12 13:56:56 -08:00
Shannon Romano
e8c70cc782
Merge pull request #14897 from danteruiz/fix-soft-entity 
Case 21142: Wearer and observer disagree on whether a worn item is correctly placed
 2019-02-12 13:56:47 -08:00
Shannon Romano
ee83c69d3e
Merge pull request #14899 from samcake/brownBis 
Case 21146: Adding support for MSAA textures and framebuffer to gpu lib and backends.
 2019-02-12 13:54:09 -08:00
Anthony Thibault
eee41bc41e Revert "Pack all non-instanced traits" 
This reverts commit 5b7d7b8833.
 2019-02-12 13:46:21 -08:00
sabrina-shanman
1b2cb94b0c Fix not changing input to processImage in TextureBaker.cpp 2019-02-12 13:21:21 -08:00
Roxanne Skelly
a82221d2a5 Case 21118 - descending sorts don't work in new (qml) marketplace 2019-02-12 13:20:47 -08:00
SamGondelman
b418e43ef2 ctrlaltdavid's minitablet fix 2019-02-12 13:15:58 -08:00
John Conklin II
1761df7ccd
Merge pull request #14875 from jherico/feature/quest_custom_plugins 
Case 20882: Support custom display / input plugin lists and small tweaks
 2019-02-12 12:52:07 -08:00
SamGondelman
fdbcf4b2ea cleanup and expose mapped materials to getScriptableModel 2019-02-12 12:03:35 -08:00
sabrina-shanman
2b355e9d52 Re-name ColorChannelMapping to ColorChannel and put versions in two specific libraries rather than shared 2019-02-12 11:56:44 -08:00
danteruiz
fdfb9196d3 comments explaining horrible code 2019-02-12 11:45:08 -08:00
SamGondelman
f75a3e1a72 it's working! 2019-02-12 11:41:47 -08:00
NissimHadar
305ce74659 Updated the Windows installation instructions. 2019-02-12 11:11:59 -08:00
NissimHadar
0b1034c290 Improved wording of error message. 2019-02-12 11:11:22 -08:00
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