Check-ins with non-propagating tags:
|
2022-12-09
| ||
| 04:34 | Merge pull request #108 from CSC207-2022F-UofT/readme added m chip issues check-in: aa3fd4bfd4 user: siddharth tags: main, prerelease-41, release-1, trunk | |
| 02:14 | Merge pull request #101 from CSC207-2022F-UofT/meta/readme-round-2 Final README Updates Leaf check-in: 127699655f user: theo tags: main, prerelease-40, trunk | |
| 01:56 | Merge pull request #104 from CSC207-2022F-UofT/idea-warnings Fix nearly all IDEA Warnings check-in: 9ad8895e85 user: theo tags: main, prerelease-39, trunk | |
|
2022-12-08
| ||
| 21:12 | Merge pull request #107 from CSC207-2022F-UofT/featurs/InventoryCleanUp Javadoc and InventoryDisplay check-in: 0ba13078f9 user: siddharth tags: main, prerelease-38, trunk | |
| 03:49 | Merge pull request #105 from CSC207-2022F-UofT/features/forfeit Added forfeit option to battle check-in: c316d527d7 user: marc tags: main, prerelease-37, trunk | |
| 00:54 | Merge pull request #100 from CSC207-2022F-UofT/cleanup/solid-i-to-mapgen Ensure all map-related components follow the I of SOLID check-in: 3144819422 user: theo tags: main, prerelease-36, trunk | |
|
2022-12-07
| ||
| 23:51 | Merge pull request #103 from CSC207-2022F-UofT/tutorial_cleanup features/tutorial_cleanup check-in: cfc51d5042 user: andy tags: main, prerelease-35, trunk | |
| 00:36 | Merge pull request #102 from CSC207-2022F-UofT/cool Javadoc stuff check-in: 6f974fd242 user: sierra tags: main, prerelease-34, trunk | |
|
2022-12-06
| ||
| 18:30 | Merge pull request #99 from CSC207-2022F-UofT/features/tutorial_dependencies Features/tutorial dependencies check-in: 1b1f5bd8e4 user: andy tags: main, prerelease-33, trunk | |
| 17:33 | Merge pull request #95 from CSC207-2022F-UofT/features/revive made potions reviveable check-in: 7a79a508f6 user: siddharth tags: main, prerelease-32, trunk | |
| 00:57 | Merge pull request #98 from CSC207-2022F-UofT/cleanup/mapgen-tests-part-2 Add more missing tests check-in: 3138ea8c0f user: theo tags: main, prerelease-31, trunk | |
|
2022-12-05
| ||
| 17:02 | Merge pull request #93 from CSC207-2022F-UofT/bugs/starting-position Ensure valid position after reset check-in: 3559357928 user: theo tags: main, prerelease-30, trunk | |
| 15:45 | Merge pull request #84 from CSC207-2022F-UofT/features/final_room_end_game replay game when entered final room check-in: 52e5aad66d user: andy tags: main, prerelease-29, trunk | |
| 03:09 | Merge pull request #92 from CSC207-2022F-UofT/warningremove fix the warning in the inventory.java. check-in: 32823957c3 user: colin tags: main, prerelease-28, trunk | |
| 03:03 | Merge pull request #90 from CSC207-2022F-UofT/features/revive made so that you can heal fained characters check-in: ca53735273 user: siddharth tags: main, prerelease-27, trunk | |
| 02:10 | Merge pull request #91 from CSC207-2022F-UofT/features/bestgame2022 Fixed potion description. check-in: 9fb701c0ce user: marc tags: main, prerelease-26, trunk | |
| 01:22 | Merge pull request #87 from CSC207-2022F-UofT/features/balance Balance changes check-in: 26b23918da user: marc tags: main, prerelease-25, trunk | |
| 00:56 | Merge pull request #89 from CSC207-2022F-UofT/replaybugfix Replaybugfix check-in: e497b90289 user: colin tags: main, prerelease-24, trunk | |
|
2022-12-04
| ||
| 21:34 | Merge pull request #85 from CSC207-2022F-UofT/features/resetable Add a resetable interface check-in: f2812e65e4 user: theo tags: main, prerelease-23, trunk | |
| 21:08 | Merge pull request #82 from CSC207-2022F-UofT/features/BattleEndInventoryMsc Implemented battle end and did some refactoring check-in: de5c5f41f2 user: siddharth tags: main, prerelease-22, trunk | |
| 19:53 | Merge pull request #83 from CSC207-2022F-UofT/features/facelift Make the game a little bit prettier check-in: 7952a38f4d user: theo tags: main, prerelease-21, trunk | |
| 19:45 | Merge pull request #67 from CSC207-2022F-UofT/meta/readme Update Readme check-in: a979a98b17 user: theo tags: main, prerelease-20, trunk | |
| 04:19 | Merge pull request #81 from CSC207-2022F-UofT/javadoc-fix Fix accidental bad javadoc check-in: 50f71cf697 user: theo tags: main, prerelease-19, trunk | |
| 02:46 | Merge pull request #77 from CSC207-2022F-UofT/features/InventorySaveMisc Added Inventory to Input Listener and Scene Controller, did battle end, and misc (tests, java doc, etc) check-in: 41f3565333 user: siddharth tags: main, prerelease-14, trunk | |
| 02:18 | Merge pull request #78 from CSC207-2022F-UofT/Tests More tests and lore check-in: 9bab0c86cb user: sierra tags: main, prerelease-13, trunk | |
| 02:11 | Merge pull request #75 from CSC207-2022F-UofT/cleanup/tests-to-map-related-classes Cleanup/add tests to map related classes check-in: 0419209f1c user: theo tags: main, prerelease-12, trunk | |
|
2022-12-03
| ||
| 20:46 | Merge pull request #76 from CSC207-2022F-UofT/tutorial_cleaning features/Tutorial_cleaning check-in: 18b407cbff user: andy tags: main, prerelease-11, trunk | |
|
2022-12-02
| ||
| 04:13 | Merge pull request #72 from CSC207-2022F-UofT/66-implement-display-text-after-opening-chest check-in: 2ba757ca9a user: sierra tags: main, prerelease-10, trunk | |
| 03:45 | Merge pull request #73 from CSC207-2022F-UofT/features/battle_round_start Opening WalkingMenu and BattleMenu implemented. check-in: 6465676cb9 user: marc tags: main, prerelease-9, trunk | |
| 02:52 | Merge pull request #69 from CSC207-2022F-UofT/features/DataAccess Data Access check-in: 6fdb919c22 user: siddharth tags: main, prerelease-8, trunk | |
|
2022-12-01
| ||
| 05:26 | Merge pull request #70 from CSC207-2022F-UofT/siddharthgowda-patch-1 Added .DS_Store to gitignore check-in: 712e9de1c0 user: siddharth tags: main, prerelease-7, trunk | |
| 01:47 | Merge pull request #63 from CSC207-2022F-UofT/features/Tutorial_main features/Tutorial_main check-in: 07a4fe4c3a user: andy tags: main, prerelease-6, trunk | |
| 00:55 | Merge pull request #64 from CSC207-2022F-UofT/battlemisc/battleUI Completed BattleMenu check-in: 62a2e8918b user: marc tags: main, prerelease-5, trunk | |
|
2022-11-30
| ||
| 13:24 | Merge pull request #68 from CSC207-2022F-UofT/meta/clean-arch-on-map-draw Clean Architecture in Map Drawing check-in: 92cd2e25fa user: theo tags: main, prerelease-4, trunk | |
|
2022-11-28
| ||
| 22:20 | Merge pull request #62 from CSC207-2022F-UofT/features/UI/Inventory Inventory Presenter, Controller, UI check-in: cf00a7114e user: siddharth tags: main, prerelease-3, trunk | |
| 02:53 | Merge pull request #61 from CSC207-2022F-UofT/features/ui/move-to-walkingcharacter Migrate GUI code to WalkingCharacter check-in: cba05a5369 user: theo tags: main, prerelease-2, trunk | |
| 02:44 | Merge pull request #65 from 6167656e74323431/main Add Automatic Javadoc and Gradle Builds check-in: 436467ff04 user: theo tags: main, prerelease-1, trunk | |