Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 16:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
76880 commits 25 branches 0 tags 1.1 GiB
Commit graph

76880 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
eee41bc41e Revert "Pack all non-instanced traits" 
This reverts commit 5b7d7b8833.
 2019-02-12 13:46:21 -08:00
Andrew Meadows
9f9f512c59 undoing markDirty() overhead because _flags is atomic 2019-02-12 13:22:22 -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
Andrew Meadows
3ea6241cc9 send update for AvatarEntity on deleteGrab 2019-02-12 12:50:47 -08:00
Sam Gateau
a10cf9b620
Merge pull request #14883 from amerhifi/feature/quest 
case:21032 Fixing Lifecycle of the android app
 2019-02-12 12:32:38 -08:00
John Conklin II
4a3a6261a5
Merge pull request #14898 from danteruiz/rc-fix-soft-entities 
Case 21102: Wearer and observer disagree on whether a worn item is correctly placed
 2019-02-12 12:30:49 -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
Brad Davis
a6f23f48d6 Merge branch 'feature/quest_custom_plugins' into feature/quest 2019-02-12 09:53:12 -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
Angus Antley
7bb353742a more tweaks to get the wrist action right 2019-02-12 07:40:18 -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
amantley
bb29e382f0 tweaking the hand pose correction on the pole vector 2019-02-11 18:05:29 -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
luiscuenca
942e9ccdfd Hand collisions working 2019-02-11 18:21:00 -07:00
danteruiz
a7e28f7a66 fix spatially nestable parent overwrite 2019-02-11 17:04:07 -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
Andrew Meadows
fab3e5e3fd remember hash of AvatarEntityItemData 2019-02-11 16:13:56 -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
amerhifi
3cada9722c undoing some unfavorable changes 2019-02-11 15:01:22 -08:00