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

Commits on Oct 30, 2024

  1. WIP Yumemi

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    34353a6 View commit details
    Browse the repository at this point in the history

  2. WIP Yumemi survival spell

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    5092587 View commit details
    Browse the repository at this point in the history

  3. wip extra glitch effect

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    60ad233 View commit details
    Browse the repository at this point in the history

  4. Yumemi slaves/familiars concept

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8db277d View commit details
    Browse the repository at this point in the history

  5. attempt to tweak extra background

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d7b5957 View commit details
    Browse the repository at this point in the history

  6. Reorganize extra stage code into multiple files

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a31990f View commit details
    Browse the repository at this point in the history

  7. Yumemi opening non-spell prototype

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e5be332 View commit details
    Browse the repository at this point in the history

  8. fix Yumemi slave faders

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4c80380 View commit details
    Browse the repository at this point in the history

  9. sketch up another Yumemi spell

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    748610a View commit details
    Browse the repository at this point in the history

  10. sierpinski tweaks

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9948241 View commit details
    Browse the repository at this point in the history

  11. Basic spell practice for extra stage 

    Also changed extra stage id to 7 (was C1), and type to STAGE_EXTRA (was
STAGE_SPECIAL)
    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    c9793c9 View commit details
    Browse the repository at this point in the history

  12. another sierpinski variation

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d9ecb5c View commit details
    Browse the repository at this point in the history

  13. stagex: boss setup cleanup

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1795945 View commit details
    Browse the repository at this point in the history

  14. Add a spell bg for Yumemi

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    79d738b View commit details
    Browse the repository at this point in the history

  15. stagex: set up pre- and post- dialogue

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    0a7f8f2 View commit details
    Browse the repository at this point in the history

  16. fix yumemi spell bg transition

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    79293bb View commit details
    Browse the repository at this point in the history

  17. render procedural yumemi spell bg mask in lower resolution

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7f6c21a View commit details
    Browse the repository at this point in the history

  18. reduce crazy amount of particles in infinity net

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    960ab9d View commit details
    Browse the repository at this point in the history

  19. EX Boss Dialogue (#222) 

    * draft commit of full EX boss dialogue

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

* add Elly dialogue in EX stage
    @StarWitch @Akaricchi
    StarWitch authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7f00368 View commit details
    Browse the repository at this point in the history

  20. New expressions used in Stage 1-6 dialogue (#223) 

    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
    @StarWitch @Akaricchi
    StarWitch authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    007d07e View commit details
    Browse the repository at this point in the history

  21. prototype next 2 yumemi nons

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    28d1e44 View commit details
    Browse the repository at this point in the history

  22. sierpinski wip

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7ae455a View commit details
    Browse the repository at this point in the history

  23. sierpinski laser stuff

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    fec5dfd View commit details
    Browse the repository at this point in the history

  24. fix warnings

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    ff6f7bd View commit details
    Browse the repository at this point in the history

  25. add missing comma, fix building for EX stage

    @StarWitch @Akaricchi
    StarWitch authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    b8769df View commit details
    Browse the repository at this point in the history

  26. stagex: move Yumemi's nons into separate file and extend them (WIP)

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    afd9078 View commit details
    Browse the repository at this point in the history

  27. s/stageex/stagex; misc fixes

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1085c88 View commit details
    Browse the repository at this point in the history

  28. Implement a bombshield for Yumemi

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    77c001b View commit details
    Browse the repository at this point in the history

  29. stagex: three fairy sketches 

    two turtle doves
and a partridge in a pear tree
    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    020fd0a View commit details
    Browse the repository at this point in the history

  30. scuttle non sketch

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    78a620e View commit details
    Browse the repository at this point in the history

  31. rest of the attack

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    923b345 View commit details
    Browse the repository at this point in the history

  32. implemented suggestions from akari

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    48fec36 View commit details
    Browse the repository at this point in the history

  33. convert trap representation to a spell and fix mess ups

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    984d09d View commit details
    Browse the repository at this point in the history

  34. scuttle second spell

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    868a76a View commit details
    Browse the repository at this point in the history

  35. yumemi memcpy spell

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    9e18b4a View commit details
    Browse the repository at this point in the history

  36. wip yumemi spell

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    0f5cf17 View commit details
    Browse the repository at this point in the history

  37. add the pipes to pipe dream (no animation yet)

    @laochailan @Akaricchi
    laochailan authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    8c367dc View commit details
    Browse the repository at this point in the history

  38. attempt to rebase Yumemi branch - several things don't work, but the … 

    …broad strokes are there, and the level 'plays'
    @StarWitch @Akaricchi
    StarWitch authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d91e506 View commit details
    Browse the repository at this point in the history

  39. fix stage EX crash

    @StarWitch @Akaricchi
    StarWitch authored and Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    585cddd View commit details
    Browse the repository at this point in the history

  40. stagex: fix deprecations

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    284fbfe View commit details
    Browse the repository at this point in the history

  41. stagex: fix yumemi nons

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    042904c View commit details
    Browse the repository at this point in the history

  42. progress: reserve a BGMID for stagex

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    acde593 View commit details
    Browse the repository at this point in the history

  43. stagex: add lao's yumemi spells to timelime for testing

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    5540788 View commit details
    Browse the repository at this point in the history

  44. wip extra bg revamp

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1d0bdab View commit details
    Browse the repository at this point in the history

  45. stagex: more background work; music sync experiments

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    09c4f5c View commit details
    Browse the repository at this point in the history

  46. stagex: make it compile

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    3e115f7 View commit details
    Browse the repository at this point in the history

  47. stagex: make it not crash 

    stage background is still fucked for now
    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1f82165 View commit details
    Browse the repository at this point in the history

  48. stagex: fix the background, more or less

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    122a622 View commit details
    Browse the repository at this point in the history

  49. stagex: fix deprecation warnings

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    a7b57ee View commit details
    Browse the repository at this point in the history

  50. stagex: yumemi: adjust slave laser sweep attack, move to common procs

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    444eda5 View commit details
    Browse the repository at this point in the history

  51. menu: add extra stage music to musicroom 

    Note: the actual music is not in yet, this just adds the menu entries.
    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    852355d View commit details
    Browse the repository at this point in the history

  52. stages: expose extra stage spell cards for practice

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    47ef101 View commit details
    Browse the repository at this point in the history

  53. stagex: basic sierpinski redesign

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    1544b03 View commit details
    Browse the repository at this point in the history

  54. stagex: various tweaks to the memcopy spell

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    16e71aa View commit details
    Browse the repository at this point in the history

  55. stagex: majorly revamp infnet

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    37cac59 View commit details
    Browse the repository at this point in the history

  56. stagex: draft new yumemi spell (alignment)

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    0b9252b View commit details
    Browse the repository at this point in the history

  57. stagex: fix warning in alignment spell

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    210e082 View commit details
    Browse the repository at this point in the history

  58. stagex: shut up GCC warning

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    09c6d41 View commit details
    Browse the repository at this point in the history

  59. stagex: add yumemi spell loosely based on protection rings

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    d824050 View commit details
    Browse the repository at this point in the history

  60. resources/shader/extra_glitch: fix gles30 compat and clean up

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    0c8d4af View commit details
    Browse the repository at this point in the history

  61. stagex: experimental enemy laser pattern

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    737aaaf View commit details
    Browse the repository at this point in the history

  62. stagex: background dissolve effect tweaks

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    fde58e1 View commit details
    Browse the repository at this point in the history

  63. stagex: enable all boss spells available so far

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    2879bf5 View commit details
    Browse the repository at this point in the history

  64. stagex: fix post-rebase fallout

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    ecf6f15 View commit details
    Browse the repository at this point in the history

  65. resources: add stagex music by jneen

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    6ae8ec4 View commit details
    Browse the repository at this point in the history

  66. stagex: fix more post-rebase fallout

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    4319dcd View commit details
    Browse the repository at this point in the history

  67. stageutils: make camera3d_project() account for translation

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    bfae313 View commit details
    Browse the repository at this point in the history

  68. enemy_classes: ecls_anyenemy_fake3dmovein(): reproject 3d pos every f… 

    …rame

Needed to account for camera movement. Usage may need adjustments
    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    7b3b444 View commit details
    Browse the repository at this point in the history

  69. stagex: WIP background tweaks

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    299a287 View commit details
    Browse the repository at this point in the history

  70. stagex: ecls_anyenemy_fake3dmovein test

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    c7bf67c View commit details
    Browse the repository at this point in the history

  71. stagex: add some sfx to infnet

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    e3eb7f0 View commit details
    Browse the repository at this point in the history

  72. stagex: add some sfx to alignment spell

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    219f7a6 View commit details
    Browse the repository at this point in the history

  73. stagex: infinity_net: use sort_r() instead of qsort_r()

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    5643a97 View commit details
    Browse the repository at this point in the history

  74. stagex: post-rebase fixups

    @Akaricchi
    Akaricchi committed Oct 30, 2024
    Configuration menu
    Copy the full SHA
    66605a4 View commit details
    Browse the repository at this point in the history