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

WIP: Extra stage #384

Draft
wants to merge 74 commits into
base: staging
Choose a base branch
from
Draft

WIP: Extra stage #384

wants to merge 74 commits into from

Conversation

Akaricchi
Copy link
Member

Accidentally closed #261 due to the base branch being deleted.

@Akaricchi Akaricchi self-assigned this Aug 30, 2024
@Akaricchi Akaricchi force-pushed the staging branch 3 times, most recently from 464101c to 8914d5f Compare October 15, 2024 04:56
Akaricchi and others added 23 commits October 31, 2024 00:57
@Akaricchi
WIP Yumemi
34353a6
@Akaricchi
WIP Yumemi survival spell
5092587
@Akaricchi
wip extra glitch effect
60ad233
@Akaricchi
Yumemi slaves/familiars concept
8db277d
@Akaricchi
attempt to tweak extra background
d7b5957
@Akaricchi
Reorganize extra stage code into multiple files
a31990f
@Akaricchi
Yumemi opening non-spell prototype
e5be332
@Akaricchi
fix Yumemi slave faders
4c80380
@Akaricchi
sketch up another Yumemi spell
748610a
@Akaricchi
sierpinski tweaks
9948241
@Akaricchi
Basic spell practice for extra stage
c9793c9 
Also changed extra stage id to 7 (was C1), and type to STAGE_EXTRA (was
STAGE_SPECIAL)
@Akaricchi
another sierpinski variation
d9ecb5c
@Akaricchi
stagex: boss setup cleanup
1795945
@Akaricchi
Add a spell bg for Yumemi
79d738b
@Akaricchi
stagex: set up pre- and post- dialogue
0a7f8f2
@Akaricchi
fix yumemi spell bg transition
79293bb
@Akaricchi
render procedural yumemi spell bg mask in lower resolution
7f6c21a
@Akaricchi
reduce crazy amount of particles in infinity net
960ab9d
@StarWitch @Akaricchi
EX Boss Dialogue (#222)
7f00368 
* draft commit of full EX boss dialogue

* fix smartquotes(???) and change some dialogue

* add Elly dialogue in EX stage
@StarWitch @Akaricchi
New expressions used in Stage 1-6 dialogue (#223)
007d07e 
rebalance some of the expressions in the dialogue, add the news one to earlier in the game too

expression spelling mistake in atlas, 'embarrased' vs 'embarrassed'. committed correct spelling, needs correction elsewhere too

minor wording change
@Akaricchi
prototype next 2 yumemi nons
28d1e44
@laochailan @Akaricchi
sierpinski wip
7ae455a
@Akaricchi
sierpinski laser stuff
fec5dfd
Akaricchi and others added 29 commits October 31, 2024 00:57
@Akaricchi
stagex: make it compile
3e115f7
@Akaricchi
stagex: make it not crash
1f82165 
stage background is still fucked for now
@Akaricchi
stagex: fix the background, more or less
122a622
@Akaricchi
stagex: fix deprecation warnings
a7b57ee
@Akaricchi
stagex: yumemi: adjust slave laser sweep attack, move to common procs
444eda5
@Akaricchi
menu: add extra stage music to musicroom
852355d 
Note: the actual music is not in yet, this just adds the menu entries.
@Akaricchi
stages: expose extra stage spell cards for practice
47ef101
@Akaricchi
stagex: basic sierpinski redesign
1544b03
@Akaricchi
stagex: various tweaks to the memcopy spell
16e71aa
@Akaricchi
stagex: majorly revamp infnet
37cac59
@Akaricchi
stagex: draft new yumemi spell (alignment)
0b9252b
@Akaricchi
stagex: fix warning in alignment spell
210e082
@Akaricchi
stagex: shut up GCC warning
09c6d41
@Akaricchi
stagex: add yumemi spell loosely based on protection rings
d824050
@Akaricchi
resources/shader/extra_glitch: fix gles30 compat and clean up
0c8d4af
@Akaricchi
stagex: experimental enemy laser pattern
737aaaf
@Akaricchi
stagex: background dissolve effect tweaks
fde58e1
@Akaricchi
stagex: enable all boss spells available so far
2879bf5
@Akaricchi
stagex: fix post-rebase fallout
ecf6f15
@Akaricchi
resources: add stagex music by jneen
6ae8ec4
@Akaricchi
stagex: fix more post-rebase fallout
4319dcd
@Akaricchi
stageutils: make camera3d_project() account for translation
bfae313
@Akaricchi
enemy_classes: ecls_anyenemy_fake3dmovein(): reproject 3d pos every f…
7b3b444 
…rame

Needed to account for camera movement. Usage may need adjustments
@Akaricchi
stagex: WIP background tweaks
299a287
@Akaricchi
stagex: ecls_anyenemy_fake3dmovein test
c7bf67c
@Akaricchi
stagex: add some sfx to infnet
e3eb7f0
@Akaricchi
stagex: add some sfx to alignment spell
219f7a6
@Akaricchi
stagex: infinity_net: use sort_r() instead of qsort_r()
5643a97
@Akaricchi
stagex: post-rebase fixups
66605a4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Akaricchi Akaricchi

Labels
content gameplay
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Akaricchi @StarWitch @laochailan