develop #34

cromer · 2022-08-28T01:13:07-04:00

cromer commented

2022-08-28 01:13:07 -04:00

No description provided.

cromer added 35 commits 2022-08-28 01:13:07 -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

cleanup c++ code 0f4e77d4b7

remove main namespace 3478127e86

change NULL to nullptr ddb630ca3e

improve default values 1a2c5eab98

include forgotten header 9e0d428ffa

use empty PackedScene instead of nullptr c102c2ad3f

add event bus 3eb3d8765a

add gameover a27f968297

Merge pull request 'add event bus' (#31 ) from feature/event_bus into develop 195c7015af

Reviewed-on: #31

Merge branch 'develop' into feature/Coin 8b53f74929

Use event bus for coins 705ed4e897

Game over screen finished 3bcbde8161

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

Reviewed-on: #32

Merge branch 'develop' into feature/cleanup 156d3ddcae

# Conflicts:
#	src/godot.cpp
#	src/player/Player.cpp

disable monitor by default in development 3c8107ba9f

cleanup code 39173cef21

Merge pull request 'feature/cleanup' (#33 ) from feature/cleanup into develop a57c4d420f

Reviewed-on: #33

cromer added 1 commit 2022-08-28 01:13:19 -04:00

Merge branch 'master' into develop 2443caba88

cromer merged commit 816da5060b into master

2022-08-28 01:13:46 -04:00

cromer referenced this issue from a commit

2022-08-28 01:13:46 -04:00

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

Sign in to join this conversation.

No reviewers

No Label

No Milestone

No Assignees

1 Participants

Notifications

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#34