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

Apply Assets to Animation #308

Merged
merged 22 commits into from
Jul 15, 2019
Merged

Apply Assets to Animation #308

merged 22 commits into from
Jul 15, 2019

Conversation

AstraLuma
Copy link
Member

Depends on #306

Part of #147

AstraLuma added 21 commits June 5, 2019 22:52
@AstraLuma
Initial stab
9b70136
@AstraLuma
Add special support for __main__
4c508b5
@AstraLuma
Update animated_sprite.py
3200eef
@AstraLuma
Add backport for 3.6
be1f5f8
@AstraLuma
Merge remote-tracking branch 'mine/add-vfs' into resources
8b3f9e3
@AstraLuma
vfs: Try to document things a little better.
a6b8e50
@AstraLuma
Try to add a helpful logging message if a resource isn't found.
e7d884f
@AstraLuma
Add the resource loading spike
515f07b
@AstraLuma
Add an Asset class
b57cd0c
@AstraLuma
Rename resources to assets
469dfe7
@AstraLuma
Add an AssetLoadingSystem
46621c8
@AstraLuma
ppb: Add ppb.Image
aa76a5d
@AstraLuma
Assets: Add str coercion
93bd003
@AstraLuma
ppb.systems: Rewrite renderer for the new asset system
4d5461c
@AstraLuma
ppb.vfs: open() shouldn't return the filename
cb2034b
@AstraLuma
Restore test_sprite_in_main
8c0a11a
@AstraLuma
ppb.vfs: Wrap ModuleNotFoundError in FileNotFoundError
ec3058e
@AstraLuma
assets: add tests
85436ea
@AstraLuma
ppb.vfs._main_path: use .absolute instead of .resolve to avoid zip pr…
ae2a940 
…oblems.
@AstraLuma
Delete unused property
69b1dcb
@AstraLuma
Turn Animation into a proxy asset.
a539d7e
@AstraLuma AstraLuma requested a review from a team as a code owner July 11, 2019 18:00
@AstraLuma AstraLuma mentioned this pull request Jul 12, 2019
Closed
pathunstrom
pathunstrom requested changes Jul 14, 2019
View reviewed changes
Copy link
Collaborator

@pathunstrom pathunstrom left a comment

Choose a reason for hiding this comment

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

This is consistently failing tests.

@AstraLuma
Copy link
Member Author

3.8-rc does not count.

@pathunstrom
Copy link
Collaborator

It's failing Linux pypy 3.6, Linux 3.6, linux 3.7, Windows 3.6, windows 3.7, mac 3.6, adn mac 3.7.

@AstraLuma
Copy link
Member Author

I saw :P

Fixed.

pathunstrom
pathunstrom approved these changes Jul 15, 2019
View reviewed changes
Copy link
Collaborator

@pathunstrom pathunstrom left a comment

Choose a reason for hiding this comment

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

Tested, looks good.

bors r+

bors bot added a commit that referenced this pull request Jul 15, 2019
@bors @AstraLuma
Merge #308
166cbc3 
308: Apply Assets to Animation r=pathunstrom a=astronouth7303

Depends on #306

Part of #147

Co-authored-by: Jamie Bliss <jamie@ivyleav.es>
@bors
Copy link
Contributor

bors bot commented Jul 15, 2019

Build succeeded

  • docs
  • Linux python:3.6-slim
  • Linux python:3.7-slim
  • macOS PYTHON:3.6.8
  • macOS PYTHON:3.7.2
  • pep517
  • Windows python:3.6-windowsservercore-1809
  • Windows python:3.7-windowsservercore-1809

@bors bors bot merged commit d1af9ae into ppb:master Jul 15, 2019
@AstraLuma AstraLuma deleted the assets-animation branch May 11, 2020 23:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pathunstrom pathunstrom pathunstrom 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.
2 participants
@AstraLuma @pathunstrom