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

Show splash screen earlier and reintroduce intro music #6412

Closed
wants to merge 65 commits into from
Closed

Show splash screen earlier and reintroduce intro music #6412

wants to merge 65 commits into from

Commits on Mar 10, 2024

  1. load intro song and splashscreen as soon as all required subsystems a… 

    …re started

move fitted background blitting function to RenderTarget
add helper function to Image
    @tothxa
    tothxa committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    a30f06b View commit details
    Browse the repository at this point in the history

  2. convert more places to use the new helper functions

    @tothxa
    tothxa committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    2583d3f View commit details
    Browse the repository at this point in the history

  3. show splashscreen for the duration of the intro music or until keypress

    @tothxa
    tothxa committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    6ecea21 View commit details
    Browse the repository at this point in the history

  4. fix returning to main menu after starting game/editor with hotkey dur… 

    …ing splash
    @tothxa
    tothxa committed Mar 10, 2024
    Configuration menu
    Copy the full SHA
    2d56e90 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. bring splash a little earlier, add more startup logging

    @tothxa
    tothxa committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    384ec70 View commit details
    Browse the repository at this point in the history

  2. add common function to draw splash screen, add status message

    @tothxa
    tothxa committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    a520459 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2024

  1. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    d2bdeaa View commit details
    Browse the repository at this point in the history

  2. disable intro music, start menu music at startup 

    handle initial window events before drawing splash image
end splash screen as soon as main menu is responsive
    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    8ac2e30 View commit details
    Browse the repository at this point in the history

  3. use intro music when a game starts

    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    8231f08 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    ede21fb View commit details
    Browse the repository at this point in the history

  5. 3 files were automatically formatted.

    Widelands Bunnybot committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    9f369ca View commit details
    Browse the repository at this point in the history

  6. fix condition in assert

    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2072024 View commit details
    Browse the repository at this point in the history

  7. Save theme splash screen real path into config file for next startup

    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    2da4193 View commit details
    Browse the repository at this point in the history

  8. try to satisfy clang-tidy without adding "private" function to header

    @tothxa
    tothxa committed Mar 14, 2024
    Configuration menu
    Copy the full SHA
    fb33c58 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2024

  1. also save intro font style in config

    @tothxa
    tothxa committed Mar 15, 2024
    Configuration menu
    Copy the full SHA
    3c7a926 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2024

  1. clean up remaining commented out change_music() calls, disable intro … 

    …music
    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    391bec9 View commit details
    Browse the repository at this point in the history

  2. cut long silence from beginning and end of intro music without re-enc… 

    …oding with oggsplt
    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    7616491 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    36e20d9 View commit details
    Browse the repository at this point in the history

  4. codecheck?

    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    19f52c9 View commit details
    Browse the repository at this point in the history

  5. codecheck try 2

    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    3efcc42 View commit details
    Browse the repository at this point in the history

  6. codecheck try 3 it wasn't even close to doxygen format.......

    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    58ead32 View commit details
    Browse the repository at this point in the history

  7. update comments

    @tothxa
    tothxa committed Mar 17, 2024
    Configuration menu
    Copy the full SHA
    a51e4f5 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2024

  1. Merge branch 'master' into splash-early

    Tóth András committed Mar 29, 2024
    Configuration menu
    Copy the full SHA
    f6eb9e1 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Merge branch 'master' into splash-early

    Tóth András committed Apr 20, 2024
    Configuration menu
    Copy the full SHA
    5eaa232 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. Merge branch 'master' into splash-early

    Tóth András committed May 21, 2024
    Configuration menu
    Copy the full SHA
    0ce52cf View commit details
    Browse the repository at this point in the history

  2. Reintroduce intro music, start it before drawing splash image

    @tothxa
    tothxa committed May 21, 2024
    Configuration menu
    Copy the full SHA
    1957c08 View commit details
    Browse the repository at this point in the history

  3. clean-up splash handling in main menu 

    wait for intro music to finish before ending splash screen
hide mouse cursor until splash can be clicked away
    @tothxa
    tothxa committed May 21, 2024
    Configuration menu
    Copy the full SHA
    a4400ed View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. end splash gently on first user action, hard on second (or escape) 

    tweak some comments
    @tothxa
    tothxa committed May 22, 2024
    Configuration menu
    Copy the full SHA
    24619d6 View commit details
    Browse the repository at this point in the history

  2. clang-tidy

    @tothxa
    tothxa committed May 22, 2024
    Configuration menu
    Copy the full SHA
    63f91ca View commit details
    Browse the repository at this point in the history

  3. re-edited intro.ogg from original: 

     - high-pass filter >4Hz
 - cut silence at start and end
 - normalise to max without clipping
 - re-encode at ~160k

