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

Meilleur affichage #89

Merged
ynerant merged 0 commits from display into master 2020-11-10 20:34:36 +00:00
Conversation 39 Commits - Files Changed -
ynerant commented 2020-11-06 15:49:25 +00:00 (Migrated from gitlab.crans.org)
Copy Link
No description provided.
eichhornchen commented 2020-11-06 15:51:01 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 38ed5259 - added a squirrel unicode texturepack

Compare with previous version

added 1 commit <ul><li>38ed5259 - added a squirrel unicode texturepack</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1145&start_sha=3d98eac74b9834e5c706f10521ab0e15d7f827ec)
eichhornchen commented 2020-11-06 16:03:38 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>4a54609b - changed a few errors</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1147&start_sha=38ed5259d550ef3dfb7ddcf4fbf9b051fdb15805)
eichhornchen commented 2020-11-06 16:05:30 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • a6b93cac - Changed Tiles to take into account the texturepack

Compare with previous version

added 1 commit <ul><li>a6b93cac - Changed Tiles to take into account the texturepack</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1148&start_sha=4a54609bad7ed261690179b7e070026660bea4ff)
eichhornchen commented 2020-11-06 16:10:17 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 3502acd8 - put back the ":" where it belongs

Compare with previous version

added 1 commit <ul><li>3502acd8 - put back the &quot;:&quot; where it belongs</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1149&start_sha=a6b93cacfbc4bcfe1717b34e1b5d504da3af2dda)
eichhornchen commented 2020-11-06 16:11:12 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • fe77f903 - put back the ":" where it belongs

Compare with previous version

added 1 commit <ul><li>fe77f903 - put back the &quot;:&quot; where it belongs</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1150&start_sha=3502acd8d65caaa55c6126aa80631db9e6582851)
eichhornchen commented 2020-11-06 16:14:00 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>3e1eca8f - import name</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1151&start_sha=fe77f903d1aa583242c6fc487ae2e055c157120b)
eichhornchen commented 2020-11-06 16:17:41 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>4115363b - glargh</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1152&start_sha=3e1eca8f3964856fceec914de59f1f0e0b6d7d81)
ynerant commented 2020-11-06 16:43:37 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>f9dcc8f1 - Texture packs are working</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1154&start_sha=4115363b746cc184637b2f1bda90dc98a692fde9)
eichhornchen commented 2020-11-06 17:08:40 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>b1282c10 - added player carachteristics</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1157&start_sha=f9dcc8f1c1b96a02ac079629ce068ad447a60a0f)
eichhornchen commented 2020-11-06 17:12:45 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>bd9dd122 - Added experience system</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1158&start_sha=b1282c107d94ec88208d392d8554dec5110398ff)
eichhornchen commented 2020-11-06 18:51:12 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 1e2ff8a8 - Class for displaying the player statistics (not yet tested)

Compare with previous version

added 1 commit <ul><li>1e2ff8a8 - Class for displaying the player statistics (not yet tested)</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1166&start_sha=bd9dd122f4447522d61dd8e79199a460aa7319b0)
eichhornchen commented 2020-11-06 18:53:50 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>760e3223 - re-statsdisplay</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1167&start_sha=1e2ff8a8ea7657329872346f5eb194fd002bb258)
ynerant commented 2020-11-06 19:28:19 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 27 commits

  • 760e3223...bee475c0 - 22 commits from branch master
  • 02d33944 - Merge remote-tracking branch 'origin/master' into display
  • b3d789e3 - Fix texture packs
  • b5b76fd0 - Make the game start
  • dbd5f6a1 - Unicode texture pack is squirrel texture pack
  • 2e667cde - Fix tests

Compare with previous version

