Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 07:56:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
67578 commits 6 branches 1 tag 1.1 GiB
Commit graph

24993 commits

Author SHA1 Message Date
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
luiscuenca
2ac7fcadd2 load scripts once on rigReady 2018-05-01 09:37:01 -07:00
NissimHadar
97152ef9c1 Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester 2018-05-01 09:33:07 -07:00
David Rowe
65f5915372 Add JSDoc for startFarTrigger etc. calls on entity scripts 2018-05-01 21:55:27 +12:00
NissimHadar
d5610a2f37 WTF... 2018-04-30 17:52:44 -07:00
NissimHadar
c01fd02de2 Corrected parameter type. 2018-04-30 17:23:49 -07:00
NissimHadar
6d8eee6b32 Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester 2018-04-30 17:19:29 -07: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
luiscuenca
50ca09b3b4 minor fixes 2018-04-30 16:26:04 -07:00
Atlante45
250806252e Don't use unique_ptr to store CrashpadClient 2018-04-30 12:37:18 -07:00
Atlante45
5ab16302ca Keep CrashpadClient around 2018-04-30 12:36:17 -07:00
luiscuenca
2de982a5a2 Added script types and better script reload 2018-04-30 12:04:35 -07:00
Liv Erickson
b994776ebd do not open help on first run 2018-04-30 12:01:37 -07: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
Cristian Luis Duarte
401bf2f2a4 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-04-30 14:38:32 -03: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
David Rowe
2cc3ed6287 List which contexts each namespace and object is available in 2018-04-28 20:00:28 +12: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
NissimHadar
cf9b089a3c Added option to set snapshot location (for this execution only) from the command line. 2018-04-27 17:18:16 -07:00
John Conklin II
dd32ca33a5
Merge pull request #12957 from sethalves/quiet-logging 
Quiet logging
 2018-04-27 14:59:38 -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
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
Dante Ruiz
290c31d916 don't spam resetSensors 2018-04-27 11:33:45 -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
luiscuenca
12f578c93c More fixes 2018-04-25 19:46:31 -07:00
luiscuenca
e0770f06b1 Add scripts to Model Packager 2018-04-25 19:35:26 -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
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
milad nazeri
4c736b2d62 Fixed defaults 2018-04-24 21:38:48 -07:00
David Rowe
cae9447ac5 Doc review 2018-04-25 15:09:47 +12:00
luiscuenca
165c3214a7 Avatar Scripts 2018-04-24 18:43:53 -07:00
samcake
f2c76abafa Apply the noAA /popJittering on the WebOverlay 2018-04-24 14:18:44 -07:00
Brad Hefta-Gaub
497c3fac4d
Merge pull request #12971 from Atlante45/fix/crashes-hotfix 
Add memory corruption crash handler
 2018-04-24 14:01:09 -07:00
Dante Ruiz
29fce488e4 make some changes 2018-04-24 14:00:52 -07:00
Dante Ruiz
b2925c5843 fixing attachments not being visible when coming out of first person 2018-04-24 13:32:30 -07:00
John Conklin II
236e75b6c6
Merge pull request #12903 from druiz17/add-more-hmd-data 
Get the correct device name connect to OpenVr
 2018-04-24 13:29:41 -07:00
milad nazeri
23d07fa292 fixed spacing issue 2018-04-24 13:14:55 -07:00
Clement
0804abcca6 Heap corruption crashes CR 2018-04-24 12:47:13 -07:00
Sam Gateau
da154d3e00
Merge pull request #12969 from jherico/fix/web_crash 
Attempt to shutdown web surfaces more consistently
 2018-04-24 10:15:25 -07:00
Brad Davis
a144de54e7 Attempt to shutdown web surfaces more consistently 2018-04-24 10:06:20 -07:00
milad nazeri
1121fe8da0 fix tabs 2018-04-23 21:47:53 -07:00
David Rowe
98f43b6a70 Interim JSDoc for MyAvatar - stubs for remainder 2018-04-24 10:47:33 +12:00
John Conklin II
5cf93ebd1f
Merge pull request #12966 from SamGondelman/audio 
Fix audio level meter
 2018-04-23 14:56:57 -07:00
Brad Davis
861200db27 Attempt to shutdown web surfaces more consistently 2018-04-23 14:32:38 -07:00
David Rowe
719062dd9f Interim JSDoc for MyAvatar - first pass 2018-04-24 09:10:59 +12:00
Atlante45
f2c471558c CR 2018-04-23 13:14:21 -07:00
Atlante45
bc251115ed Add special handler for heap corruption 2018-04-23 13:14:21 -07:00
Clement
fb496156ce Fix threaded force crashes 2018-04-23 13:14:21 -07:00
John Conklin II
b3dbf7a025
Merge pull request #12943 from vladest/fix_spinbox 
Fix SpinBox.
 2018-04-23 13:02:01 -07:00
