Skip to content

Commit bea1243

Browse files
Merge pull request #1 from cpp-lln-lab/master
update
2 parents 654c1a4 + f4820bd commit bea1243

File tree

3 files changed

+82
-1
lines changed

3 files changed

+82
-1
lines changed

.all-contributorsrc

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"files": [
3+
"README.md"
4+
],
5+
"imageSize": 100,
6+
"commit": false,
7+
"contributors": [
8+
{
9+
"login": "Remi-Gau",
10+
"name": "Remi Gau",
11+
"avatar_url": "https://avatars3.githubusercontent.com/u/6961185?v=4",
12+
"profile": "https://remi-gau.github.io/",
13+
"contributions": [
14+
"code",
15+
"design",
16+
"doc"
17+
]
18+
},
19+
{
20+
"login": "marcobarilari",
21+
"name": "marcobarilari",
22+
"avatar_url": "https://avatars3.githubusercontent.com/u/38101692?v=4",
23+
"profile": "https://github.com/marcobarilari",
24+
"contributions": [
25+
"code",
26+
"design",
27+
"doc"
28+
]
29+
}
30+
],
31+
"contributorsPerLine": 7,
32+
"projectName": "CPP_PTB",
33+
"projectOwner": "cpp-lln-lab",
34+
"repoType": "github",
35+
"repoHost": "https://github.com",
36+
"skipCi": true
37+
}

LICENSE

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2020 Crossmodal Perception and Plasticity laboratory
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

README.md

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
# CPP_PTB
2+
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
3+
[![All Contributors](https://img.shields.io/badge/all_contributors-2-orange.svg?style=flat-square)](#contributors-)
4+
<!-- ALL-CONTRIBUTORS-BADGE:END -->
25

36
List of PsychToolBox (PTB) related functions for the Crossmodal Perpcetion and Plasticity lab (CPP)
47

58
Most of the functions here are mostly wrappers around some PTB functions to facilitate their use and to have a codebase to facilitate their reuse.
69

710
## Code guidestyle
811

9-
We use the `pascalCase` to more easily differentiates our functions from the ones from PTB that use a `CamelCase`.
12+
We use the `camelCase` to more easily differentiates our functions from the ones from PTB that use a `PascalCase`.
1013

1114
## Structure and function details
1215

@@ -36,3 +39,23 @@ keyboardNames
3639

3740

3841
### cleanUp
42+
43+
## Contributors ✨
44+
45+
Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
46+
47+
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
48+
<!-- prettier-ignore-start -->
49+
<!-- markdownlint-disable -->
50+
<table>
51+
<tr>
52+
<td align="center"><a href="https://remi-gau.github.io/"><img src="https://avatars3.githubusercontent.com/u/6961185?v=4" width="100px;" alt=""/><br /><sub><b>Remi Gau</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Code">💻</a> <a href="#design-Remi-Gau" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=Remi-Gau" title="Documentation">📖</a></td>
53+
<td align="center"><a href="https://github.com/marcobarilari"><img src="https://avatars3.githubusercontent.com/u/38101692?v=4" width="100px;" alt=""/><br /><sub><b>marcobarilari</b></sub></a><br /><a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Code">💻</a> <a href="#design-marcobarilari" title="Design">🎨</a> <a href="https://github.com/cpp-lln-lab/CPP_PTB/commits?author=marcobarilari" title="Documentation">📖</a></td>
54+
</tr>
55+
</table>
56+
57+
<!-- markdownlint-enable -->
58+
<!-- prettier-ignore-end -->
59+
<!-- ALL-CONTRIBUTORS-LIST:END -->
60+
61+
This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

0 commit comments

Comments
 (0)