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

Hai legacy scene + anomalocaris #367

Merged
merged 34 commits into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
27f48f7
Add files via upload
Hurleveur Jul 9, 2023
ace0457
Update copyright
Hurleveur Jul 9, 2023
f966616
Add files via upload
Hurleveur Jul 9, 2023
e5fac81
Add files via upload
Hurleveur Jul 9, 2023
1e40ee7
Update copyright
Hurleveur Jul 9, 2023
cf01c07
Delete ancient [email protected]
Hurleveur Jul 9, 2023
247ab6e
Add files via upload
Hurleveur Jul 9, 2023
1143067
Delete ancient [email protected]
Hurleveur Jul 9, 2023
20a088f
Add files via upload
Hurleveur Jul 9, 2023
1046448
upgrade the scene to infinity
Hurleveur Jul 16, 2023
fc426e1
remove the alguae
Hurleveur Jul 16, 2023
862a7d3
Add files via upload
Hurleveur Jul 16, 2023
c603c13
use the standard ladybug
Hurleveur Jul 18, 2023
536f6ed
the file is even smaller
Hurleveur Jul 18, 2023
3cf2323
Add files via upload
Hurleveur Jul 18, 2023
af531b2
Delete ancient [email protected]
Hurleveur Jul 18, 2023
d6d45bb
I got the name wrong pff
Hurleveur Jul 18, 2023
8dbf63e
Add files via upload
Hurleveur Jul 18, 2023
2168c53
Add files via upload
Hurleveur Jul 18, 2023
f62ac26
Update copyright
Hurleveur Jul 18, 2023
395f1c0
Add files via upload
Hurleveur Aug 9, 2023
7b15d8a
Delete hai ancient [email protected]
Hurleveur Aug 9, 2023
838b6f7
Delete hai ancient [email protected]
Hurleveur Aug 9, 2023
4efc1b0
Update copyright
Hurleveur Aug 9, 2023
dd90b3c
Add files via upload
Hurleveur Aug 9, 2023
15de9a0
Add files via upload
Hurleveur Aug 26, 2023
f16b9fa
Add files via upload
Hurleveur Aug 26, 2023
50be327
Add files via upload
Hurleveur Aug 29, 2023
857dcd5
Update copyright
Hurleveur Aug 29, 2023
e2fb141
Merge branch 'master' into hai-legacy
Hurleveur May 15, 2024
3cf1379
add .
Hurleveur Nov 13, 2024
aaa9471
Merge branch 'master' into hai-legacy
Hurleveur Nov 13, 2024
01bf025
Update copyright
Hurleveur Nov 13, 2024
32bb622
Merge remote-tracking branch 'upstream/master' into pr/367
warp-core Jan 19, 2025
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
14 changes: 14 additions & 0 deletions copyright
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,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*
Expand All @@ -642,6 +643,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*
Expand Down Expand Up @@ -3178,6 +3180,18 @@ Copyright: Michael Zahniser <[email protected]>
License: CC-BY-SA-4.0
Comment: Cropped and split into four new files by Zitchas ([email protected])

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).

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/ui/sales?key*
Copyright: Dave Flowers
Expand Down
Binary file added images/scene/cave [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/scene/emerging [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/ship/hai [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/thumbnail/hai [email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading