ynerant
/
squirrel-battle
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 3 Wiki Activity

Menus #88

Merged
ynerant merged 0 commits from game into master 2020-11-06 18:15:31 +00:00
Conversation 17 Commits - Files Changed -
ynerant commented 2020-11-06 15:45:28 +00:00 (Migrated from gitlab.crans.org)
Copy Link

Ajout d'un menu principal

Ajout d'un menu principal
nicomarg commented 2020-11-06 15:49:46 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 11 commits

  • 90140635...81479f99 - 10 commits from branch master
  • 065f6481 - Merged master into game

Compare with previous version

added 11 commits <ul><li>90140635...81479f99 - 10 commits from branch <code>master</code></li><li>065f6481 - Merged master into game</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1144&start_sha=901406351ee2f48d0a6d6f27dabab5e66ffe16e4)
nicomarg commented 2020-11-06 16:03:05 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>6e5cd908 - Finished cleaning conflicts</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1146&start_sha=065f648118622b6f60d687a7e342bad758d4f883)
nicomarg commented 2020-11-06 16:25:31 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>e3a1bf96 - Used settings for keys</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1153&start_sha=6e5cd9084b1a4d9db970a1dbbdf20930c40a870d)
nicomarg commented 2020-11-06 17:06:42 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>43001f6e - Basic menu handling</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1156&start_sha=e3a1bf96c2dc23b10bc5d3fa5e4735e082926f8f)
ynerant commented 2020-11-06 17:25:07 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

Compare with previous version

added 2 commits <ul><li>8d9b5166 - Linting</li><li>60d6c750 - Bind Return key to menus</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1159&start_sha=43001f6ede2c86f7b5e38aac1fe0a11bcebe815e)
ynerant commented 2020-11-06 17:32:57 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>30a01108 - Test main menu scrolling</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1160&start_sha=60d6c7509a3079e2b5e9c902d3f034713ee1a11c)
ynerant commented 2020-11-06 17:33:46 +00:00 (Migrated from gitlab.crans.org)
Copy Link

unmarked as a Work In Progress

unmarked as a **Work In Progress**
ynerant commented 2020-11-06 17:33:46 +00:00 (Migrated from gitlab.crans.org)
Copy Link

changed title from {-WIP: Meilleure gestion du jeu-} to {+Menus+}

changed title from **{-WIP: Meilleure gestion du jeu-}** to **{+Menus+}**
ynerant commented 2020-11-06 17:33:47 +00:00 (Migrated from gitlab.crans.org)
Copy Link

changed the description

changed the description
ynerant commented 2020-11-06 17:33:55 +00:00 (Migrated from gitlab.crans.org)
Copy Link

approved this merge request

approved this merge request
ynerant commented 2020-11-06 17:37:02 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 5 commits

  • 30a01108...f7d63dab - 4 commits from branch master
  • 9c344790 - Merge branch 'master' into 'game'

Compare with previous version

added 5 commits <ul><li>30a01108...f7d63dab - 4 commits from branch <code>master</code></li><li>9c344790 - Merge branch &#39;master&#39; into &#39;game&#39;</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1161&start_sha=30a01108b802dbce648d93d65fff3bd171174b31)
ynerant commented 2020-11-06 17:38:15 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • a1731dc9 - Default coordinates are (1, 6)

Compare with previous version

added 1 commit <ul><li>a1731dc9 - Default coordinates are (1, 6)</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1162&start_sha=9c344790a1f3affb19a9a12d5264a229f164d97f)
ynerant commented 2020-11-06 18:12:27 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

  • dc0d478d - init -> __init__
  • 329bd84f - Test some functions in the game

Compare with previous version

added 2 commits <ul><li>dc0d478d - init -&gt; __init__</li><li>329bd84f - Test some functions in the game</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1163&start_sha=a1731dc9f72d49eca6d3b13412f7684546d034fc)
ynerant commented 2020-11-06 18:13:02 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • c97a9a2e - Test some functions in the game

Compare with previous version

added 1 commit <ul><li>c97a9a2e - Test some functions in the game</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/7/diffs?diff_id=1164&start_sha=329bd84fc3a535bf539ed1ba3d0647c9ca4b9a61)
ynerant commented 2020-11-06 18:13:40 +00:00 (Migrated from gitlab.crans.org)
Copy Link

enabled an automatic merge when the pipeline for c97a9a2e6c succeeds

enabled an automatic merge when the pipeline for c97a9a2e6c6c5a1a0fa1a5ba47fd79a69ce05418 succeeds
ynerant commented 2020-11-06 18:15:31 +00:00 (Migrated from gitlab.crans.org)
Copy Link

mentioned in commit bee475c0dd

mentioned in commit bee475c0ddb3da8330bd3a1a71b18f9770cf55f4
ynerant commented 2020-11-10 20:35:37 +00:00 (Migrated from gitlab.crans.org)
Copy Link

mentioned in issue #2

mentioned in issue #2
ynerant (Migrated from gitlab.crans.org) approved these changes 2022-12-30 11:16:24 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
ynerant
Labels
Clear labels   
Bug

   
documentation

   
Doing

   
Features

   
Improvements

   
Sugar coating

   
To Do
No Label
Bug
documentation
Doing
Features
Improvements
Sugar coating
To Do
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
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: ynerant/squirrel-battle#88
No description provided.
Delete Branch "game"

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?