Proyecto-Titulo/alai
2
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

feature/Prototype_R_LEVEL #47

Merged
cromer merged 18 commits from feature/Prototype_R_LEVEL into develop 2022-09-01 22:36:04 -04:00
Conversation 0 Commits 18 Files Changed 20 +263 -32
Martin commented 2022-09-01 22:35:39 -04:00
Owner
Copy Link
No description provided.
Martin added 18 commits 2022-09-01 22:35:40 -04:00
no changes b718c0f31b
Revert "no changes" 7e57e78205 
This reverts commit b718c0f31b.
R prototype lvl made. Coins and coinHUD added 0e4bad4823
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
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
cromer merged commit c09c52797c into develop 2022-09-01 22:36:04 -04:00
cromer deleted branch feature/Prototype_R_LEVEL 2022-09-01 22:36:04 -04:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Assignees
Clear assignees
ClementeRM Martin cromer
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: Proyecto-Titulo/alai#47
No description provided.
Delete Branch "feature/Prototype_R_LEVEL"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?