SamGondelman
1deb38f06d fix copy error 2018-04-23 12:05:30 -07:00
Gabriel Calero
ccb5e1e06c Commenting out display plugin activation/desactivation 2018-04-23 15:29:51 -03:00
Cristian Luis Duarte
c33f1fbbb1 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-04-23 15:12:56 -03:00
Seth Alves
1dbcbbcced cleanups 2018-04-23 11:05:06 -07:00
Gabriel Calero
001cd5e937 Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-23 14:25:26 -03:00
vladest
cf070e6e92 Cleanup 2018-04-23 18:56:16 +02:00
Sam Gateau
7842ee8eac
Merge pull request #12962 from SamGondelman/menu 
Android: Hide menu and fix shader compilation
 2018-04-23 09:51:20 -07:00
Cristian Luis Duarte
20d91b13dd Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-04-23 13:17:53 -03:00
milad nazeri
4ac06fe99f Updating previous jsdocs 2018-04-22 22:22:33 -07:00
David Rowe
941e9360dd JSDoc fixes 2018-04-23 16:09:56 +12:00
David Rowe
497cb4dab6 Interim JSDoc for Selection 2018-04-23 13:53:35 +12:00
David Rowe
96ddeb4e99 Interim JSDoc for SpeechRecognizer 2018-04-23 11:37:27 +12:00
milad nazeri
e9b9c05b5d removed cruft 2018-04-22 08:51:47 -07:00
vladest
60115752ad Fixed saving after editing 2018-04-21 20:18:24 +02:00
vladest
2e44220b80 Merge branch 'master' into fix_spinbox 2018-04-21 19:38:28 +02:00
David Rowe
34d0a892a0 Point to example using Hardware.Application item 2018-04-21 15:01:46 +12:00
David Rowe
748052614f Doc review 2018-04-21 12:45:00 +12:00
SamGondelman
d59f368ad6 hide menu, fix shaders 2018-04-20 17:38:38 -07:00
Seth Alves
6fc02638d7 control verbose logging with a menu-item in developer menu 2018-04-20 16:08:57 -07:00
Seth Alves
bec39369f7 remove some uncatagorized logging, suppress some categories by default 2018-04-20 16:08:57 -07:00
David Rowe
7087abd201 Merge branch 'master' into 21815 2018-04-21 10:49:56 +12:00
John Conklin II
39ad8be1b8
Merge pull request #12743 from SimonWalton-HiFi/short-id 
Use 16-bit local IDs for Nodes in NL packets
 2018-04-20 15:28:18 -07:00
Cristian Luis Duarte
8235f999d8 Merge remote-tracking branch 'origin/master' into android_places_goto 2018-04-20 17:53:50 -03:00
John Conklin II
4705472960
Merge pull request #12889 from Atlante45/fix/threaded-crashes 
Fix threaded force crashes
 2018-04-20 13:20:40 -07:00
Seth Alves
c20346ca53
Merge pull request #12937 from SamGondelman/startup 
Make Audio.cpp threadsafe
 2018-04-20 11:36:08 -07:00
Simon Walton
9f9a68188d Merge remote-tracking branch 'upstream/master' into short-id 2018-04-20 11:10:21 -07:00
Seth Alves
512b1911eb
Merge pull request #12858 from ctrlaltdavid/21836 
Update location.hostname JSDoc per serverless domains
 2018-04-20 10:27:09 -07:00
SamGondelman
3b4b43cf66 try to fix audio crash on startup 2018-04-20 10:23:47 -07:00
vladest
0e28e41107 Fix various issues with SpinBox-es and Sliders 2018-04-20 19:15:29 +02:00
Cristian Luis Duarte
55e64ceb55 Merge branch 'mm_1e08633' into android_places_goto 2018-04-20 13:32:23 -03:00
vladest
b8577bd791 Merge branch 'master' into fix_spinbox 2018-04-20 18:09:16 +02:00
Cristian Luis Duarte
77caa4d402 Merge branch 'mm_c8bef86' into android_places_goto 2018-04-20 12:26:38 -03:00
Ken Cooke
a9c5edcb2f
Merge pull request #12942 from kencooke/audio-devices-crfix 
Minor changes to meet coding standard
 2018-04-20 08:20:32 -07:00
