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

67292 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Back
729f3366ff
Merge pull request #13033 from dback2/desktopEquip 
Desktop equip - ignore right clicks
 2018-04-27 14:36:26 -07:00
RebeccaStankus
269a7f0e15 Changed maximum line count for warning message 2018-04-27 14:34:08 -07:00
Zach Fox
dbd7d7e2b4 Small cleanup 2018-04-27 14:19:58 -07:00
Zach Fox
ea716f2a1e Enable sideloading .app.json Apps from local disk 2018-04-27 14:08:53 -07:00
Brad Davis
5f8149fd68 Remove debugging pragma 2018-04-27 13:57:22 -07:00
Zach Fox
c0fe504713
Merge pull request #13030 from zfox23/finalize_14295_14559 
Finalize work on MS14295 and MS14559
 2018-04-27 13:49:02 -07:00
David Back
f731a2d08e change to not left button 2018-04-27 13:33:00 -07:00
David Back
8d49d1c118 change to not left button 2018-04-27 13:32:05 -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
John Conklin II
ddedfce8a3
Merge pull request #12932 from ZappoMan/fixBug349 
fix bug 349
 2018-04-27 12:48:17 -07:00
John Conklin II
73b175a1f2
Merge pull request #12934 from misslivirose/fix/import-whitespace 
trim before importing from clipboard
 2018-04-27 12:44:35 -07:00
Zach Fox
684d2b08ba Finalize work on MS14295 and MS14559 2018-04-27 12:03:54 -07:00
RebeccaStankus
678ba087fc Merge branch 'master' of https://github.com/highfidelity/hifi into newModelDialog-Fix 2018-04-27 11:59:48 -07:00
Howard Stearns
f8ad36afd0
Merge pull request #13028 from zfox23/updateCommerceFor67 
Allow gifting of Pending items; remove PoP verification rescheduling on Pending items
 2018-04-27 11:55:40 -07:00
David Back
db5e5ba99b ignore right clicks 2018-04-27 11:50:53 -07:00
David Back
78436ebcbf ignore right clicks 2018-04-27 11:30:45 -07:00
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -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
Zach Fox
0f36fb113d Allow gifting of Pending items; remove PoP verification rescheduling on Pending items 2018-04-27 10:20:55 -07:00
RebeccaStankus
9e641e6efa Merge branch 'master' of https://github.com/highfidelity/hifi into newModelDialog-Fix 2018-04-27 09:04:48 -07:00
Brad Davis
f2172d84a0 Add stress test for QML web content 2018-04-27 08:35:20 -07:00
Brad Davis
e892694bf5 Don't modify URL on web entity on QML shutdown, remove tablet related code from web entity 2018-04-27 08:13:35 -07:00
Brad Davis
1b612d373f Explicitly delete QML context before releasing engine 2018-04-27 08:11:11 -07:00
Brad Davis
6640313256 Fix memory leak in QML surfaces 2018-04-27 08:10:22 -07:00
Brad Davis
4db83230ce Fix bad virtual cast on qml surface destruction 2018-04-27 08:09:31 -07:00
Brad Davis
2662dc9b4e Suppress tracing log spam when tracing is not active 2018-04-27 08:03:48 -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
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
Andrew Meadows
03e03727db fix bug: interface sends too many updates on settle 2018-04-26 12:55:28 -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