Better camera follow, now with events 🎥 ✔️ ✔️ #344
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
🎉 You can test out this change! ✨👉 https://pr-344--little-mario.netlify.app 👈✨ |
Arunakemi
changed the title
paulloz
reviewed
Apr 16, 2022
paulloz
reviewed
Apr 16, 2022
paulloz
reviewed
Apr 16, 2022
|
This is pretty cool. Nice enhancement and 100% back-compatible. I like it. I just made a couple of suggestions, feel free to apply or disregard them. |
|
🎉 You can test out this change! ✨👉 https://pr-344--little-mario.netlify.app 👈✨ |
|
@paulloz I took into account your suggestions, and added some comments to explain how to use the scripts. I don't know if I'm abusing signals, I feel it's ok since camera usage is an important part so having all those signals help with flexibility. But I feel guilty seeing my bunch of connects and disconnects, is this normal in Godot? lol |
|
fwiw i think we should eventually merge the follow logic into the |
|
Merging the Camera and FollowCamera logics could make sense. I'm not a fan of autoloads but 🤷 |
|
I actually feel like having the cameraFollow separate adds to the modular feel and workflow. Like, I have no idea what other stuff people will do with the camera, who knows if the VR joke eventually becomes real, or someone has this really specific necessity. So I think that having all my code in a separate file and letting people just pick "ah I want the camera follow functionality I'll add CameraFollow, ah I want this other weird camera property, I'll add CameraSomething" is better. But I am no expert anyway 😅 , I'm here to learn so if merging them eventually becomes a better solution, I can merge them. |
|
I don't have any strong opinion for now. There really are pros and cons
to both imho.
|
monochromia
approved these changes
Apr 16, 2022
Elmar-Wiese
added a commit
to Elmar-Wiese/a-little-game-called-mario
that referenced
this pull request
Apr 17, 2022
commit 0fecd44 Author: Alex CV <42361534+AlexColinVarela@users.noreply.github.com> Date: Sun Apr 17 13:38:52 2022 -0500 CameraFollow now works when solo-playing scene 🎥 (a-little-org-called-mario#385) commit 7b9f9e3 Author: Mario Zechner <contact@badlogicgames.com> Date: Sun Apr 17 19:22:24 2022 +0200 Fix crash on start of ballmario level. player had incorrect type. (a-little-org-called-mario#388) commit 47fedad Author: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Sun Apr 17 18:08:45 2022 +0100 Tutorial Level (a-little-org-called-mario#379) * no message * started a tutorial level commit bc554b5 Author: Samsemy <103825385+Samsemy@users.noreply.github.com> Date: Sun Apr 17 19:14:25 2022 +0300 Made the bus power-up have actual sprite work (a-little-org-called-mario#386) with the approval of the person who made the bus of course. The "Mario Bus drifting" file is the turning animation, "Mario Bus stationary" is for when Mario is in the bus standing still and "Mario bus" is just the powerup before Mario picks it up. Also I personally have some suggestions for features of the bus, I think it would be really fun if the bus sounded like an actual bus, it goes brrrrrr when stationary, does bus sounds when it moves, and possibly a horn addon. Also I think you should be able to exit out of the bus on command, because down the line it's just gonna be more and more annoying trying to bus-proof everything so it doesn't get softlocked. Quite the task I'm asking, but they're all things that I thing would be REALLY worthwhile to make! commit 1a88bf0 Author: captaincolonelfox <lentrog@gmail.com> Date: Sun Apr 17 18:33:37 2022 +0300 Replace title button classes with TitleMenuButton instance (a-little-org-called-mario#381) commit 40eb1c2 Author: Tuhkis <88197425+Tuhkis@users.noreply.github.com> Date: Sun Apr 17 18:29:10 2022 +0300 Fixed bus softlock in LuigiMansion (a-little-org-called-mario#380) * Fixed bus softlock in LuigiMansion Fixed by changing the tiles around the player spawner to fake ones. * Changed the end part to account for bus added space for bus commit e35079c Author: Neil Knauth <nknauth@gmail.com> Date: Sun Apr 17 09:57:17 2022 -0500 re-added large-gassy-randal.png and its import file (a-little-org-called-mario#383) commit 1aec3c4 Author: Neil Knauth <nknauth@gmail.com> Date: Sun Apr 17 04:49:45 2022 -0500 added PictureFrame to this new branch (a-little-org-called-mario#372) commit 90f0971 Author: Jummit <jummit@web.de> Date: Sun Apr 17 11:30:37 2022 +0200 Fix story mode response buttons not being clickable (a-little-org-called-mario#377) The toasty easter egg was in the way. commit 5a59c64 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sun Apr 17 10:00:55 2022 +0200 Decoupling code from Player even further + bonus 🦎 (a-little-org-called-mario#359) commit f000cea Author: SoepIepeI <73912126+SoepIepeI@users.noreply.github.com> Date: Sun Apr 17 07:50:51 2022 +0200 New & improved flappy mario (a-little-org-called-mario#251) * Flappy mario * Add ACKNOWLEDGEMENTS * Add clouds, Add sound effect when entering of exiting a cloud, Changed pipe sprite * Changed cloud spawn position, Changed cloud size * Added preset pipes * Add game over screen, add reset button, add preset clouds, add sound effects * Fixed merge issue and migrated logic to new inventory system * Fixed some merge conflict introduced bugs * Resolved review comment, use _unhandled_input instead of _process * Add lost controls * Fixed loss of control when game is over * Removed dubble coin commit 18f0429 Author: Neil Knauth <nknauth@gmail.com> Date: Sat Apr 16 23:19:26 2022 -0500 Toasty! (a-little-org-called-mario#373) * added Toasty * improved toasty code * updated toasty.gd with actual numbers * changed waluigi to gassy randal commit c60e534 Author: radzo73 <radzo73qwerty@gmail.com> Date: Sun Apr 17 03:36:04 2022 +0000 Mario's mustache flashes white when he takes damage (a-little-org-called-mario#375) * Use AnimationPlayer instead of Sprite for animations * Code cleanup and a new function: `playAnim(String strIn)` * Bouncy Mustache now flashes white Had to use a Gradient Texture to have UVs for the shader to use rainbow 'stache when commit f42f9d4 Author: Alex Engelberg <alex.benjamin.engelberg@gmail.com> Date: Sat Apr 16 20:15:58 2022 -0700 Donate funk music (a-little-org-called-mario#374) Add a funky remix of the current "overworld" soundtrack commit 739c047 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 17:22:33 2022 -0500 missing imports files for marwing (a-little-org-called-mario#368) commit 36510b7 Author: AppleTheGolden <scotsbox@protonmail.com> Date: Sat Apr 16 22:58:28 2022 +0200 Fix title screen focus (a-little-org-called-mario#222) commit f8cc1a9 Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 20:19:20 2022 +0000 Auto-Format GDScript commit 83154e0 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:18:52 2022 -0500 less obfuscation between internal names for audio buses (a-little-org-called-mario#366) * less obfuscation between internal names for audio buses * fix wrong function call commit 261cd2c Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:16:29 2022 -0500 marwing: decouple generic ship code from player and add dummy enemy ship (a-little-org-called-mario#362) * update marwing scene subresources * add basic enemy drone scene * decouple generic ship code from player-specific ship code * add MarwingShip base class * removed commented out old code * made marwing faster * turned off all ship abilities once it's dead * set up enemy skeleton * fix player default rotations commit 1c89f29 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:14:00 2022 -0500 add radio dialogue to marwing 1-0 (a-little-org-called-mario#330) * add assets * add a voice sub-bus * add dialogue box to 1-0 * change default portrait * implement auto-continue * clean up some audio files commit c07e29c Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:08:55 2022 -0500 move audiostreamplayer to appropriate bus (a-little-org-called-mario#365) very cool to see that by and large people are hooking things up properly commit 913598f Author: Gregory Propst <g@prop.st> Date: Sat Apr 16 16:07:02 2022 -0400 clean up testing levels (a-little-org-called-mario#364) commit 211e9c8 Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 20:02:25 2022 +0000 Auto-Format GDScript commit 89cce46 Author: Tuhkis <88197425+Tuhkis@users.noreply.github.com> Date: Sat Apr 16 23:02:06 2022 +0300 Portal colouring (a-little-org-called-mario#356) * Add portal shader * Changes to the portal script Set portal material colour in _ready(). * Changes to EndPortal.tscn Added material to Sprite in EndPortal.tscn. * Changed default colour on end portal * Set default colour for portal * Fixed last commit commit 809c6ec Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 19:58:52 2022 +0000 Auto-Format GDScript commit 997e5b2 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sat Apr 16 21:58:31 2022 +0200 Improve hub (a-little-org-called-mario#345) - Cleaner generation code - Extends both left and right - Some kind of camera management commit c647fdc Author: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Sat Apr 16 20:56:42 2022 +0100 Godsy Randallius (a-little-org-called-mario#363) commit 15bbec1 Author: Alex CV <42361534+AlexColinVarela@users.noreply.github.com> Date: Sat Apr 16 14:56:28 2022 -0500 Better camera follow, now with events 🎥 ✔️ ✔️ (a-little-org-called-mario#344) * Better camera, with events * Better format, tutorial, and more camera events commit c83c2fc Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sat Apr 16 21:54:36 2022 +0200 UI improvements (a-little-org-called-mario#339) * UI improvements * Fix instructions commit 5b6903c Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 19:53:38 2022 +0000 Auto-Format GDScript commit ba5758c Author: Jummit <jummit@web.de> Date: Sat Apr 16 21:53:19 2022 +0200 Add items and more complex dialogs to story mode (a-little-org-called-mario#338) * Add items to story mode Adds an inventory which can be opened by pressing E. Items can be received by talking to characters. * Add events, conditions and item giving to dialogs in story mode Adds a lot more functionality to dialogs: They can now trigger events, give out items, change the sprite of the speaker and have branching using checks for if the player has an item or not. * Add a json schema to enable autocompletion in dialogs Users of IDEs with Json language server support should now be able to write "$schema": "dialog.schema.json" in dialog files to enable autocompletion.
Elmar-Wiese
added a commit
to Elmar-Wiese/a-little-game-called-mario
that referenced
this pull request
Apr 18, 2022
commit 481a423 Author: DoctorC0X <jonshaft@web.de> Date: Mon Apr 18 00:28:38 2022 +0200 Aligned heart system to how coins work, attempt 2 (a-little-org-called-mario#384) commit 0fecd44 Author: Alex CV <42361534+AlexColinVarela@users.noreply.github.com> Date: Sun Apr 17 13:38:52 2022 -0500 CameraFollow now works when solo-playing scene 🎥 (a-little-org-called-mario#385) commit 7b9f9e3 Author: Mario Zechner <contact@badlogicgames.com> Date: Sun Apr 17 19:22:24 2022 +0200 Fix crash on start of ballmario level. player had incorrect type. (a-little-org-called-mario#388) commit 47fedad Author: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Sun Apr 17 18:08:45 2022 +0100 Tutorial Level (a-little-org-called-mario#379) * no message * started a tutorial level commit bc554b5 Author: Samsemy <103825385+Samsemy@users.noreply.github.com> Date: Sun Apr 17 19:14:25 2022 +0300 Made the bus power-up have actual sprite work (a-little-org-called-mario#386) with the approval of the person who made the bus of course. The "Mario Bus drifting" file is the turning animation, "Mario Bus stationary" is for when Mario is in the bus standing still and "Mario bus" is just the powerup before Mario picks it up. Also I personally have some suggestions for features of the bus, I think it would be really fun if the bus sounded like an actual bus, it goes brrrrrr when stationary, does bus sounds when it moves, and possibly a horn addon. Also I think you should be able to exit out of the bus on command, because down the line it's just gonna be more and more annoying trying to bus-proof everything so it doesn't get softlocked. Quite the task I'm asking, but they're all things that I thing would be REALLY worthwhile to make! commit 1a88bf0 Author: captaincolonelfox <lentrog@gmail.com> Date: Sun Apr 17 18:33:37 2022 +0300 Replace title button classes with TitleMenuButton instance (a-little-org-called-mario#381) commit 40eb1c2 Author: Tuhkis <88197425+Tuhkis@users.noreply.github.com> Date: Sun Apr 17 18:29:10 2022 +0300 Fixed bus softlock in LuigiMansion (a-little-org-called-mario#380) * Fixed bus softlock in LuigiMansion Fixed by changing the tiles around the player spawner to fake ones. * Changed the end part to account for bus added space for bus commit e35079c Author: Neil Knauth <nknauth@gmail.com> Date: Sun Apr 17 09:57:17 2022 -0500 re-added large-gassy-randal.png and its import file (a-little-org-called-mario#383) commit 1aec3c4 Author: Neil Knauth <nknauth@gmail.com> Date: Sun Apr 17 04:49:45 2022 -0500 added PictureFrame to this new branch (a-little-org-called-mario#372) commit 90f0971 Author: Jummit <jummit@web.de> Date: Sun Apr 17 11:30:37 2022 +0200 Fix story mode response buttons not being clickable (a-little-org-called-mario#377) The toasty easter egg was in the way. commit 5a59c64 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sun Apr 17 10:00:55 2022 +0200 Decoupling code from Player even further + bonus 🦎 (a-little-org-called-mario#359) commit f000cea Author: SoepIepeI <73912126+SoepIepeI@users.noreply.github.com> Date: Sun Apr 17 07:50:51 2022 +0200 New & improved flappy mario (a-little-org-called-mario#251) * Flappy mario * Add ACKNOWLEDGEMENTS * Add clouds, Add sound effect when entering of exiting a cloud, Changed pipe sprite * Changed cloud spawn position, Changed cloud size * Added preset pipes * Add game over screen, add reset button, add preset clouds, add sound effects * Fixed merge issue and migrated logic to new inventory system * Fixed some merge conflict introduced bugs * Resolved review comment, use _unhandled_input instead of _process * Add lost controls * Fixed loss of control when game is over * Removed dubble coin commit 18f0429 Author: Neil Knauth <nknauth@gmail.com> Date: Sat Apr 16 23:19:26 2022 -0500 Toasty! (a-little-org-called-mario#373) * added Toasty * improved toasty code * updated toasty.gd with actual numbers * changed waluigi to gassy randal commit c60e534 Author: radzo73 <radzo73qwerty@gmail.com> Date: Sun Apr 17 03:36:04 2022 +0000 Mario's mustache flashes white when he takes damage (a-little-org-called-mario#375) * Use AnimationPlayer instead of Sprite for animations * Code cleanup and a new function: `playAnim(String strIn)` * Bouncy Mustache now flashes white Had to use a Gradient Texture to have UVs for the shader to use rainbow 'stache when commit f42f9d4 Author: Alex Engelberg <alex.benjamin.engelberg@gmail.com> Date: Sat Apr 16 20:15:58 2022 -0700 Donate funk music (a-little-org-called-mario#374) Add a funky remix of the current "overworld" soundtrack commit 739c047 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 17:22:33 2022 -0500 missing imports files for marwing (a-little-org-called-mario#368) commit 36510b7 Author: AppleTheGolden <scotsbox@protonmail.com> Date: Sat Apr 16 22:58:28 2022 +0200 Fix title screen focus (a-little-org-called-mario#222) commit f8cc1a9 Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 20:19:20 2022 +0000 Auto-Format GDScript commit 83154e0 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:18:52 2022 -0500 less obfuscation between internal names for audio buses (a-little-org-called-mario#366) * less obfuscation between internal names for audio buses * fix wrong function call commit 261cd2c Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:16:29 2022 -0500 marwing: decouple generic ship code from player and add dummy enemy ship (a-little-org-called-mario#362) * update marwing scene subresources * add basic enemy drone scene * decouple generic ship code from player-specific ship code * add MarwingShip base class * removed commented out old code * made marwing faster * turned off all ship abilities once it's dead * set up enemy skeleton * fix player default rotations commit 1c89f29 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:14:00 2022 -0500 add radio dialogue to marwing 1-0 (a-little-org-called-mario#330) * add assets * add a voice sub-bus * add dialogue box to 1-0 * change default portrait * implement auto-continue * clean up some audio files commit c07e29c Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:08:55 2022 -0500 move audiostreamplayer to appropriate bus (a-little-org-called-mario#365) very cool to see that by and large people are hooking things up properly commit 913598f Author: Gregory Propst <g@prop.st> Date: Sat Apr 16 16:07:02 2022 -0400 clean up testing levels (a-little-org-called-mario#364) commit 211e9c8 Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 20:02:25 2022 +0000 Auto-Format GDScript commit 89cce46 Author: Tuhkis <88197425+Tuhkis@users.noreply.github.com> Date: Sat Apr 16 23:02:06 2022 +0300 Portal colouring (a-little-org-called-mario#356) * Add portal shader * Changes to the portal script Set portal material colour in _ready(). * Changes to EndPortal.tscn Added material to Sprite in EndPortal.tscn. * Changed default colour on end portal * Set default colour for portal * Fixed last commit commit 809c6ec Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 19:58:52 2022 +0000 Auto-Format GDScript commit 997e5b2 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sat Apr 16 21:58:31 2022 +0200 Improve hub (a-little-org-called-mario#345) - Cleaner generation code - Extends both left and right - Some kind of camera management commit c647fdc Author: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Sat Apr 16 20:56:42 2022 +0100 Godsy Randallius (a-little-org-called-mario#363) commit 15bbec1 Author: Alex CV <42361534+AlexColinVarela@users.noreply.github.com> Date: Sat Apr 16 14:56:28 2022 -0500 Better camera follow, now with events 🎥 ✔️ ✔️ (a-little-org-called-mario#344) * Better camera, with events * Better format, tutorial, and more camera events commit c83c2fc Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sat Apr 16 21:54:36 2022 +0200 UI improvements (a-little-org-called-mario#339) * UI improvements * Fix instructions commit 5b6903c Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 19:53:38 2022 +0000 Auto-Format GDScript commit ba5758c Author: Jummit <jummit@web.de> Date: Sat Apr 16 21:53:19 2022 +0200 Add items and more complex dialogs to story mode (a-little-org-called-mario#338) * Add items to story mode Adds an inventory which can be opened by pressing E. Items can be received by talking to characters. * Add events, conditions and item giving to dialogs in story mode Adds a lot more functionality to dialogs: They can now trigger events, give out items, change the sprite of the speaker and have branching using checks for if the player has an item or not. * Add a json schema to enable autocompletion in dialogs Users of IDEs with Json language server support should now be able to write "$schema": "dialog.schema.json" in dialog files to enable autocompletion.
Elmar-Wiese
added a commit
to Elmar-Wiese/a-little-game-called-mario
that referenced
this pull request
Apr 18, 2022
commit 713ac98 Author: Ronan Harrington <ronan_harr@protonmail.com> Date: Mon Apr 18 17:02:26 2022 +0100 Fixed C++ error from Debugger in cloud.gd (a-little-org-called-mario#410) This commit addresses the following error from the Godot Debugger: The argument 'body' is never used in the function '_on_Area2D_body_entered'. If this is intended, prefix it with an underscore: '_body' <C++ Error> UNUSED_ARGUMENT <Source> cloud.gd:11 commit cd367c1 Author: LilWaddleDee <103877174+LilWaddleDee@users.noreply.github.com> Date: Mon Apr 18 17:00:53 2022 +0100 Added music to sokoban stage 01. (a-little-org-called-mario#407) commit 3869d95 Author: monochromia <monochromia@users.noreply.github.com> Date: Mon Apr 18 15:59:54 2022 +0000 Auto-Format GDScript commit 1afcba1 Author: Elmar-Wiese <74299074+Elmar-Wiese@users.noreply.github.com> Date: Mon Apr 18 17:59:30 2022 +0200 Kaizo lvl (a-little-org-called-mario#409) * Add Kaizo level and added reset to normal background music The kaizo level can be done with a triple jump. Used the oh goodness in .asset_donations Don't really know how to * Added Spike png * added spikes to kaizo_lvl * HalveBaseBlox * Added spikes to kaizo level * moved it into the music folder commit 839c441 Author: monochromia <monochromia@users.noreply.github.com> Date: Mon Apr 18 15:54:10 2022 +0000 Auto-Format GDScript commit d9b8ad5 Author: Mario Zechner <badlogicgames@gmail.com> Date: Mon Apr 18 17:53:49 2022 +0200 Added pie. (a-little-org-called-mario#406) Added pie. Fix all the pies. Use the global rand functions, set collision layer and masks appropriately. commit 6b17ca7 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Mon Apr 18 17:51:50 2022 +0200 Fix crash when collecting stars (a-little-org-called-mario#404) commit 2934d17 Author: monochromia <monochromia@users.noreply.github.com> Date: Mon Apr 18 15:38:54 2022 +0000 Auto-Format GDScript commit a0e654c Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Mon Apr 18 17:38:32 2022 +0200 Colour portals depending on their destination (a-little-org-called-mario#397) * Color portals depending on their destination * Use an animationplayer when the player goes through a portal commit 4caee0c Author: Masheepcian <103336314+Masheepcian@users.noreply.github.com> Date: Mon Apr 18 12:35:55 2022 -0300 Add CarPlayer and Cario mode (a-little-org-called-mario#394) * Add CarPlayer and Cario mode * Move and rename files * Rename nodes and adapt scripts * Fix bugs related to name changes commit 1f1c24b Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Mon Apr 18 17:18:24 2022 +0200 Use a pivot node instead of flipping the player sprite (a-little-org-called-mario#378) * Use a pivot node instead of flipping the player sprite Also fixes an issue with crouching in reverse gravity (a-little-org-called-mario#280) * Fix bus positioning * post-merge * Fix issue with gravity switching while crouched commit b4524d0 Author: IceCryptonym <59789660+IceCryptonym@users.noreply.github.com> Date: Mon Apr 18 15:07:06 2022 +0000 Adds Mario to the title screen (a-little-org-called-mario#323) * Adds Mario to the title screen * Change _process to _unhandled_input * Fix Mario meow commit 198488b Author: Samsemy <103825385+Samsemy@users.noreply.github.com> Date: Mon Apr 18 17:21:44 2022 +0300 The actual "mario not in bus" sprite (a-little-org-called-mario#390) * The actual "mario not in bus" sprite I have no clue if I'm doing this right. * moved to .asset_contributions Co-authored-by: iznaut <36773942+iznaut@users.noreply.github.com> commit 1645342 Author: Samsemy <103825385+Samsemy@users.noreply.github.com> Date: Mon Apr 18 17:21:16 2022 +0300 Gave the basic star tile an actual slope (a-little-org-called-mario#411) * Gave the basic star tile an actual slope nothing special, just your average run-out-of-the-mill slope. * moved to .asset_contributions Co-authored-by: iznaut <36773942+iznaut@users.noreply.github.com> commit 481a423 Author: DoctorC0X <jonshaft@web.de> Date: Mon Apr 18 00:28:38 2022 +0200 Aligned heart system to how coins work, attempt 2 (a-little-org-called-mario#384) commit 0fecd44 Author: Alex CV <42361534+AlexColinVarela@users.noreply.github.com> Date: Sun Apr 17 13:38:52 2022 -0500 CameraFollow now works when solo-playing scene 🎥 (a-little-org-called-mario#385) commit 7b9f9e3 Author: Mario Zechner <contact@badlogicgames.com> Date: Sun Apr 17 19:22:24 2022 +0200 Fix crash on start of ballmario level. player had incorrect type. (a-little-org-called-mario#388) commit 47fedad Author: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Sun Apr 17 18:08:45 2022 +0100 Tutorial Level (a-little-org-called-mario#379) * no message * started a tutorial level commit bc554b5 Author: Samsemy <103825385+Samsemy@users.noreply.github.com> Date: Sun Apr 17 19:14:25 2022 +0300 Made the bus power-up have actual sprite work (a-little-org-called-mario#386) with the approval of the person who made the bus of course. The "Mario Bus drifting" file is the turning animation, "Mario Bus stationary" is for when Mario is in the bus standing still and "Mario bus" is just the powerup before Mario picks it up. Also I personally have some suggestions for features of the bus, I think it would be really fun if the bus sounded like an actual bus, it goes brrrrrr when stationary, does bus sounds when it moves, and possibly a horn addon. Also I think you should be able to exit out of the bus on command, because down the line it's just gonna be more and more annoying trying to bus-proof everything so it doesn't get softlocked. Quite the task I'm asking, but they're all things that I thing would be REALLY worthwhile to make! commit 1a88bf0 Author: captaincolonelfox <lentrog@gmail.com> Date: Sun Apr 17 18:33:37 2022 +0300 Replace title button classes with TitleMenuButton instance (a-little-org-called-mario#381) commit 40eb1c2 Author: Tuhkis <88197425+Tuhkis@users.noreply.github.com> Date: Sun Apr 17 18:29:10 2022 +0300 Fixed bus softlock in LuigiMansion (a-little-org-called-mario#380) * Fixed bus softlock in LuigiMansion Fixed by changing the tiles around the player spawner to fake ones. * Changed the end part to account for bus added space for bus commit e35079c Author: Neil Knauth <nknauth@gmail.com> Date: Sun Apr 17 09:57:17 2022 -0500 re-added large-gassy-randal.png and its import file (a-little-org-called-mario#383) commit 1aec3c4 Author: Neil Knauth <nknauth@gmail.com> Date: Sun Apr 17 04:49:45 2022 -0500 added PictureFrame to this new branch (a-little-org-called-mario#372) commit 90f0971 Author: Jummit <jummit@web.de> Date: Sun Apr 17 11:30:37 2022 +0200 Fix story mode response buttons not being clickable (a-little-org-called-mario#377) The toasty easter egg was in the way. commit 5a59c64 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sun Apr 17 10:00:55 2022 +0200 Decoupling code from Player even further + bonus 🦎 (a-little-org-called-mario#359) commit f000cea Author: SoepIepeI <73912126+SoepIepeI@users.noreply.github.com> Date: Sun Apr 17 07:50:51 2022 +0200 New & improved flappy mario (a-little-org-called-mario#251) * Flappy mario * Add ACKNOWLEDGEMENTS * Add clouds, Add sound effect when entering of exiting a cloud, Changed pipe sprite * Changed cloud spawn position, Changed cloud size * Added preset pipes * Add game over screen, add reset button, add preset clouds, add sound effects * Fixed merge issue and migrated logic to new inventory system * Fixed some merge conflict introduced bugs * Resolved review comment, use _unhandled_input instead of _process * Add lost controls * Fixed loss of control when game is over * Removed dubble coin commit 18f0429 Author: Neil Knauth <nknauth@gmail.com> Date: Sat Apr 16 23:19:26 2022 -0500 Toasty! (a-little-org-called-mario#373) * added Toasty * improved toasty code * updated toasty.gd with actual numbers * changed waluigi to gassy randal commit c60e534 Author: radzo73 <radzo73qwerty@gmail.com> Date: Sun Apr 17 03:36:04 2022 +0000 Mario's mustache flashes white when he takes damage (a-little-org-called-mario#375) * Use AnimationPlayer instead of Sprite for animations * Code cleanup and a new function: `playAnim(String strIn)` * Bouncy Mustache now flashes white Had to use a Gradient Texture to have UVs for the shader to use rainbow 'stache when commit f42f9d4 Author: Alex Engelberg <alex.benjamin.engelberg@gmail.com> Date: Sat Apr 16 20:15:58 2022 -0700 Donate funk music (a-little-org-called-mario#374) Add a funky remix of the current "overworld" soundtrack commit 739c047 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 17:22:33 2022 -0500 missing imports files for marwing (a-little-org-called-mario#368) commit 36510b7 Author: AppleTheGolden <scotsbox@protonmail.com> Date: Sat Apr 16 22:58:28 2022 +0200 Fix title screen focus (a-little-org-called-mario#222) commit f8cc1a9 Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 20:19:20 2022 +0000 Auto-Format GDScript commit 83154e0 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:18:52 2022 -0500 less obfuscation between internal names for audio buses (a-little-org-called-mario#366) * less obfuscation between internal names for audio buses * fix wrong function call commit 261cd2c Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:16:29 2022 -0500 marwing: decouple generic ship code from player and add dummy enemy ship (a-little-org-called-mario#362) * update marwing scene subresources * add basic enemy drone scene * decouple generic ship code from player-specific ship code * add MarwingShip base class * removed commented out old code * made marwing faster * turned off all ship abilities once it's dead * set up enemy skeleton * fix player default rotations commit 1c89f29 Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:14:00 2022 -0500 add radio dialogue to marwing 1-0 (a-little-org-called-mario#330) * add assets * add a voice sub-bus * add dialogue box to 1-0 * change default portrait * implement auto-continue * clean up some audio files commit c07e29c Author: jam <90727957+JAMSP00N@users.noreply.github.com> Date: Sat Apr 16 15:08:55 2022 -0500 move audiostreamplayer to appropriate bus (a-little-org-called-mario#365) very cool to see that by and large people are hooking things up properly commit 913598f Author: Gregory Propst <g@prop.st> Date: Sat Apr 16 16:07:02 2022 -0400 clean up testing levels (a-little-org-called-mario#364) commit 211e9c8 Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 20:02:25 2022 +0000 Auto-Format GDScript commit 89cce46 Author: Tuhkis <88197425+Tuhkis@users.noreply.github.com> Date: Sat Apr 16 23:02:06 2022 +0300 Portal colouring (a-little-org-called-mario#356) * Add portal shader * Changes to the portal script Set portal material colour in _ready(). * Changes to EndPortal.tscn Added material to Sprite in EndPortal.tscn. * Changed default colour on end portal * Set default colour for portal * Fixed last commit commit 809c6ec Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 19:58:52 2022 +0000 Auto-Format GDScript commit 997e5b2 Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sat Apr 16 21:58:31 2022 +0200 Improve hub (a-little-org-called-mario#345) - Cleaner generation code - Extends both left and right - Some kind of camera management commit c647fdc Author: Woahsea <103764495+Woahsea@users.noreply.github.com> Date: Sat Apr 16 20:56:42 2022 +0100 Godsy Randallius (a-little-org-called-mario#363) commit 15bbec1 Author: Alex CV <42361534+AlexColinVarela@users.noreply.github.com> Date: Sat Apr 16 14:56:28 2022 -0500 Better camera follow, now with events 🎥 ✔️ ✔️ (a-little-org-called-mario#344) * Better camera, with events * Better format, tutorial, and more camera events commit c83c2fc Author: Paul Joannon <437025+paulloz@users.noreply.github.com> Date: Sat Apr 16 21:54:36 2022 +0200 UI improvements (a-little-org-called-mario#339) * UI improvements * Fix instructions commit 5b6903c Author: monochromia <monochromia@users.noreply.github.com> Date: Sat Apr 16 19:53:38 2022 +0000 Auto-Format GDScript commit ba5758c Author: Jummit <jummit@web.de> Date: Sat Apr 16 21:53:19 2022 +0200 Add items and more complex dialogs to story mode (a-little-org-called-mario#338) * Add items to story mode Adds an inventory which can be opened by pressing E. Items can be received by talking to characters. * Add events, conditions and item giving to dialogs in story mode Adds a lot more functionality to dialogs: They can now trigger events, give out items, change the sprite of the speaker and have branching using checks for if the player has an item or not. * Add a json schema to enable autocompletion in dialogs Users of IDEs with Json language server support should now be able to write "$schema": "dialog.schema.json" in dialog files to enable autocompletion.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
So, I redid my camera follow code, this time I used groups instead of "../../" thing.
I wanted to add more functionality this time, so as a test I generalized who can be followed. There is now a CameraFCandidate script that you attach to things that can be followed by the camera. When a level with cameraFollow spaws a thing that can be followed it adds it to the candidates. You can now emit a "cameraF_change_candidate" event to change what is the camera following.
By default the player has a candidate script so for levels with only the player and the cameraFollow script, everything works as before.
With this addition we can have a more flexible camera, specially now that people are adding RPG things where you might want the camera to follow something else for a few secs (like a boss spawning or something).
For my next couple of PR I will focus on having more events and more control to the camera.
@paulloz I really really tried to make a better code with no more errors and warnings, I would love to have your opinion on this new approach. For the most part it seems ok except when there is no camera, but at least I think I can assume there is at least one camera somewhere xD