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.

Sign up for GitHub

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

Jump to bottom

N15: rg3d #339

Merged
merged 27 commits into from
Nov 4, 2020
Merged

N15: rg3d #339

merged 27 commits into from
Nov 4, 2020

Conversation

mrDIMAS
Copy link
Contributor

@mrDIMAS mrDIMAS commented Nov 4, 2020

Part of #320 ("Newsletter 15")

mrDIMAS and others added 26 commits December 31, 2019 11:04
@mrDIMAS
added rg3d-sound into libraries section
5e2051e
@mrDIMAS
Merge remote-tracking branch 'upstream/source' into source
3c33783
@mrDIMAS
add rusty-shooter game
518b620
@mrDIMAS
fixed links for rusty-shooter game
85740a6
@mrDIMAS
added WIP mark for rusty-shooter game video
6e4b366
@mrDIMAS
added features list for rusty-shooter game
bd64b3c
@mrDIMAS
merge upstream
86978c6
@mrDIMAS
Merge remote-tracking branch 'upstream/source' into source
9e53b6c
@mrDIMAS
added rg3d engine and rusty-editor
bb4f8ae
@mrDIMAS
added screenshots
1250686
@mrDIMAS
merge upstream
596d88a
@mrDIMAS
fixed paragraphs indentation
6b3c14f
@ozkriff
Newsletter 10: rg3d: fmt tweaks
4069187
@ozkriff
Newsletter 10: rg3d: smaller images
2f5d215
@mrDIMAS
merge upstream
c9c212f
@mrDIMAS
added rg3d and rusty-editor
63c4e7d
@mrDIMAS
fixed zola lint errors
7628f41
@mrDIMAS
removed redundant headers
f58bead
@mrDIMAS
Merge remote-tracking branch 'upstream/source' into source
9c41157
@mrDIMAS
added screenshot and link to twitter
b95665e
@ozkriff
N14: rg3d: Optimized imgs & style tweaks
25afbba
@ozkriff
N14: rg3d: Sort sections
253e23b
@ozkriff
Merge branch 'source' into source
adbd221
@mrDIMAS
merge upstream
dc88ac0
@mrDIMAS
added rg3d
a84cb91
@mrDIMAS
Merge remote-tracking branch 'upstream/source' into source
69c50b4
17cupsofcoffee
17cupsofcoffee approved these changes Nov 4, 2020
View reviewed changes
Copy link
Collaborator

@17cupsofcoffee 17cupsofcoffee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The content looks good 👍

The CI seems to be failing on line 521 though, which isn't one you've changed 🤔 @ozkriff: any idea why?

ozkriff
ozkriff approved these changes Nov 4, 2020
View reviewed changes
Copy link
Member

@ozkriff ozkriff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@ozkriff ozkriff merged commit 8ea8ab2 into rust-gamedev:source Nov 4, 2020
@ozkriff
Copy link
Member

ozkriff commented Nov 4, 2020 •
edited
Loading

Thanks for the PR!

Note this line from CONTRIBUTING.md though for future PRs:

Don't send PRs from your main branch, create a unique branch (named like n14_zemeroth, n12_veloren, etc) for each PR. This allows sending multiple simultaneous PRs and simplifies the creation of the next PRs.

@ozkriff ozkriff mentioned this pull request Nov 4, 2020
Closed
54 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@17cupsofcoffee 17cupsofcoffee 17cupsofcoffee approved these changes

@ozkriff ozkriff ozkriff approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mrDIMAS @ozkriff @17cupsofcoffee