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

develop #6

Closed
cromer wants to merge 0 commits from develop into master
pull from: develop
merge into: Proyecto-Titulo:master
Conversation 0 Commits - Files Changed -
cromer commented 2022-04-13 09:41:36 -04:00
Owner
Copy Link
No description provided.
cromer added 21 commits 2022-04-13 09:41:36 -04:00
remove vscode project file 16dbc35926
Merge pull request 'remove vscode project file' (#2) from remove_vscode_file into develop 755e774335 
Reviewed-on: Proyecto-Titulo/juego#2
ignore any filename for code workspaces cdb0fbe3f7
change speed back to 60.0 fac339926b
reimport icon as lossless 2D pixel art bfb535cad3
tweak project settings 02e6e54e2b
remove default environment since it is not needed 98a3a04e6a
rename level 1 file c635f64d3f
recenter player in 0,0 dffd810183
change player collision shape to a rectangle aeb3816ded
change the game name 756b42bf82
Merge pull request 'tweaks' (#4) from tweaks into develop b3392035c9 
Reviewed-on: Proyecto-Titulo/juego#4
merge develop ac86f148ba
move player code 8f76f9a2c9
detatch script 35af76cda4
remove include directory 6d2d1178a7
add state machine and have player use it ecd6fe45b2
some cleanup of the code 219b277e5c
add documentation 1c24ba0cd1
fix incorrect gdnative resource 8bbf3942cd
Merge pull request 'feature/state_machine' (#5) from feature/state_machine into develop 6ea66d4e07 
Reviewed-on: Proyecto-Titulo/juego#5
cromer added 1 commit 2022-04-13 09:52:04 -04:00
Merge branch 'master' into develop 3ad9bd9d99
cromer closed this pull request 2022-04-13 09:52:09 -04:00

Pull request closed

Please reopen this pull request to perform a merge.
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#6
No description provided.
Delete Branch "develop"

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?