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

67139 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dante Ruiz
0513204781 fix hmd.js 2018-05-08 15:05:55 -07:00
Stephen Birarda
10b9546104
Merge pull request #13124 from birarda/66-2-to-67 
Merge 66.2 back to 67
 2018-05-08 14:03:07 -07:00
Stephen Birarda
ae2c45bddd Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-08 10:23:14 -07:00
John Conklin II
a6eed27bdd
Merge pull request #13123 from druiz17/RC67 
remove highlight on entity when point to the sky (RC67)
 2018-05-08 07:25:40 -07:00
Dante Ruiz
a593209ec1 remove highlight when point to the sky 2018-05-07 15:33:12 -07:00
Dante Ruiz
9d6019e78c Merge branch 'RC67' of github.com:highfidelity/hifi into RC67 2018-05-07 15:33:00 -07:00
John Conklin II
bec015db5c
Merge pull request #13116 from ElderOrb/FB14818 
Fix for 'Login page for steam is blank'
 2018-05-07 11:26:39 -07:00
John Conklin II
286bed25bd
Merge pull request #13106 from zfox23/RC67_MS14758 
RC67: MS14758: Fix avatar reset when gifting worn avatar
 2018-05-07 10:10:41 -07:00
John Conklin II
8f8c5b4f08
Merge pull request #13105 from druiz17/another-highlight-f-x 
fix-another-highlighting-issue
 2018-05-07 10:05:59 -07:00
John Conklin II
2eb171be1c
Merge pull request #13107 from zfox23/RC67_MS14639 
RC67: Fix for crash deep in QML after useFullAvatarURL
 2018-05-07 10:05:16 -07:00
Alexander Ivash
b4cfea2fbc FB14818 Login page for steam is blank 2018-05-06 17:17:06 +03:00
Anthony J. Thibault
8480bb962b Fix for crash deep in QML after useFullAvatarURL 
Here we avoid calling FSTReader::downloadMapping() from within MyAvatar::useFullAvatarURL().
This prevents the error case where a QEventLoop is entered during QML execution.
 2018-05-04 16:08:44 -07:00
Zach Fox
4ebed7605c MS14758: Fix avatar reset when gifting worn avatar 2018-05-04 16:04:05 -07:00
Dante Ruiz
176d69444f fix-another-highlighting-issue 2018-05-04 14:23:46 -07:00
Dante Ruiz
607de3dfb4 Merge branch 'RC67' of github.com:highfidelity/hifi into RC67 2018-05-04 14:20:57 -07:00
Dante Ruiz
6414fcaae5 fix-another-highlighting-issue 2018-05-04 14:20:17 -07:00
John Conklin II
ea230d8698
Merge pull request #13100 from druiz17/fix-entity-highlighting-during-editing 
Don't highlight entities during edit mode
 2018-05-04 11:32:24 -07:00
Dante Ruiz
a57c72df6e fix entity highlighting during edit mode 2018-05-04 08:53:49 -07:00
John Conklin II
ef997e647a
Merge pull request #13088 from samcake/rc67 
RC67: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
 2018-05-03 16:21:14 -07:00
John Conklin II
182e7c4b5f
Merge pull request #13086 from samcake/rc66.2 
RC 66.2: Fixing the strobing light effect, aka Translucent lighting by ponctual lights
 2018-05-03 15:48:41 -07:00
John Conklin II
b426c4e85d
Merge pull request #13089 from druiz17/RC-67-fix-highlighting 
RC 67 fix entity highlighting
 2018-05-03 15:34:21 -07:00
