SamGondelman
|
ad40961864
|
fix tangents (I think), update material rendering when transform changes
|
2018-02-12 13:46:27 -08:00 |
|
SamGondelman
|
9e8aa1898c
|
warnings, load material from URL, shapeID -> parentMaterialID
|
2018-02-12 12:50:09 -08:00 |
|
SamGondelman
|
5337377ef5
|
Merge remote-tracking branch 'upstream/master' into decals
|
2018-02-09 14:40:20 -08:00 |
|
SamGondelman
|
84cd0e1529
|
wip live material swapping on model entities, model overlays, avatars,
and albedo swap on shape entities
|
2018-02-09 12:00:08 -08:00 |
|
John Conklin II
|
02e9bd4fbc
|
Merge pull request #12348 from druiz17/fix-lasers-going-to-origin
Fix lasers going to origin when trying to far grab.
|
2018-02-09 11:48:00 -08:00 |
|
Sam Gateau
|
047d24fe5e
|
Merge pull request #12340 from jherico/fix/shader_length
Fix overlimit shader char strings
|
2018-02-09 09:31:15 -08:00 |
|
Dante Ruiz
|
2ae976d256
|
Merge pull request #10 from sethalves/laser-bug
allow overlay children to follow avatar from one domain to another
|
2018-02-08 17:20:18 -08:00 |
|
Seth Alves
|
5e16623c81
|
allow overlay children to follow avatar from one domain to another
|
2018-02-08 17:17:04 -08:00 |
|
Dante Ruiz
|
071a746342
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin
|
2018-02-08 17:13:58 -08:00 |
|
Dante Ruiz
|
0dac851def
|
fixing case when grabbed target is destroyed
|
2018-02-08 17:08:51 -08:00 |
|
Brad Hefta-Gaub
|
a6c8172990
|
Merge pull request #12370 from jherico/fix/deadlock_shaders
Prevent deadlock crashes when building shaders at startup
|
2018-02-08 14:44:46 -08:00 |
|
Brad Hefta-Gaub
|
5aeadf04cf
|
Merge pull request #12371 from highfidelity/stable
Merge stable back into master
|
2018-02-08 14:39:37 -08:00 |
|
divya
|
97abdb63db
|
Merge pull request #12364 from jherico/fix/display_plugin_crash
Don't trigger a backtrace exception on quitting while in HMD
|
2018-02-08 11:18:19 -08:00 |
|
John Conklin II
|
d0cfdfb4ca
|
Merge pull request #12368 from jherico/fix/offscreen_deadlock
Fix for deadlock triggering while loading QML engine
|
2018-02-08 10:37:46 -08:00 |
|
Bradley Austin Davis
|
8748e98b5e
|
Prevent deadlock crashes when building shaders at startup
|
2018-02-08 10:23:25 -08:00 |
|
John Conklin II
|
933e1f4735
|
Merge pull request #12360 from sethalves/fix-accountname-and-goto
undo part of #12312
|
2018-02-08 09:17:24 -08:00 |
|
Dante Ruiz
|
a0ec0f10b4
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin
|
2018-02-08 09:11:50 -08:00 |
|
Bradley Austin Davis
|
77741c2851
|
Fix for deadlock triggering while loading QML engine
|
2018-02-07 16:43:15 -08:00 |
|
Bradley Austin Davis
|
2c514b5d1b
|
Don't trigger a backtrace exception on quitting while in HMD
|
2018-02-07 15:28:04 -08:00 |
|
John Conklin II
|
40851b097f
|
Merge pull request #12324 from ElderOrb/FB11844
Fix the issue with not re-enabling preview after it was auto-disabled by wallet/marketplace
|
2018-02-07 14:31:20 -08:00 |
|
Seth Alves
|
fdbfeab3ea
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-accountname-and-goto
|
2018-02-07 14:22:26 -08:00 |
|
Seth Alves
|
8d35bcb3e5
|
Merge pull request #12347 from AndrewMeadows/quickfix-tractor
remove initial glitch in Tractor (grab) action
|
2018-02-07 14:22:12 -08:00 |
|
Seth Alves
|
84ed23f547
|
Merge pull request #12292 from ElderOrb/FB11855
FB11855 - Change bubble icon on tablet
|
2018-02-07 14:03:16 -08:00 |
|
John Conklin II
|
632390e6b0
|
Merge pull request #12353 from highfidelity/RC63.2
HOTFIX 63.3
|
2018-02-07 13:57:50 -08:00 |
|
Zach Fox
|
7c492ef1cd
|
Merge pull request #12358 from highfidelity/revert-12316-commerce_inspectionCertRedesign
Revert "Commerce: Inspection Certificate Redesign"
|
2018-02-07 13:51:20 -08:00 |
|
Seth Alves
|
84f4453990
|
undo part of #12312
|
2018-02-07 13:32:30 -08:00 |
|
Zach Fox
|
3c34d13ec6
|
Revert "Commerce: Inspection Certificate Redesign"
|
2018-02-07 13:22:09 -08:00 |
|
Andrew Meadows
|
d056e606c1
|
Merge pull request #31 from sethalves/test-12347
fix near-grab
|
2018-02-07 10:49:49 -08:00 |
|
Seth Alves
|
3e516cd2dd
|
Merge branch 'quickfix-tractor' of github.com:AndrewMeadows/hifi into test-12347
|
2018-02-07 10:48:19 -08:00 |
|
Andrew Meadows
|
57aef54237
|
pull master into AndrewMeadows/quickfix-tractor
|
2018-02-07 10:46:15 -08:00 |
|
Seth Alves
|
3e913cfcfe
|
AvatarActionHold has positional and rotational targets
|
2018-02-07 10:45:13 -08:00 |
|
Zach Fox
|
a40244b5d2
|
Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign
Commerce: Inspection Certificate Redesign
|
2018-02-07 10:19:30 -08:00 |
|
Bradley Austin Davis
|
ae092f6c0b
|
Merge remote-tracking branch 'upstream/master' into fix/shader_length
|
2018-02-07 09:48:23 -08:00 |
|
Seth Alves
|
b44ae6b671
|
Merge branch 'master' of github.com:highfidelity/hifi into test-12347
|
2018-02-07 09:48:07 -08:00 |
|
Bradley Austin Davis
|
52af45a355
|
Create scribe only build mode
|
2018-02-07 09:47:51 -08:00 |
|
Bradley Austin Davis
|
a578e64416
|
Remove Qt dependency from scribe
|
2018-02-07 09:44:45 -08:00 |
|
Leonardo Murillo
|
5e02d67d8c
|
Merge pull request #12354 from jherico/rc_scribe_fix
Use version IDs in scribe tool downloads
|
2018-02-07 11:27:05 -06:00 |
|
Sam Gateau
|
27c9b0f39e
|
Merge pull request #12083 from NissimHadar/zoneOrientation
Zone orientation effect on keylight, skybox and ambient light.
|
2018-02-07 09:05:04 -08:00 |
|
Seth Alves
|
8239949da5
|
Merge branch 'master' of github.com:highfidelity/hifi into test-12347
|
2018-02-07 08:47:19 -08:00 |
|
Bradley Austin Davis
|
6c0ca1b7b8
|
Use version IDs in scribe tool downloads
|
2018-02-07 08:31:26 -08:00 |
|
NissimHadar
|
d01f9cd1fb
|
Fixing git crap.
|
2018-02-06 23:51:08 -08:00 |
|
Brad Hefta-Gaub
|
0b6dea3d10
|
Merge pull request #12350 from ctrlaltdavid/21743
Fix the spectator camera
|
2018-02-06 19:55:02 -08:00 |
|
Brad Hefta-Gaub
|
2bb119037a
|
Merge pull request #12351 from samcake/RC63.2
Restore FPS threshold for increasing LOD after it decreased in heavy scenes
|
2018-02-06 19:54:40 -08:00 |
|
Bradley Austin Davis
|
6092f1503e
|
Fixing android build
|
2018-02-06 17:22:06 -08:00 |
|
samcake
|
72749e139a
|
changing the Increase LOD gap to 10 to start upping earlier
|
2018-02-06 16:00:49 -08:00 |
|
Bradley Austin Davis
|
0455fb37b6
|
Merge remote-tracking branch 'upstream/master' into fix/shader_length
|
2018-02-06 15:55:01 -08:00 |
|
samcake
|
3ed633ebea
|
FIxing the get***LODIncreaseFPS functions evaluation of the threshold FPS for starting increasing LOD again
|
2018-02-06 15:52:32 -08:00 |
|
Sam Gateau
|
346626498d
|
Merge pull request #12349 from jherico/android_scribe
Use version IDs in scribe tool downloads
|
2018-02-06 15:49:19 -08:00 |
|
David Rowe
|
665bd6825f
|
Fix the spectator camera
|
2018-02-07 12:27:56 +13:00 |
|
Bradley Austin Davis
|
0c37263d95
|
Use version IDs in scribe tool downloads
|
2018-02-06 14:51:51 -08:00 |
|