Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 16:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67202 commits 25 branches 28 tags 1.2 GiB
Commit graph

67202 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
RebeccaStankus
ad422b1012 Merge branch 'master' of https://github.com/highfidelity/hifi into newModelDialog-Fix 2018-04-26 16:34:14 -07:00
RebeccaStankus
4c9514f257 remove landscaping app 2018-04-26 16:34:08 -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
97d793f867 hide default port from addresses, fix localhost scheme 2018-04-26 13:25:56 -07:00
Liv Erickson
ef275485c0 fix alpha sliders for particles 2018-04-26 12:54:37 -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
Ryan Huffman
c12c9ecbb5
Merge pull request #13010 from birarda/bug/skybox-in-serverless-67 
use baked uncompressed KTX skyboxes for macOS compatibility
 2018-04-26 10:45:13 -07:00
Seth Alves
5e790d4898 include machine_fingerprint 2018-04-26 09:49:20 -07:00
Seth Alves
64be0a547c hook up several annotations for crash reporter 2018-04-26 08:49:45 -07:00
Ryan Huffman
4c8b8d8442 Improve installer campaign+type for updates and user activity data 2018-04-26 08:32:18 -07:00
David Rowe
b8063840e7 Miscellaneous fixes 2018-04-26 21:17:05 +12:00
David Rowe
08dc9b133f Docs to JSDoc review 2018-04-26 21:10:28 +12:00
Stephen Birarda
d3661ac22c use baked uncompressed KTX skyboxes for macOS compatibility 2018-04-25 18:23:45 -07:00
Stephen Birarda
f30e34e864 update serverless content with uncompressed KTX skyboxes 2018-04-25 18:18:37 -07:00
Clément Brisset
2be40d487e
Merge pull request #13002 from birarda/sixty-six-one-mergeback 
merge RC66.1 back to master
 2018-04-25 15:47:56 -07:00
John Conklin II
a1aa689a81
Merge pull request #12954 from highfidelity/RC66.1 
Beta Release 66.1 - branched at Developer Release 8108
 2018-04-25 15:34:50 -07:00
Liv Erickson
afea186784 fix for both functions 2018-04-25 14:39:04 -07:00
Stephen Birarda
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -07:00
John Conklin II
cb7b03652b
Merge pull request #12796 from MiladNazeri/feature/add-findByName 
added Entities.findbyName
 2018-04-25 14:00:10 -07:00
Liv Erickson
1860e66bd2 Merge branch 'master' of github.com:highfidelity/hifi into fix/import-whitespace 2018-04-25 13:52:55 -07:00
John Conklin II
282d319972
Merge pull request #12977 from birarda/feat/new-serverlesss-tutorial 
update serverless content for RC67
 2018-04-25 13:23:22 -07:00
Brad Hefta-Gaub
a69ded05d8
Merge pull request #12997 from birarda/bug/avatar-mixer-agent-crash 
66.1 fix: use the correct joint count for other avatar last sent
 2018-04-25 13:17:05 -07:00
John Conklin II
43aed66494
Merge pull request #12993 from highfidelity/revert-12983-fix/web_crash_66 
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"
 2018-04-25 13:02:32 -07:00
MiladNazeri
0f87e53902
Merge pull request #12963 from MiladNazeri/docs/DocsToJSDocsUpdate 
Docs/docs to js docs update
 2018-04-25 12:26:19 -07:00
Stephen Birarda
6c0177e2bd use the correct joint count for other avatar last sent 2018-04-25 11:50:53 -07:00
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856 
Docs to JSDoc
 2018-04-25 11:36:34 -07:00
John Conklin II
0cc43a95c8
Merge pull request #12951 from birarda/feat/installer-special-tutorial 
allow download of serverless content for specific campaign
 2018-04-25 11:35:30 -07:00
John Conklin II
eef3bc2df5
Merge pull request #12980 from dback2/desktopEquip 
Desktop equip - deleted/cleared entities fix
 2018-04-25 11:35:04 -07:00
John Conklin II
748c8cdc58
Merge pull request #12861 from Zvork/taapre 
Bloom and Temporal Anti-Aliasing improvements
 2018-04-25 11:16:56 -07:00
David Back
86b64fe3ab fix mouse equipping while someone else far grabbing 2018-04-25 10:22:39 -07:00
David Back
3c441f0312 safer clear grab actions 2018-04-25 10:22:30 -07:00
David Back
6a3303fe3e tabs 2018-04-25 10:22:12 -07:00
David Back
5bf48041df tabs 2018-04-25 10:22:02 -07:00
David Back
07fb604090 add entityIsEquipped utils for grab.js check 2018-04-25 10:21:48 -07:00
unknown
4a08a6c147 ensure target mouse entity has equip data 2018-04-25 10:21:39 -07:00
unknown
3a35fa1c08 missing reset flag on end equip, remove mouseEquip check on unequip via U 2018-04-25 10:21:30 -07:00
David Back
a869b58dfb fix bracket 2018-04-25 10:21:22 -07:00
David Back
0f2679b725 pre PR adjustments 2018-04-25 10:21:14 -07:00
David Back
4446ef853f remove animations 2018-04-25 10:21:02 -07:00
David Back
de4aff630a fix grab.js change 2018-04-25 10:20:53 -07:00
David Back
d03fcb5ed8 desktop equip 2018-04-25 10:20:41 -07:00