Gabriel Calero
adfbaac18f Merge remote-tracking branch 'upstream/master' into android_goto_splash 2018-04-19 19:40:00 -03:00
Cristian Luis Duarte
dc321e4cd7 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto 2018-04-19 18:46:44 -03:00
David Rowe
08defea755 Merge branch 'master' into 21836 2018-04-20 09:20:56 +12:00
milad
42471c539b initial fixes from ctralt david's comments 2018-04-19 13:40:57 -07:00
Gabriel Calero
f2184bf456 Handle android back button. Remove unused resources. Fix compilation errors. 2018-04-19 17:31:25 -03:00
Howard Stearns
6d151f022d
Merge pull request #12910 from zfox23/MS12217_letterboxMessageFix 
Only dismiss letterbox when clicking on grey areas
 2018-04-19 11:47:10 -07:00
vladest
663af09605 Fix SpinBox. attempt 1 2018-04-19 20:43:48 +02:00
Seth Alves
6f420ffae2
Merge pull request #12936 from druiz17/more-tablet-changes 
Change tablet model and spawn position
 2018-04-19 10:25:34 -07:00
Sam Gateau
1e086332cc
Merge pull request #12911 from jherico/feature/splash 
Pre-requisite changes for splash screen rendering
 2018-04-19 09:19:05 -07:00
Cristian Luis Duarte
5be9959424 Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto 2018-04-19 12:11:29 -03:00
Gabriel Calero
c8fe45eb8f Remove debug statements and unused code. Put JNI code in a separated file. 2018-04-19 11:41:59 -03:00
Ken Cooke
764aa00069 Coding standard fixes 2018-04-19 07:33:14 -07:00
milad
364d193499 audio added 2018-04-18 21:04:57 -07:00
milad
3f129bda13 More done on audio 2018-04-18 20:04:41 -07:00
Stephen Birarda
c4ad93bafb
Merge pull request #12782 from SimonWalton-HiFi/qregexp 
Replace LogHandler repeated regex scheme with assigned ID tracking scheme
 2018-04-18 17:28:48 -07:00
Zach Fox
e01e7cc7bc Be a bit more efficient 2018-04-18 16:34:02 -07:00
Zach Fox
e0012ed5dc
Merge pull request #12924 from zfox23/MS12292_snapshotResourcesPath 
Fix paths to various Snapshot resource files
 2018-04-18 13:44:53 -07:00
Dante Ruiz
9d6fc13a04 Merge branch 'master' of github.com:highfidelity/hifi into more-tablet-changes 2018-04-18 13:06:51 -07:00
Dante Ruiz
a65f5f7917 making tablet changes 2018-04-18 13:06:26 -07:00
Cristian Luis Duarte
9c44be3557 Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto 2018-04-18 16:55:08 -03:00
Gabriel Calero
472cc1b29a Fix code spacing 2018-04-18 16:44:49 -03:00
Gabriel Calero
120de92c9e Add login activity 2018-04-18 15:52:02 -03:00
John Conklin II
710bfb894a
Merge pull request #12907 from AndrewMeadows/more-correct-stats-002 
more correct stats names
 2018-04-18 10:50:38 -07:00
John Conklin II
d19bb557ad
Merge pull request #12897 from ctrlaltdavid/21848 
Include JSDoc Web pages in the install
 2018-04-18 10:49:31 -07:00
John Conklin II
005b6a6b1f
Merge pull request #12893 from ctrlaltdavid/21843 
Fix overlay toggling
 2018-04-18 10:49:05 -07:00
Atlante45
7e6d45ead7 CR 2018-04-17 16:25:07 -07:00
Stephen Birarda
95c172f418 Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66 2018-04-17 15:34:46 -07:00
Zach Fox
3b8e52ea41
Merge pull request #12862 from zfox23/discovery_April2018 
Discovery: April 2018 (Huge PR; see description)
 2018-04-17 15:11:50 -07:00
Atlante45
a626e9f6f3 Add special handler for heap corruption 2018-04-17 15:09:10 -07:00
Brad Davis
d478204722 Working on splash rendering 2018-04-17 14:17:41 -07:00
Zach Fox
95ee3c82f5 Fix paths to various Snapshot resource files 2018-04-17 14:13:14 -07:00
David Rowe
e3edc45081 Document NavigationFocused 2018-04-18 07:04:55 +12:00
Cristian Luis Duarte
744fa808e3 Merge remote-tracking branch 'hifi/master' into android_places_goto 2018-04-17 13:11:02 -03:00
David Rowe
c1ede6ef58 Merge branch 'master' into 21815 
# Conflicts:
#	tools/jsdoc/plugins/hifi.js
 2018-04-17 11:54:56 +12:00
David Rowe
9f83c606e9 Controller API JSDoc 2018-04-17 11:46:40 +12:00
Anthony J. Thibault
0a162e62b0 transmit sendAll packet in nodeActivated signal callback 
(cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)
 2018-04-16 16:16:56 -07:00
Zach Fox
93cf399fd6 Only dismiss letterbox when clicking on grey areas 2018-04-16 15:09:19 -07:00