Dante Ruiz
cffb008c31 fixing edge case 2018-05-03 13:07:32 -07:00
Dante Ruiz
4793cddde6 fix highlighting issues 2018-05-03 11:27:07 -07:00
samcake
60a49c3f7c applying the local lights on translucent fix 2018-05-03 10:37:29 -07:00
samcake
6579e3c3d2 Adjusting the number to 14 max UBO per shader stage after checking on opengl.glinfo.org 2018-05-03 09:09:58 -07:00
Sam Gateau
9776e1d15d Exposing larger number of ubo because we can and moving the ubo slot using 11 to 12 to avoid collision 2018-05-02 23:38:30 -07:00
John Conklin II
f983714702
Merge pull request #13077 from jherico/fix/14638_rc67 
Make resource swapchains immutable
 2018-05-02 15:42:30 -07:00
Bradley Austin Davis
233c60a506 Change type used for swap chain count 2018-05-02 10:29:55 -07:00
Bradley Austin Davis
7bad849e67 Make resource swapchains immutable, fix for 14638 2018-05-02 10:29:40 -07:00
John Conklin II
2dc6b86b20
Merge pull request #13072 from jherico/fix/14638_rc66 
RC66.2: Make resource swapchains immutable
 2018-05-02 10:23:00 -07:00
John Conklin II
256154202e
Merge pull request #13071 from zfox23/RC67_preventImageProviderCrash 
RC67: Fix a crash in Image Provider when logging in or reloading all scripts
 2018-05-01 17:39:43 -07:00
Bradley Austin Davis
fb929da228 Change type used for swap chain count 2018-05-01 16:54:48 -07:00
Bradley Austin Davis
521ae36cbf Make resource swapchains immutable, fix for 14638 2018-05-01 16:07:23 -07:00
Zach Fox
d5f809c3c0 Actually fix 2018-05-01 14:49:44 -07:00
Zach Fox
d1bb37874d Prevent crash in ImageProvider when tablet isn't yet initialized 2018-05-01 14:49:37 -07:00
John Conklin II
a5753c6d94
Merge pull request #13064 from birarda/66-2-to-67 
merge changes in 66.2 to 67
 2018-05-01 12:50:01 -07:00
Stephen Birarda
24dc1c930e Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67 2018-05-01 10:54:35 -07:00
Brad Hefta-Gaub
30e808e133
Merge pull request #13056 from birarda/bug/local-ID-missed-erase 
RC67: add a missing unsafe_erase for local node ID map
 2018-04-30 19:12:03 -07:00
Stephen Birarda
ed47cd8458 add a missing unsafe_erase for local node ID map 2018-04-30 12:35:48 -07:00
John Conklin II
bc7b0ca0a9
Merge pull request #13029 from birarda/bug/revert-12969-in-67 
Fix missed revert of PR 12969 for RC67
 2018-04-30 11:11:38 -07:00
John Conklin II
83d2edc1d5
Merge pull request #13043 from dback2/RC67 
RC67: Desktop equip - ignore right clicks
 2018-04-30 10:16:09 -07:00
David Back
61afd12eeb change to not left button 2018-04-27 16:06:27 -07:00
David Back
0962e1fc16 ignore right clicks 2018-04-27 16:06:14 -07:00
John Conklin II
0b8c7daabf
Merge pull request #13036 from dback2/RC66.2 
RC66.2: Desktop equip - ignore right clicks
 2018-04-27 15:56:19 -07:00
John Conklin II
9bf5549000
Merge pull request #13035 from zfox23/RC67_updateCommerceFor67 
RC67: Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
 2018-04-27 14:46:24 -07:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable 
Merge stable to RC66.2
 2018-04-27 14:42:28 -07:00
David Back
f731a2d08e change to not left button 2018-04-27 13:33:00 -07:00
Brad Hefta-Gaub
71ef12a83c
Merge pull request #13009 from birarda/bug/skybox-in-serverless-66 
66.2: update serverless content with uncompressed KTX skyboxes
 2018-04-27 13:19:43 -07:00
Zach Fox
684d2b08ba Finalize work on MS14295 and MS14559 2018-04-27 12:03:54 -07:00
David Back
db5e5ba99b ignore right clicks 2018-04-27 11:50:53 -07:00