added 27 commits <ul><li>760e3223...bee475c0 - 22 commits from branch <code>master</code></li><li>02d33944 - Merge remote-tracking branch &#39;origin/master&#39; into display</li><li>b3d789e3 - Fix texture packs</li><li>b5b76fd0 - Make the game start</li><li>dbd5f6a1 - Unicode texture pack is squirrel texture pack</li><li>2e667cde - Fix tests</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1168&start_sha=760e322389281221446c1429b9306f339ec46b84)
ynerant commented 2020-11-06 20:15:18 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>0bd26a1b - Linting</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1169&start_sha=2e667cdebeaf7b93a763897a4c8bb25f80dea2dc)
ynerant commented 2020-11-06 20:17:37 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>0de11abf - Fix circulary import</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1170&start_sha=0bd26a1bd055dd09ca3b23c4694ab39744cc11b5)
ynerant commented 2020-11-06 20:23:23 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>aeb43a0c - Test player level up</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1171&start_sha=0de11abfa8f97bf3825ee5397adf3b9677fa23dc)
eichhornchen commented 2020-11-07 14:01:33 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 4ea3d20b - Better stats display (tested)

Compare with previous version

added 1 commit <ul><li>4ea3d20b - Better stats display (tested)</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1172&start_sha=aeb43a0cec1e49fd7dd2f38333ff15231b181ae9)
eichhornchen commented 2020-11-08 15:37:01 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • e0366b47 - Menu display is now supported

Compare with previous version

added 1 commit <ul><li>e0366b47 - Menu display is now supported</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1173&start_sha=4ea3d20b28386eefdfd10ef9f63336d5b41c60db)
ynerant commented 2020-11-08 22:48:37 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 9 commits

Compare with previous version

added 9 commits <ul><li>933385e7 - Linting</li><li>8ccf8c7b - Display main menu by default</li><li>dc3f55cf - MapDisplay extends Display</li><li>715fad18 - StatsDisplay extends Display</li><li>7e920866 - Start game button is working</li><li>259bde81 - Back to menu by pressing space button</li><li>65d89b7f - Add some comments</li><li>3486c865 - Use a fake pad to make tests runnable</li><li>0ab0e6a0 - More tests</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1175&start_sha=e0366b4719ea06b7e431b26666d405da46817206)
ynerant commented 2020-11-08 23:43:20 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 298d832d - Width and height are managed dynamically: we can almost freely resize the window

Compare with previous version

added 1 commit <ul><li>298d832d - Width and height are managed dynamically: we can almost freely resize the window</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1176&start_sha=0ab0e6a00c9fcf29612fb73538cbfdaa9136e6c3)
ynerant commented 2020-11-08 23:44:17 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • e9c86401 - Width and height are managed dynamically: we can almost freely resize the window

Compare with previous version

added 1 commit <ul><li>e9c86401 - Width and height are managed dynamically: we can almost freely resize the window</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1177&start_sha=298d832db7759bce6db93e0dedc837451bba9ca8)
eichhornchen commented 2020-11-09 00:12:10 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>8d5d9d38 - cleaned the arguments</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1178&start_sha=e9c8640159838e5196e9a72ffb82706538e412f1)
eichhornchen commented 2020-11-09 00:34:13 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>a4876bb7 - repaired display</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1179&start_sha=8d5d9d38ffc5629276a930941c9e090ce841483e)
eichhornchen commented 2020-11-09 00:39:34 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>10bbb284 - Yet again</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1180&start_sha=a4876bb7affc87d36ec96d9903c624452c993b23)
eichhornchen commented 2020-11-10 09:02:26 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 91a8919a - Added a MainMenuDisplay class and fixed errors in display

Compare with previous version

added 1 commit <ul><li>91a8919a - Added a MainMenuDisplay class and fixed errors in display</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1182&start_sha=10bbb284713dc891a27bee1d609fff94fa671e88)
eichhornchen commented 2020-11-10 09:50:05 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 002de68a - Corrected bugs(some still remain)

Compare with previous version