Co-authored-by: hessenfarmer <[email protected]>
    @tothxa @hessenfarmer
    tothxa and hessenfarmer committed May 22, 2024
    Configuration menu
    Copy the full SHA
    8b82cd2 View commit details
    Browse the repository at this point in the history

  4. fix enabling mouse cursor in soft mode 

    fix swapping main menu background too soon after end of splash
    @tothxa
    tothxa committed May 22, 2024
    Configuration menu
    Copy the full SHA
    c5f942c View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. add an hourglass mouse cursor for startup and game/editor loading

    @tothxa
    tothxa committed May 24, 2024
    Configuration menu
    Copy the full SHA
    72f005e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed May 24, 2024
    Configuration menu
    Copy the full SHA
    fda1276 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2024

  1. handle mouse cursor init differently for SDL and soft modes 

    fix hourglass cursor use in the progress window
    @tothxa
    tothxa committed May 25, 2024
    Configuration menu
    Copy the full SHA
    131b4f1 View commit details
    Browse the repository at this point in the history

  2. really fix early swapping?

    @tothxa
    tothxa committed May 25, 2024
    Configuration menu
    Copy the full SHA
    50aa7cd View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed May 25, 2024
    Configuration menu
    Copy the full SHA
    890a5e3 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. decrease hourglass cursor size

    @tothxa
    tothxa committed May 27, 2024
    Configuration menu
    Copy the full SHA
    096e24f View commit details
    Browse the repository at this point in the history

  2. add config option to control ending the splashscreen

    @tothxa
    tothxa committed May 27, 2024
    Configuration menu
    Copy the full SHA
    f7f47fb View commit details
    Browse the repository at this point in the history

  3. replace mouse cursor much earlier

    @tothxa
    tothxa committed May 27, 2024
    Configuration menu
    Copy the full SHA
    e461f38 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed May 27, 2024
    Configuration menu
    Copy the full SHA
    864ad04 View commit details
    Browse the repository at this point in the history

  5. add end_splash option to command line too (numeric only for now)

    @tothxa
    tothxa committed May 27, 2024
    Configuration menu
    Copy the full SHA
    3a0c7ec View commit details
    Browse the repository at this point in the history

  6. 5 files were automatically formatted.

    Widelands Bunnybot committed May 27, 2024
    Configuration menu
    Copy the full SHA
    71fa723 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. try to fix mingw build error

    @tothxa
    tothxa committed May 28, 2024
    Configuration menu
    Copy the full SHA
    154406f View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. change hourglass cursor frame colour, rename file

    @tothxa
    tothxa committed May 30, 2024
    Configuration menu
    Copy the full SHA
    2e8ed92 View commit details
    Browse the repository at this point in the history

  2. fix mouse cursor position initialisation

    @tothxa
    tothxa committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7d6b709 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed May 30, 2024
    Configuration menu
    Copy the full SHA
    2df1398 View commit details
    Browse the repository at this point in the history

  4. clang-tidy

    @tothxa
    tothxa committed May 30, 2024
    Configuration menu
    Copy the full SHA
    d5a98fe View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. simplify intro option

    @tothxa
    tothxa committed May 31, 2024
    Configuration menu
    Copy the full SHA
    ae578bf View commit details
    Browse the repository at this point in the history

  2. 'src/wui/sound_options.cc' was automatically formatted.

    Widelands Bunnybot committed May 31, 2024
    Configuration menu
    Copy the full SHA
    f944b73 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into mirror/tothxa/widelands/splash-early

    @hessenfarmer
    hessenfarmer committed May 31, 2024
    Configuration menu
    Copy the full SHA
    172fe00 View commit details
    Browse the repository at this point in the history

  4. use waiting cursor when closing a game or the editor 

    comment tweaks
flush harmless SDL_AUDIODEVICEADDED events during startup
    @tothxa
    tothxa committed May 31, 2024
    Configuration menu
    Copy the full SHA
    cfeb35d View commit details
    Browse the repository at this point in the history

  5. oops, I thought I'd tested it...

    @tothxa
    tothxa committed May 31, 2024
    Configuration menu
    Copy the full SHA
    1aab858 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2024

  1. more uses for the waiting cursor

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    cfd381a View commit details
    Browse the repository at this point in the history

  2. always abort splashscreen on user action, init mouse cursor position … 

    …in sdl mode too
    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    40188e6 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    dcf7e3c View commit details
    Browse the repository at this point in the history

  4. oops, mouseclick too...

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    06202bd View commit details
    Browse the repository at this point in the history

  5. add some temporary debug logging

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    863d005 View commit details
    Browse the repository at this point in the history

  6. 2 files were automatically formatted.

    Widelands Bunnybot committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    889da85 View commit details
    Browse the repository at this point in the history

  7. handle resize and mousemove events before changing the mouse cursor

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    12a81cb View commit details
    Browse the repository at this point in the history

  8. remove debug logging, skip cursor position init when not needed

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    a935c90 View commit details
    Browse the repository at this point in the history

  9. always use SDL mode with own cursor until screen starts refreshing

    @tothxa
    tothxa committed Jun 1, 2024
    Configuration menu
    Copy the full SHA
    0fc8afb View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2024

  1. clarify descriptions and help of the sdl_cursor option

    @tothxa
    tothxa committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    55d11f1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into splash-early

    @tothxa
    tothxa committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    40d7952 View commit details
    Browse the repository at this point in the history

  3. address review: use panel flag to differentiate progress window, use … 

    …unicode apostrophe
    @tothxa
    tothxa committed Jun 2, 2024
    Configuration menu
    Copy the full SHA
    780b5e2 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Merge branch 'master' into splash-early

    Benedikt Straub committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    d5aa84a View commit details
    Browse the repository at this point in the history