-
Notifications
You must be signed in to change notification settings - Fork 90
Hai legacy scene + anomalocaris #367
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
Merged
Merged
Changes from 30 commits
Commits
Show all changes
34 commits
Select commit
Hold shift + click to select a range
27f48f7
Add files via upload
Hurleveur ace0457
Update copyright
Hurleveur f966616
Add files via upload
Hurleveur e5fac81
Add files via upload
Hurleveur 1e40ee7
Update copyright
Hurleveur cf01c07
Delete ancient [email protected]
Hurleveur 247ab6e
Add files via upload
Hurleveur 1143067
Delete ancient [email protected]
Hurleveur 20a088f
Add files via upload
Hurleveur 1046448
upgrade the scene to infinity
Hurleveur fc426e1
remove the alguae
Hurleveur 862a7d3
Add files via upload
Hurleveur c603c13
use the standard ladybug
Hurleveur 536f6ed
the file is even smaller
Hurleveur 3cf2323
Add files via upload
Hurleveur af531b2
Delete ancient [email protected]
Hurleveur d6d45bb
I got the name wrong pff
Hurleveur 8dbf63e
Add files via upload
Hurleveur 2168c53
Add files via upload
Hurleveur f62ac26
Update copyright
Hurleveur 395f1c0
Add files via upload
Hurleveur 7b15d8a
Delete hai ancient [email protected]
Hurleveur 838b6f7
Delete hai ancient [email protected]
Hurleveur 4efc1b0
Update copyright
Hurleveur dd90b3c
Add files via upload
Hurleveur 15de9a0
Add files via upload
Hurleveur f16b9fa
Add files via upload
Hurleveur 50be327
Add files via upload
Hurleveur 857dcd5
Update copyright
Hurleveur e2fb141
Merge branch 'master' into hai-legacy
Hurleveur 3cf1379
add .
Hurleveur aaa9471
Merge branch 'master' into hai-legacy
Hurleveur 01bf025
Update copyright
Hurleveur 32bb622
Merge remote-tracking branch 'upstream/master' into pr/367
warp-core File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -625,6 +625,7 @@ Files: | |
images/scene/penguinscene* | ||
images/ship/ibis* | ||
images/ship/ember?waste?node/ember?waste?node* | ||
images/ship/hai?anomalocaris* | ||
images/ship/hai?sea?scorpion* | ||
images/ship/mbactriane* | ||
images/ship/merganser* | ||
|
@@ -637,6 +638,7 @@ Files: | |
images/ship/pug?arfecta* | ||
images/ship/shooting?star/shooting?star* | ||
images/thumbnail/ibis* | ||
images/thumbnail/hai?anomalocaris* | ||
images/thumbnail/hai?sea?scorpion* | ||
images/thumbnail/merganser* | ||
images/thumbnail/penguin* | ||
|
@@ -3081,6 +3083,18 @@ Files: | |
Copyright: RisingLeaf (https://github.com/RisingLeaf) | ||
License: CC-BY-SA-4.0 | ||
|
||
Files: | ||
images/scene/emerging?ladybug* | ||
Copyright: RisingLeaf (https://github.com/RisingLeaf) | ||
License: CC-BY-SA-4.0 | ||
Comment: Derived from public domain works previously submitted to Endless Sky | ||
|
||
Files: | ||
images/scene/cave?scene* | ||
Copyright: Gefüllte Taubenbrust <[email protected]> | ||
License: CC-BY-SA-4.0 | ||
Comment: Derived from work by Becca Tommaso (under the same license) | ||
Hurleveur marked this conversation as resolved.
Show resolved
Hide resolved
|
||
|
||
Files: | ||
images/ui/sales?key* | ||
Copyright: Dave Flowers | ||
|
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.