added 1 commit <ul><li>002de68a - Corrected bugs(some still remain)</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1183&start_sha=91a8919a01209a07d8a0d9b694f21731b0f2c92b)
eichhornchen commented 2020-11-10 09:58:17 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • cb33d97c - Fixed game <-> display interaction (the game prints correctly \o/ )

Compare with previous version

added 1 commit <ul><li>cb33d97c - Fixed game &lt;-&gt; display interaction (the game prints correctly \o/ )</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1184&start_sha=002de68a0a8357a7c000e2807633ea68dbb8afef)
eichhornchen commented 2020-11-10 10:22:33 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

Compare with previous version

added 1 commit <ul><li>2e7c12b7 - Trying to repair the test</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1185&start_sha=cb33d97cb770e42669c2363b287e928a77a38919)
eichhornchen commented 2020-11-10 10:39:58 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • e522047c - Now the tests should trully be repaired

Compare with previous version

added 1 commit <ul><li>e522047c - Now the tests should trully be repaired</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1186&start_sha=2e7c12b770a1ac222364312820675f5dc5a849e7)
nicomarg commented 2020-11-10 17:08:14 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 17530f38 - Reworked graphics to make it more modular

Compare with previous version

added 1 commit <ul><li>17530f38 - Reworked graphics to make it more modular</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1187&start_sha=e522047c7424b74f944e6e7b0b64a7089eed7e71)
nicomarg commented 2020-11-10 18:41:06 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • 1a1b906c - Added main menu when launching the game, and fixed menus

Compare with previous version

added 1 commit <ul><li>1a1b906c - Added main menu when launching the game, and fixed menus</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1188&start_sha=17530f386c6adc653ce31768c8148f5d20af6b5e)
ynerant commented 2020-11-10 19:43:25 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 5 commits

Compare with previous version

added 5 commits <ul><li>1ff2e26c - Set good menu names</li><li>5c95bf11 - Linting</li><li>9b925672 - Drop some tests</li><li>f9c3fc15 - Example map was moved</li><li>d50c775e - Mysteriously fix tests</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1189&start_sha=1a1b906c8eb1fd6630251c31016982a2cd10a289)
ynerant commented 2020-11-10 20:20:04 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 1 commit

  • e9ac4488 - Screen is resizable (but please be nice with it)

Compare with previous version

added 1 commit <ul><li>e9ac4488 - Screen is resizable (but please be nice with it)</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1190&start_sha=d50c775e0fcf065632a6ac5ebaa52bb57b23a844)
ynerant commented 2020-11-10 20:32:35 +00:00 (Migrated from gitlab.crans.org)
Copy Link

added 2 commits

  • 7173d134 - Slightly cover bootstrap, to increase more and more coverage. Ensure that...
  • 3416ce2a - Ignore unreachable code in test environment, we have now 99% of coverage

Compare with previous version

added 2 commits <ul><li>7173d134 - Slightly cover bootstrap, to increase more and more coverage. Ensure that...</li><li>3416ce2a - Ignore unreachable code in test environment, we have now 99% of coverage</li></ul> [Compare with previous version](/ynerant/dungeon-battle/-/merge_requests/8/diffs?diff_id=1191&start_sha=e9ac448854ab12f40b873a473959ac5a6092e663)
ynerant commented 2020-11-10 20:33:52 +00:00 (Migrated from gitlab.crans.org)
Copy Link

approved this merge request

approved this merge request
ynerant commented 2020-11-10 20:34:00 +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-10 20:34:04 +00:00 (Migrated from gitlab.crans.org)
Copy Link

enabled an automatic merge when the pipeline for 3416ce2ac3 succeeds

enabled an automatic merge when the pipeline for 3416ce2ac3bd2dce2c1901322355296cec7a2127 succeeds
ynerant commented 2020-11-10 20:34:36 +00:00 (Migrated from gitlab.crans.org)
Copy Link

mentioned in commit 3b3b8ee8da

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

mentioned in issue #7

mentioned in issue #7
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#89
No description provided.
Delete Branch "display"

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?