Resolve Conflicts #10

Merged

Snoweuph merged 8 commits from dev-scene into dev-base 2023-01-31 11:43:28 +00:00

Conversation 0 Commits 8 Files changed 118 +160 -2114

Snoweuph commented 2023-01-31 11:43:23 +00:00

Owner

Copy link

No description provided.

Snoweuph added 8 commits 2023-01-31 11:43:23 +00:00

remove plugin zip a4ffc972c3

Update to Godot 4 111a5b2cde

Update Git Atributes cca7a3c6ea

udate gitatributes 84293bb4dc

Merge branch 'dev-base' into dev-scene 03c36f127b

Merge branch 'dev-base' into dev-scene ... d31ac2d432

Get Godot4 into main-base branch

Update Gitignore 058cc9258a

Clearing .godot folder 2749ae37ef

Snoweuph merged commit 7db9bd6dfd into dev-base 2023-01-31 11:43:28 +00:00

Snoweuph referenced this pull request from a commit 2023-01-31 11:43:28 +00:00

Merge pull request 'Resolve Conflicts' (#10) from dev-scene into dev-base

This repo is archived. You cannot comment on pull requests.

Reviewers

No reviewers

Labels

Clear labels   

bug

Something is not working

  

duplicate

This issue or pull request already exists

  

enhancement

New feature

  

invalid

Something is wrong

No labels

bug

duplicate

enhancement

invalid

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

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: GameDev/2DHackAndSlay#10

No description provided.