Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 11:18:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67262 commits 25 branches 0 tags 1.1 GiB
Commit graph

24879 commits

Author SHA1 Message Date
Gabriel Calero
a653c7df0b Fix build 2018-05-02 14:59:46 -03:00
Gabriel Calero
e83f1a8ec7 Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login 2018-05-02 12:20:23 -03:00
Gabriel Calero
0f08bd8fa1 Use a single AccountManager for android. 2018-05-02 12:11:11 -03:00
Gabriel Calero
3a1bfefc22 Merge remote-tracking branch 'upstream/master' into android_new_login 2018-05-02 10:09:56 -03:00
Stephen Birarda
f5441c05b3 Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master 2018-05-01 14:18:24 -07:00
Stephen Birarda
cad63ad107 Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" 
This reverts commit acb21cc96a.
 2018-05-01 14:15:12 -07:00
John Conklin II
250aa3ab43
Merge pull request #13027 from jherico/fix/web_crash2 
Some fixes for QML surfaces
 2018-05-01 12:39:46 -07:00
MiladNazeri
3bb09024ec
Merge pull request #13058 from ctrlaltdavid/21856-e 
Fix LODManager JSDoc
 2018-05-01 12:25:37 -07:00
Zach Fox
c42b13134f
Merge pull request #13063 from zfox23/preventImageProviderCrash 
Fix a crash in Image Provider when logging in or reloading all scripts
 2018-05-01 11:55:15 -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
Zach Fox
cd76336e6a Actually fix 2018-05-01 09:54:23 -07:00
David Rowe
65f5915372 Add JSDoc for startFarTrigger etc. calls on entity scripts 2018-05-01 21:55:27 +12:00
Zach Fox
f69ee41074 Prevent crash in ImageProvider when tablet isn't yet initialized 2018-04-30 17:13:44 -07:00
David Rowe
f9bda6df15 Fix LODManager JSDoc 2018-05-01 11:36:37 +12:00
Zach Fox
9b80c500e3
Merge pull request #13039 from zfox23/sideloadAppJson 
Enable sideloading .app.json Apps from local disk
 2018-04-30 11:14:24 -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
b6afaccdf3
Merge pull request #13041 from RebeccaStankus/newModelDialog-Fix 
New model dialog fix
 2018-04-30 10:08:54 -07:00
John Conklin II
acf5ffc5ba
Merge pull request #12970 from sethalves/backtrace-annotations-1 
Backtrace Attributes
 2018-04-30 10:07:11 -07:00
Brad Davis
8e42bb8c87 Restore the stop functionality for a browser view when it's being destroyed 2018-04-27 17:35:38 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -07:00
Gabriel Calero
ce8bd13685 Cleanup android code 2018-04-27 18:58:09 -03:00
Stephen Birarda
5324ea6d5d
Merge pull request #13038 from highfidelity/stable 
Merge stable to RC66.2
 2018-04-27 14:42:28 -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
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
Zach Fox
684d2b08ba Finalize work on MS14295 and MS14559 2018-04-27 12:03:54 -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
Zach Fox
bbc15cdc63 Finalize work on MS14295 and MS14559 2018-04-27 11:04:46 -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
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
Stephen Birarda
d87adcec92 make home go to DEFAULT_HIFI_ADDRESS by default 2018-04-26 17:47:12 -07:00
Zach Fox
e3b14bf478 MS14295: Fix lingering Gifts UI Bugs 2018-04-26 15:57:37 -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
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
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
956cc411d5 Merge branch 'RC66.1' of github.com:highfidelity/hifi into sixty-six-one-mergeback 2018-04-25 14:33:23 -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
John Conklin II
f04200a620
Merge pull request #12976 from ctrlaltdavid/21856 
Docs to JSDoc
 2018-04-25 11:36:34 -07:00
Bradley Austin Davis
ea0ef20416
Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently" 2018-04-25 09:43:20 -07:00
Olivier Prat
f332849d9a Merge branch 'master' of http://github.com/highfidelity/hifi into taapre 2018-04-25 09:19:21 +02:00