develop #50

Merged

cromer merged 47 commits from develop into master 2022-09-02 00:37:34 -04:00

Conversation 0 Commits 47 Files Changed 45 +698 -129

cromer commented 2022-09-02 00:37:09 -04:00

Owner

Copy Link

No description provided.

cromer added 46 commits 2022-09-02 00:37:10 -04:00

no changes b718c0f31b

Revert "no changes" ... 7e57e78205

This reverts commit b718c0f31b.

R prototype lvl made. Coins and coinHUD added 0e4bad4823

refactor game over screen 0f94363266

fix header guards bc82d3d08c

remove node include 8863a74c09

add player won signal ee34563424

add the godot namespace to the calls so it is more clear where the method resides eb14adbb0e

add a win screen when the flag is reached 08216d061c

Merge pull request 'feature/win_screen' (#43) from feature/win_screen into develop ... df420f698d

Reviewed-on: #43

add new events ea83bf8660

make enemies use the event bus cb81734279

change the way level gets loaded and use the event bus e29492447d

make the restart button send the game started event 5d611f790d

fix spacing 629c41c235

rename directory to lowercase 083db48f04

fix pause bug when monitor isn't present d560d13627

fix notifier bug, it only effected the exported game fe9cebc620

fix windows build ... e981295e5f

gnu++17 doesn't support inline variables but c++17 does

Merge pull request 'feature/monitor_debug' (#44) from feature/monitor_debug into develop ... 2818e210c9

Reviewed-on: #44

coin and bgm added, game over music still not done 7236428157

Merge branch 'feature/Prototype_R_LEVEL' into feature/PROTOTYPE_R_SOUNDS 3f45f3f5a9

Merge pull request 'feature/PROTOTYPE_R_SOUNDS' (#45) from feature/PROTOTYPE_R_SOUNDS into feature/Prototype_R_LEVEL ... 46f32da8ff

Reviewed-on: #45

Merge branch 'develop' into feature/Prototype_R_LEVEL ... c002528d49

# Conflicts:
#	godot/Main.tscn
#	godot/gui/GameOver.tscn
#	src/gui/game_over/GameOverScreen.cpp

minor fix 2e07679b52

Player touched signal added 1f63f5e00a

improve coin counter HUD 3ca5f4e7b2

Merge pull request 'improve coin counter HUD' (#46) from feature/cleanup_coin_counter into develop ... 615b2a0ba2

Reviewed-on: #46

make the enemies use the event bus 011a1b8007

change music file name 6c0b656d79

Make player using the event bus for enemies touching him ba46d6c65b

Adjust jump volume 8adf91247e

Added coins and enemies to the PrototypeR map bc572df9f9

Merge branch 'develop' into feature/Prototype_R_LEVEL ... 346af5dd44

# Conflicts:
#	godot/levels/Prototype.tscn

Added some enemies 9388e6f6f5

Remove unused signals e6b170e4d8

Added some visual details to the PrototypeR map fa4cff9c57

Merge pull request 'feature/Prototype_R_LEVEL' (#47) from feature/Prototype_R_LEVEL into develop ... c09c52797c

Reviewed-on: #47

validation over 100 coins 2c5d3d9afe

changed coin type format to avoid negatives a8e364415c

final changes to music e62acd3ab1

Added music to VictoryScreen e7a1b4f2f8

Added victory sound to assets 866944b784

Merge pull request 'feature/music' (#48) from feature/music into develop ... 28ba710581

Reviewed-on: #48

ready for version 1.0.0 729d808086

Merge pull request 'ready for version 1.0.0' (#49) from feature/version_change into develop ... 03c9614f4d

Reviewed-on: #49

cromer added 1 commit 2022-09-02 00:37:23 -04:00

Merge branch 'master' into develop 54cea89810

cromer merged commit 74d081abbf into master 2022-09-02 00:37:34 -04:00

cromer referenced this issue from a commit 2022-09-02 00:37:34 -04:00

Merge pull request 'develop' (#50) from develop into master

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No Label

Milestone

Clear milestone

No items

No Milestone

Assignees

Clear assignees

No Assignees

1 Participants

Notifications

Subscribe

Due Date

The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Proyecto-Titulo/alai#50

No description provided.