Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-08 11:43:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
64504 commits 6 branches 1 tag 1.1 GiB
Commit graph

64504 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
2270dcd79d Merge pull request #12316 from zfox23/commerce_inspectionCertRedesign 
Commerce: Inspection Certificate Redesign
 2018-02-07 13:52:20 -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
Liv Erickson
be4a009e11 make it so only the icon on collapse headers collapses headers 2018-02-07 13:18:32 -08:00
Bradley Austin Davis
fcb59a4ee6 Fixing android 2018-02-07 11:06:30 -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
Dante Ruiz
a03cfb835d Merge branch 'master' of github.com:highfidelity/hifi into fix-camera-update 2018-02-07 10:39:23 -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
Liv Erickson
62de08f324 fix issue with top icon changing 2018-02-07 10:16:27 -08:00
David Back
d44ce78efc Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-07 10:10:05 -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
NissimHadar
5579eac034 Nothing... 2018-02-06 16:42:25 -08:00
David Back
a279819014 woops 2018-02-06 16:33:27 -08:00
NissimHadar
d5bf9cdbcd Updated JSDoc comments. 2018-02-06 16:16:25 -08:00
David Back
26a56f0173 Merge branch 'master' of https://github.com/highfidelity/hifi into polymaterials 2018-02-06 16:12:30 -08:00
David Back
5a1652e905 Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab 2018-02-06 16:07:54 -08:00
David Back
51b55aedcf CR changes, fix colors, add minimum overlay dimensions for HMD 2018-02-06 16:07:46 -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
Dante Ruiz
365a1fcdab Merge branch 'master' of github.com:highfidelity/hifi into fix-lasers-going-to-origin 2018-02-06 13:45:14 -08:00
Dante Ruiz
4f0ca6a904 fix lasers going to origin 2018-02-06 13:44:59 -08:00
Andrew Meadows
672520f3bf quickfix for velocity spike for Tractor action 2018-02-06 12:06:27 -08:00
Brad Davis
7d5502eb92 Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00
NissimHadar
faec9a62b6 Changed "" to QString() 2018-02-06 11:01:50 -08:00
Bradley Austin Davis
f291715f87 Merge remote-tracking branch 'zvork/scribe' into fix/shader_length 2018-02-06 10:36:15 -08:00
Alexander Ivash
151f20a92f define onWalletScreen in this marketplaces.js scope 2018-02-06 21:25:41 +03:00
David Back
22c0ca86ed Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab 2018-02-06 10:10:39 -08:00
Seth Alves
81f75925da
Merge pull request #12337 from druiz17/fix-sit-script 
fixing teleport module for sit script
 2018-02-06 09:40:36 -08:00
John Conklin II
0e3bcda859
Merge pull request #12336 from sethalves/bump-av-protocol-more 
try harder to bump avatar-mixer protocol version
 2018-02-06 09:12:03 -08:00
Olivier Prat
d248e1ed79 Merge branch 'master' of http://github.com/highfidelity/hifi into scripts 2018-02-06 18:00:38 +01:00