Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-13 15:13:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76113 commits 69 branches 56 tags 1.2 GiB
Commit graph

76113 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Brad Davis
292602afd7 Resolving more master differences 2019-02-14 12:55:28 -08:00
Brad Davis
0f4d1f073b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-14 12:49:56 -08:00
Sam Gateau
969c62d0df
Merge pull request #14907 from danteruiz/fix-qml-crash-on-mac 
Case 21157: Fix Desktop.qml crash on local mac build
 2019-02-14 12:15:50 -08:00
Sam Gateau
384d4fb959
Merge pull request #14809 from highfidelity/commandLineAndroid 
case 19113: Recreated changes due to CLA issue in previous pr. Adding args to int…
 2019-02-14 12:10:08 -08:00
raveenajain
e825be566d Merge branch 'master' of https://github.com/highfidelity/hifi into gltf_tangents 2019-02-14 11:45:53 -08:00
John Conklin II
5e177c31ee
Merge pull request #14912 from NissimHadar/21185-protectNitpickFromBadFilename 
Case 21185: protect nitpick from bad filename
 2019-02-14 11:25:36 -08:00
NissimHadar
6752092899 Removed unnecessary member variable. 2019-02-14 10:38:19 -08:00
SamGondelman
dd0d7f0118 merge with master 2019-02-14 09:57:13 -08:00
NissimHadar
701c18c9eb Correction to recursive scripts. 2019-02-14 08:58:09 -08:00
NissimHadar
58c0078188 Reversed order of recursive calls. 2019-02-13 21:07:25 -08:00
NissimHadar
301b4215e5 Fixed gcc warning. 2019-02-13 19:13:08 -08:00
NissimHadar
be5f9b211b Add nitpick to production (but not stable) builds 2019-02-13 18:09:06 -08:00
Andrew Meadows
efe2767f3f
Merge pull request #14913 from SamGondelman/pal 
Case 21147, Case 20944: Fix setTextures (pal, etc.)
 2019-02-13 17:50:08 -08:00
Andrew Meadows
72b5fa1968
Merge pull request #14857 from Atlante45/fix/ess-parenting 
Case 15420: Fix ESS sometimes not getting the parents/children of entities with scripts.
 2019-02-13 17:26:57 -08:00
SamGondelman
13ece79476 merge with master 2019-02-13 16:30:22 -08:00
SamGondelman
3f8bfc5475 CR and fix deadlock 2019-02-13 16:19:39 -08:00
raveenajain
a967d7a1bc tangent attribute 2019-02-13 15:59:55 -08:00
SamGondelman
9e002c59d4 fix pal 2019-02-13 15:24:55 -08:00
NissimHadar
56483f4884 Check that zipped folder name is in correct format. 2019-02-13 15:18:07 -08:00
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
Sam Gateau
a4b4f201c1
Merge pull request #14910 from danteruiz/feature/quest 
Quest re-enable IK.
 2019-02-12 16:41:31 -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
Dante Ruiz
3103ae6ca7 reenable ik 2019-02-12 16:09:47 -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
Brad Davis
4dd853ddbc Cleanup from master 2019-02-12 15:14:50 -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
Brad Davis
db121957d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-12 15:00:03 -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