Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-17 09:47:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67121 commits 24 branches 28 tags 1.2 GiB
Commit graph

67121 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Dante Ruiz
176d69444f fix-another-highlighting-issue 2018-05-04 14:23:46 -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
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
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
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
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
Stephen Birarda
ceabe9aed7
Merge pull request #13024 from birarda/bug/home-to-serverless 
66.2: make home go to DEFAULT_HIFI_ADDRESS by default
 2018-04-27 10:59:28 -07:00
Bradley Austin Davis
acb21cc96a Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-27 10:50:47 -07:00
Zach Fox
c163ae63b8 Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:28:59 -07:00
Brad Hefta-Gaub
e4f5eb9cca
Merge pull request #13020 from zfox23/MS14295_GiftsUIFixes 
MS14295: Fix lingering Gifts UI Bugs
 2018-04-27 07:30:14 -07:00
Brad Hefta-Gaub
ac513cdd29
Merge pull request #13019 from zfox23/MS14559_fixNearbyClick1 
MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC
 2018-04-27 07:29:57 -07:00
Seth Alves
6fb36c495c
Merge pull request #13021 from birarda/bug/serverless-needs-path 
update RC67 serverless content to include default path
 2018-04-26 17:53:21 -07:00
Stephen Birarda
d87adcec92 make home go to DEFAULT_HIFI_ADDRESS by default 2018-04-26 17:47:12 -07:00
Anthony Thibault
2455fb678b
Merge pull request #13017 from hyperlogic/feature/jsdoc-custom-hifi-tags 
Added custom jsdoc tags to hifi jsdoc plugin
 2018-04-26 16:56:33 -07:00
Stephen Birarda
e9ac581309 update RC67 serverless content to include default path 2018-04-26 16:31:31 -07:00
Zach Fox
e3b14bf478 MS14295: Fix lingering Gifts UI Bugs 2018-04-26 15:57:37 -07:00
John Conklin II
829a8a533e
Merge pull request #13015 from druiz17/RC66.2 
hide default port from addresses, fix localhost scheme (RC66.2)
 2018-04-26 15:28:39 -07:00
Zach Fox
fc324f67bd MS14559: Fix sometimes being unable to click on 'Nearby' orb when sending Gift/HFC 2018-04-26 15:09:53 -07:00
Anthony J. Thibault
c6b12307aa Added custom jsdoc tags to High Fidelity 
There are 4 new jsdoc tags:

* @hifi-interface - indicates that this namespace or class is available in Interface Scripts.
* @hifi-assignment-client - indicates that this namespace or class is available in Assignment Client Scripts.
* @hifi-client-entity - indicates that this namespace or class is available in Client Entity Scripts.
* @hifi-server-entity - indicates that this namespace or class is avaialbe in Server Entity Scripts.

These tags should appear just after the @class or @namespace tag. For example:

    /**jsdoc
     * Your avatar is your in-world representation of you. The <code>MyAvatar</code> API is used to manipulate the avatar.
     * For example, you can customize the avatar's appearance, run custom avatar animations,
     * change the avatar's position within the domain, or manage the avatar's collisions with other objects.
     *
     * @namespace MyAvatar
     *
     * @hifi-interface
     * @hifi-client-entity
     *
 2018-04-26 14:13:42 -07:00
MiladNazeri
098b432fd9
Merge pull request #13011 from ctrlaltdavid/21856-a 
Docs to JSDoc review updates
 2018-04-26 13:29:48 -07:00
Stephen Birarda
c8d7dc9b91 hide default port from addresses, fix localhost scheme 2018-04-26 13:29:26 -07:00
Stephen Birarda
bc4ce12e64
Merge pull request #13008 from huffman/fix/download-correct-installer 
Fix update installer URLs and add installer info to user activity data
 2018-04-26 11:32:22 -07:00
John Conklin II
8b9d2cdcc8
Merge pull request #12995 from dback2/RC66.2 
RC66.2: Desktop equip/unequip
 2018-04-26 11:20:52 -07:00
Stephen Birarda
9f25103b09
Merge pull request #12972 from sethalves/fix-linux-clang-build 
fix linux clang build
 2018-04-26 10:46:51 -07:00