Skip to content
This repository has been archived by the owner on Jul 30, 2018. It is now read-only.

Forest Redesign #53

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open

Forest Redesign #53

wants to merge 13 commits into from

Conversation

Karkus476
Copy link
Member

Create all pull requests to forest-redesign, and it will all be merged when everything is done.

@Karkus476 Karkus476 force-pushed the forest-redesign branch 3 times, most recently from 8d86f47 to 1788217 Compare August 16, 2016 22:32
@Karkus476
Copy link
Member Author

NOTE: I force pushed to this branch!!! D:
I apologize. I removed a commit I had made which would cause problems, and improved commit messages, so that this would not need doing in the future.
CC @maxteufel and @tobbi , so that you know this.

Rusty-Box and others added 10 commits August 28, 2016 12:26
@Rusty-Box @maxteufel
levels/world2: Add "What is this Place?"
7f53b71 
"What is this Place?" is a work-in-progress level that will be used as
the interlude and transition level between normal Forest and the Ghost
Forest.

Ref: #54 ("levels/world2: Add scary_place.stl")
[[email protected]: extended commit message]
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
Cc: Karkus476 <[email protected]>
@Karkus476 @maxteufel
Forest Island: Add redesigned worldmap
56e2653 
The new worldmap design by @Rusty-Box splits the world in two by a cave,
with the Ghost Forest on one side, and the normal Forest on the other.

Also included are 5 levels by @Rusty-Box:
- Walking_Flames.stl (new Ghost Forest level using the livefire enemy)
- Deeper_Down.stl (cave level)
- Out_of_the_Cave.stl (level between the cave and the Ghost Forest)
- The_Origin_of_the_Ghost_Forest.stl (boss level)
- World_of_Ghosts.stl (Ghost Forest level)

Ref: #24 ("Redesigned Forest Worldmap Vote")
[[email protected]: improved commit message]
Submitted-by: Carsten Wirtz <[email protected]>
Cc: Max Teufel <[email protected]>
Cc: Hume2 <[email protected]>
Cc: Tobias Markus <[email protected]>
Cc: alex jockers <[email protected]>
Cc: Karkus476 <[email protected]>
@Rusty-Box @maxteufel
levels/world2: Crumbling Path: various changes
9e7ff37 
- Add more tiles
- Improve secret area
- Replace old water with new water

Closes #37 ("Forest: improve Crumbling Path")
Closes #51 ("levels/world2: Crumbling Path: Improvements")
[[email protected]: changed commit message]
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
Cc: Karkus476 <[email protected]>
@serano01 @maxteufel
levels/world2: Redesign "Light + Magic"
e0eabae 
- Change Background and Gradient
- Add secret area
- Redo whole end area
- add halloween trees decals

Closes #42 ("Light + Magic Is Not Developed Enough")
Closes #55 ("levels/world2: Light + Magic: Improvements:")
[[email protected]: changed commit message]
Cc: Carsten Wirtz <[email protected]>
Cc: Karkus476 <[email protected]>
Cc: Hume2 <[email protected]>
Cc: Tobias Markus <[email protected]>
Cc: Max Teufel <[email protected]>
@Rusty-Box @maxteufel
levels/world2: Crumbling Path: Fix secret area
f51a71d 
Fixes #65 ("Crumbling Path: secret area still visible")
Reported-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
@serano01 @maxteufel
levels/world2: Update "Welcome to the Forest"
b7fc5e6 
- Change Background and Gradient
- Use new water tiles
- Add Background tiles

Fixes #67
(cherry picked from commit b58f423)
Acked-by: Max Teufel <[email protected]>
@serano01 @maxteufel
levels/world2: Add "Bye Bye Forest" (future Forest Island outro)
086138c 
"Bye Bye Forest" is a new level designed to be placed at the end of
Forest Island, where it will be used as last Forest level and outro. It
features elements of waters inspired by those in the old
"Countercurrent" level. Furthermore, it features a slightly non-linear
path as well as some more modern features not previously used on Forest
Island (e.g. moving coins).
The water signifies how close the coast is, and at the end of the level,
Tux leaves Forest Island using a wooden block moving platform on the
ocean.

Ref: #69 ("levels/world2: Add "Bye Bye Forest" + "This
Forest Is Haunted"")
[[email protected]: taken from 31a2a45,
split off "Bye Bye Forest", and extended commit message]
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
Cc: Max Teufel <[email protected]>
Cc: Carsten Wirtz <[email protected]>
@serano01 @maxteufel
levels/world2: Add "This Forest is Haunted"
ffd1f55 
"This Forest is Haunted" is an additional new Ghost Forest level. It
features a second exit hidden in a secret area.
It can be used as a bonus level or in a separate Ghost Forest path on
the worldmap.

Ref: #69 ("levels/world2: Add "Bye Bye Forest" + "This
Forest Is Haunted"")
[[email protected]: taken from 31a2a45,
split off "This Forest is Haunted", and extended commit message]
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
Cc: Max Teufel <[email protected]>
Cc: Carsten Wirtz <[email protected]>
@Rusty-Box @maxteufel
levels/world2: Add "It's Getting Hot"
f082233 
"It's Getting Hot" is a Ghost Forest level designed to introduce the new
enemy livefire.

Ref: #58 ("levels/world2: Add getting_hot.stl +
dark_tunnel.stl")
[[email protected]: extended commit message]
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: Carsten Wirtz <[email protected]>
Cc: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
@Rusty-Box @maxteufel
levels/world2: Add "The Dark Tunnel"
83ff8a4 
"The Dark Tunnel" is a Ghost Forest level featuring a tunnel with
diverse Ghost Forest enemies, and some secret areas.

Ref: #58 ("levels/world2: Add getting_hot.stl +
dark_tunnel.stl")
[[email protected]: fixed level location, and extended commit message]
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
Cc: Carsten Wirtz <[email protected]>
Cc: Max Teufel <[email protected]>
Cc: alex jockers <[email protected]>
Rusty-Box and others added 3 commits August 28, 2016 13:25
@Rusty-Box @maxteufel
levels/world2: Repurpose "A Ghostly World"
0e54c86 
"A Ghostly World", now a redesigned version of "Walking Flames" is
supposed to be the final level of the Ghost Forest. In addition, it
features a new type of secret area, where the player has to destroy
blocks using a bomb in order to enter it.

Closes #68 ("levels/world2: Add ghostly_world.stl")
Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
@Rusty-Box @maxteufel
Forest Island: add new levels, drop those that will be removed
14e3796 
This change reflects changes that have already been made or will be made
to the levels.

Reviewed-by: Max Teufel <[email protected]>
Tested-by: Max Teufel <[email protected]>
@maxteufel
levels/world2: remove old levels
ab98a29 
These levels have been dropped from the worldmap because they will be
replaced or removed entirely in the release including the forest
improvements. There is no more reason for these levels to be in the
working tree.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees
No one assigned
Labels
category:levels status:in-progress world:forest
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Karkus476 @Rusty-Box @serano01 @maxteufel