feature/Coin #32

Merged

cromer merged 22 commits from feature/Coin into develop 2022-08-27 22:39:01 -04:00

Conversation 0 Commits 22 Files Changed 30 +1101 -7

Martin commented 2022-08-27 22:38:23 -04:00

Owner

Copy Link

No description provided.

Martin added 22 commits 2022-08-27 22:38:23 -04:00

Coin added to prototype 57289dcb8f

changes to coin a079d8aa37

Coin state machines archives created but not functional 20e2fafcf4

Some fixes on Coin files 5fe9e3340a

Added two states, collected and not collected 876206c39d

On-screen coin counter state machine archives added a439748a34

coin counter method created 3a58777773

minor changes b25e1f040c

Finished coin counter b9ff12dab3

Flag successfully placed on lvl, hitbox detected and working d14cc627de

fix goal state b24c9e8732

Merge branch 'develop' into feature/Coin ... 2be22ceb68

# Conflicts:
#	godot/Main.tscn

changes to coinHUD e54e3b0687

GameOverScreen .h/.cpp made. Godot scene completed 64102a992a

ignore delta since we don't use it 7083f680ee

fix spacing ff600cd761

fix function name and pointer usage b74a8ce1aa

Merge branch 'develop' into feature/Coin ... a9f26a8408

# Conflicts:
#	godot/Main.tscn
#	godot/project.godot

add gameover a27f968297

Merge branch 'develop' into feature/Coin 8b53f74929

Use event bus for coins 705ed4e897

Game over screen finished 3bcbde8161

cromer merged commit 1f4d2b1b72 into develop 2022-08-27 22:39:01 -04:00

cromer deleted branch feature/Coin 2022-08-27 22:39:01 -04:00

cromer referenced this issue from a commit 2022-08-27 22:39:01 -04:00

Merge pull request 'feature/Coin' (#32) from feature/Coin into develop

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

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: Proyecto-Titulo/alai#32

No description provided.