Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge bevyengine/bevy -> ashneverdawn/bevy #1

Merged
merged 59 commits into from
Aug 24, 2020
Merged
Changes from 1 commit
Commits
Show all changes
59 commits
Select commit Hold shift + click to select a range
f3ef23b
Working on correctly reflecting shader stage for bind groups.
StarArawn Aug 14, 2020
76564a4
Removed old comment.
StarArawn Aug 14, 2020
eac53c1
Fixed! :tada:
StarArawn Aug 15, 2020
e11fa3e
Added hack to allow all of the examples to work.
StarArawn Aug 15, 2020
9883cd1
Replace vector of UniformProperty with a single property
lachlansneff Aug 16, 2020
1ec7183
profiling: fix build
multun Aug 16, 2020
ece54e9
diagnostics: add missing feature dependency
multun Aug 16, 2020
d138647
enforce cargo fmt --check
multun Aug 16, 2020
c38420f
enforce clippy for all target and features
multun Aug 16, 2020
dfbdeeb
render: fix bind group PartialEq impl
multun Aug 16, 2020
e36b26c
render: fix RenderResourceBinding PartialEq impl
multun Aug 16, 2020
f92f6a4
Merge pull request #204 from multun/fix-profiling-build
cart Aug 16, 2020
77ebb46
Merge pull request #201 from multun/cargo-fmt
cart Aug 16, 2020
e24aaf3
Add Draw command to RenderCommand
lachlansneff Aug 16, 2020
cf8bab2
unused import
Aug 16, 2020
99e39b5
Merge pull request #212 from GabLotus/master
cart Aug 16, 2020
ccfa815
Use can_draw in can_draw_indexed
lachlansneff Aug 17, 2020
81d30dd
Created README for examples
0x22fe Aug 17, 2020
6e4c959
Merge pull request #211 from lachlansneff/bevy-render-draw-command
cart Aug 18, 2020
4a06bbf
Merge pull request #220 from 0x22fe/patch-1
cart Aug 18, 2020
6228e8a
Create FUNDING.yml
cart Aug 18, 2020
6ffe069
Merge pull request #203 from lachlansneff/ironing-out-uniforms
cart Aug 18, 2020
46636ed
fix formatting
multun Aug 19, 2020
7d1d9dc
Merge pull request #234 from multun/fix-formatting
cart Aug 19, 2020
900126b
Create CODE_OF_CONDUCT.md
Aug 19, 2020
4462eb4
Update CODE_OF_CONDUCT.md
Aug 19, 2020
49d4784
Update CODE_OF_CONDUCT.md
Aug 19, 2020
9648008
Update CODE_OF_CONDUCT.md
Aug 19, 2020
131a5e9
Merge branch 'master' into bind-group-reflect-fix
StarArawn Aug 19, 2020
f1b0d04
Fixed formatting.
StarArawn Aug 19, 2020
d4d68f6
Fixed tests.
StarArawn Aug 19, 2020
f12990f
Update CODE_OF_CONDUCT.md
Aug 19, 2020
322fad7
Update CODE_OF_CONDUCT.md
Aug 19, 2020
dc98881
Update CODE_OF_CONDUCT.md
Aug 19, 2020
1f7cdbd
Update CODE_OF_CONDUCT.md
Aug 19, 2020
e31f576
Merge pull request #206 from multun/clippy
cart Aug 20, 2020
979a134
Merge pull request #236 from stefee/patch-1
cart Aug 20, 2020
1ebb7e4
Merge pull request #189 from StarArawn/bind-group-reflect-fix
cart Aug 20, 2020
268b520
Simplify GLTF loader code (#245)
AmionSky Aug 20, 2020
38d3da5
Fix #187 . Multiple return instead of continue inside for loops. (#230)
BorisBoutillier Aug 20, 2020
3c5251f
Updating README.md with subreddit info and link to Code of Conduct (#…
GabCampbell Aug 21, 2020
45312a9
Basic mouse scroll-wheel event (#222)
ifletsomeclaire Aug 21, 2020
505c79b
README.md link points to the correct example (#225)
zeramorphic Aug 21, 2020
db1bf64
Allow calling winit with the 'run_return' variant of the run function…
jakerr Aug 21, 2020
fc53ff9
Add "Focus Areas" to readme
cart Aug 21, 2020
1eca55e
Replace std synchronization primitives with parking_lot (#210)
lachlansneff Aug 21, 2020
68d419d
Add repeating flag to Timer (#165)
8bit-pudding Aug 21, 2020
bfd6e4a
Add linux dependencies to README.md (#257)
Halfwhit Aug 21, 2020
6b11e58
readme formatting tweaks
cart Aug 21, 2020
20335d5
Add links to Stack Overflow and Awesome Bevy (#282)
DGriffin91 Aug 22, 2020
7a79dcc
Add serialize/deserialize to some input types (#281)
TehPers Aug 22, 2020
7c3b49c
upgrade to latest wgpu
cart Aug 13, 2020
47f3a0b
Changes ScheduleRunnerPlugin RunMode::Loop to run on fixed interval (…
mfrancis107 Aug 22, 2020
2dadc86
Change CullMode to none for sprites (#241)
kaflu Aug 22, 2020
4eb437a
Fixes #134 and #135 with a slight hit on performances as get_or_assi…
BorisBoutillier Aug 22, 2020
35c59d2
use wgpu 0.6.0 release
cart Aug 22, 2020
b925e22
0.1.3 upgrade
cart Aug 22, 2020
022a31f
fix formatting / clippy warnings (#295)
multun Aug 23, 2020
7b6fbcb
Add Arch / Manjaro dependencies (#275)
Aug 23, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Create CODE_OF_CONDUCT.md
This Code of Conduct is based on the Rust Code of Conduct, which is adapted from the Node.js Policy on Trolling as well as the Contributor Covenant version 1.3; and also the WeAllJS Code of Conduct, which is itself based on Contributor Covenant version 1.4, and the LGBTQ in Technology Slack Code of Conduct

Rust Code of Conduct: https://www.rust-lang.org/policies/code-of-conduct
Node.js Policy on Trolling: http://blog.izs.me/post/30036893703/policy-on-trolling
Contributor Covenant version 1.3: https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/
WeAllJS Code of Conduct: https://wealljs.org/code-of-conduct
Contributor Covenant version 1.4: https://www.contributor-covenant.org/version/1/4/code-of-conduct/
LGBTQ in Technology Slack Code of Conduct: http://lgbtq.technology/coc.html
  • Loading branch information
stefee authored Aug 19, 2020
commit 900126b3bd044ccdbf056070ebcdad8870c5487d
71 changes: 71 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
# Code of Conduct

## When something happens

If you see a violation of our community's standards of [Conduct](#conduct), follow these steps:

1. Let the person know that what they did is not appropriate and ask them to stop and/or edit their messages.
2. That person should immediately stop the behavior and correct the issue.
3. If this doesn’t happen, or if you're uncomfortable speaking up, contact the maintainers.
4. As soon as available, a maintainer will look into the issue, and take further action, starting with a warning, then temporary block, then long-term repo or organization ban.

When reporting, please include any relevant details, links, screenshots, context, or other information that may be used to better understand and resolve the situation.

The maintainers will prioritize the well-being and comfort of the recipients of the violation over the comfort of the violator.

## Moderation

These are the policies for upholding our community’s standards of [Conduct](#conduct). If you feel that a thread needs moderation, please contact the maintainers.

1. Remarks that violate the community standards of conduct, including hateful, hurtful, oppressive, or exclusionary remarks, are not allowed. (Cursing is allowed, but never targeting another user, and never in a hateful manner).
2. Remarks that moderators find inappropriate, whether listed in the code of conduct or not, are also not allowed.
3. Moderators will first respond to such remarks with a warning.
4. If the warning is unheeded, the user will be “kicked,” i.e., kicked out of the communication channel to cool off.
5. If the user comes back and continues to make trouble, they will be banned, i.e., indefinitely excluded.
6. Moderators may choose at their discretion to un-ban the user if it was a first offense and they offer the offended party a genuine apology.
7. If a moderator bans someone and you think it was unjustified, please take it up with that moderator, or with a different moderator, in private. Complaints about bans in-channel are not allowed.
8. Moderators are held to a higher standard than other community members. If a moderator creates an inappropriate situation, they should expect less leeway than others.

The enforcement policies in the code of conduct apply to all official venues, including Discord channels, GitHub repositories, the Twitter community and all other forums.

## Conduct

* We are committed to providing a friendly, safe and harassment-free environment for all, regardless of level of experience, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, ethnicity, age, religion, nationality, or other similar characteristic.
* Please avoid using overtly sexual aliases or other nicknames that might detract from a friendly, safe and welcoming environment for all.
* Please be kind and courteous. There’s no need to be mean or rude.
* Respect that people have differences of opinion and that every design or implementation choice carries a trade-off and numerous costs. There is seldom a right answer.
* Please keep unstructured critique to a minimum. If you have solid ideas you want to experiment with, make a fork and see how it works.
* We will exclude you from interaction if you insult, demean or harass anyone. That is not welcome behavior. Please read our definition of [Harassment](#harassment). In particular, we don’t tolerate behavior that excludes people in socially marginalized groups.
* Private harassment is also unacceptable. No matter who you are, if you feel you have been or are being harassed or made uncomfortable by a community member, please contact the maintainers immediately. Whether you’re a regular contributor or a newcomer, we care about making this community a safe place for you and we’ve got your back.
* Do not make casual mention of slavery or indentured servitude and/or false comparisons of one's occupation or situation to slavery. Please consider using or asking about alternate terminology when referring to such metaphors in technology.
* Likewise any spamming, trolling, flaming, baiting or other attention-stealing behavior is not welcome.

In this community we strive to go the extra step to look out for each other. Don’t just aim to be technically unimpeachable, try to be your best self. In particular, avoid flirting with offensive or sensitive issues, particularly if they’re off-topic; this all too often leads to unnecessary fights, hurt feelings, and damaged trust; worse, it can drive people away from the community entirely.

And if someone takes issue with something you said or did, resist the urge to be defensive. Just stop doing what it was they complained about and apologize. Even if you feel you were misinterpreted or unfairly accused, chances are good there was something you could’ve communicated better — remember that it’s your responsibility to make your fellow Rustaceans comfortable. Everyone wants to get along and we are all here first and foremost because we want to talk about cool technology. You will find that people will be eager to assume good intent and forgive as long as you earn their trust.

## Harassment

_Our definition of harassment is based on the [Citizen Code of Conduct](https://github.com/stumpsyn/policies/blob/master/citizen_code_of_conduct.md) and the [WeAllJS Code of Conduct](https://wealljs.org/code-of-conduct)._

The following behaviors are considered harassment and are unacceptable within our community:

* Violence, threats of violence or violent language directed against another person.
* Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language.
* Posting or displaying sexually explicit or violent material.
* Posting or threatening to post other people's personally identifying information ("doxing"). This includes any sort of "outing" of any aspect of someone's identity without their consent.
* Personal insults, particularly those related to gender, sexual orientation, race, religion, or disability.
* Inappropriate photography or recording.
* Inappropriate physical contact. You should have someone's consent before touching them.
* Unwelcome sexual attention, including when simulated online. This includes, sexualized comments or jokes; inappropriate touching, groping, and unwelcomed sexual advances.
* The use of sexualized language or imagery. The only exception to sexual topics is channels/spaces specifically for topics of sexual identity.
* Deliberate intimidation, stalking or following (online or in person).
* Making light of/making mocking comments about trigger warnings and content warnings.
* Any of the above behaviour even when presented as "ironic" or "joking".
* Any attempt to present "reverse-ism" versions of the above as violations. Examples of reverse-isms are "reverse racism", "reverse sexism", "heterophobia", and "cisphobia".
* Advocating for, or encouraging, any of the above behavior.
* Sustained disruption of community events, including talks and presentations.

## Attribution

This Code of Conduct is based on the [Rust Code of Conduct](https://www.rust-lang.org/policies/code-of-conduct), which is adapted from the [Node.js Policy on Trolling](http://blog.izs.me/post/30036893703/policy-on-trolling) as well as the [Contributor Covenant version 1.3](https://www.contributor-covenant.org/version/1/3/0/code-of-conduct/); and also the [WeAllJS Code of Conduct](https://wealljs.org/code-of-conduct), which is itself based on [Contributor Covenant version 1.4](https://www.contributor-covenant.org/version/1/4/code-of-conduct/), and the LGBTQ in Technology Slack [Code of Conduct](http://lgbtq.technology/coc.html).