Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Spiders #197

Closed
wants to merge 63 commits into from
Closed

Spiders #197

wants to merge 63 commits into from

Commits on Apr 17, 2024

  1. Configuration menu
    Copy the full SHA
    8bd49b3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    cfa4f7e View commit details
    Browse the repository at this point in the history
  3. CastielM added ability to reset current level in case of soft lock (I…

    … did this a few times)
    CastielM committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    5d25791 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    0ee17d5 View commit details
    Browse the repository at this point in the history
  5. CastielM changed controls to use WASD which should be consistent with…

    … player 1 controls on the arcade machine
    CastielM committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    e7522c1 View commit details
    Browse the repository at this point in the history
  6. CastielM changed start key to be enter instead of space key, which sh…

    …ould be compatible with arcade machine
    CastielM committed Apr 17, 2024
    Configuration menu
    Copy the full SHA
    3dd55dc View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2024

  1. CastielM adjusted cost so that password will automatically submit whe…

    …n 5 characters are entered, rather than needing to select continue
    CastielM committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    4a90850 View commit details
    Browse the repository at this point in the history
  2. CastielM added password error message. Was keen to add a sound too bu…

    …t not sure how to easily do that without looping sound currently
    CastielM committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    e133c8c View commit details
    Browse the repository at this point in the history
  3. adjusted code so screen just sends a check to password.h which is wha…

    …t will handle the incorrect password
    CastielM committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    76b5bc8 View commit details
    Browse the repository at this point in the history
  4. CastielM fixed so error message displays for more than a split second…

    …, goes away when selection changed
    CastielM committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    98b3cf9 View commit details
    Browse the repository at this point in the history
  5. CastielM made some adjustments to the way user input calculates where…

    … to move selection to for smoother use
    CastielM committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    931ab6f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    b66fdd0 View commit details
    Browse the repository at this point in the history
  7. CastielM have changed passwords. EZPZ is now EZPZY, BOSS is now BOSSY…

    …. This is to avoid issues with the password auto submit
    CastielM committed Apr 19, 2024
    Configuration menu
    Copy the full SHA
    e8f3bcb View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2024

  1. Configuration menu
    Copy the full SHA
    ad3b776 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2024

  1. Configuration menu
    Copy the full SHA
    02856fb View commit details
    Browse the repository at this point in the history
  2. Compiled Games

    github-actions committed May 1, 2024
    Configuration menu
    Copy the full SHA
    baa4307 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2fd60e4 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e179183 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2024

  1. CastielM first step to adding enemies - added basic function for enem…

    …y collision to be detected (sound only) and made them non=solid
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    bff6059 View commit details
    Browse the repository at this point in the history
  2. Start of resetting player to middle of board when colliding with enem…

    …y (to avoid being hit continuously), not fully functional yet
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    37e8734 View commit details
    Browse the repository at this point in the history
  3. CastielM Added gemCount to game.cpp and removed gem data from 'player…

    …'. Allows for a new player object to be created/reset after taking damage without affecting number of gems displayed, since the gems remaining is not tied to player object anyway
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    c370253 View commit details
    Browse the repository at this point in the history
  4. CastielM added lives variable, will subtract upon enemy collision. No…

    … game over set-up yet
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    eea3af7 View commit details
    Browse the repository at this point in the history
  5. CastielM changed damage noise. added gameover noise and return to men…

    …u upon game over (0 lives)
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    f6e49be View commit details
    Browse the repository at this point in the history
  6. CastielM removed word 'entirely' from top of file, as code has now be…

    …en modified by others
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    77939f5 View commit details
    Browse the repository at this point in the history
  7. CastielM added code so that lives is controlled by program.cpp not ga…

    …me.cpp (game.cpp is more akin to a 'level' rather than entire game, as a new 'game' object is created for each level'
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    fb82671 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    2c4d035 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    431fda1 View commit details
    Browse the repository at this point in the history
  10. CastielM added a function to prevent boxes being able to be pushed in…

    …to starting tile. Stylistic changes - made stairs into a campfire that gets lit, with a sound effect. Changed gems to red gems ('fire rubies'?)
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    cb3f406 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    e9b88a3 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    9603632 View commit details
    Browse the repository at this point in the history
  13. CastielM added a comment/line of code to make game easier for debuggi…

    …ng/testing by only spawning one gem
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    ce861df View commit details
    Browse the repository at this point in the history
  14. CastielM added a comment/line of code to make game easier for debuggi…

    …ng/testing by only spawning one gem
    CastielM committed May 11, 2024
    Configuration menu
    Copy the full SHA
    201b5ec View commit details
    Browse the repository at this point in the history

Commits on May 12, 2024

  1. Configuration menu
    Copy the full SHA
    9e4200b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    618a765 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    dd021c2 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    e7cdc20 View commit details
    Browse the repository at this point in the history
  5. Fixed seg fault issue with the 'remove_gem' function. Was only occuri…

    …ng sometimes and discovered with the new level
    CastielM committed May 12, 2024
    Configuration menu
    Copy the full SHA
    e65badc View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    bca48c6 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    bfed74a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    7043346 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    aca18ff View commit details
    Browse the repository at this point in the history
  10. CastielM committing as possibly on right track, have some, very buggy…

    … movement of enemies, work in progress
    CastielM committed May 12, 2024
    Configuration menu
    Copy the full SHA
    7cf6746 View commit details
    Browse the repository at this point in the history
  11. CastielM fixed enemy/solid collision - spiders now move back and fort…

    …h correctly with solid tiles
    CastielM committed May 12, 2024
    Configuration menu
    Copy the full SHA
    5d94dba View commit details
    Browse the repository at this point in the history
  12. CastielM added code to keep enemy x and y ids up to date. Still need …

    …to fix spider speed + also bug when pushing box into spider allows player to walk through the box
    CastielM committed May 12, 2024
    Configuration menu
    Copy the full SHA
    cbe4c41 View commit details
    Browse the repository at this point in the history
  13. adjusted code for keeping ids up to date and added code to keep track…

    … of next positions for enemies
    CastielM committed May 12, 2024
    Configuration menu
    Copy the full SHA
    6afff56 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    b037998 View commit details
    Browse the repository at this point in the history
  15. CastielM getting closer to fixing collision issues with box/enemy, mo…

    …stly issue with box not moving fully if hit
    CastielM committed May 12, 2024
    Configuration menu
    Copy the full SHA
    55200fc View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    0514311 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2024

  1. CastielM added some adjustments - works alot better with enemy slowed…

    … down however animation possibly shouldn't be used for movement as makes calculation of tile_ID fickle (rounding will occur)
    CastielM committed May 13, 2024
    Configuration menu
    Copy the full SHA
    1da6d1d View commit details
    Browse the repository at this point in the history
  2. CastielM had to hard reset some work. Have fixed rounding issue thoug…

    …h not idea, movement should possibly be reworked in future. Finished enemy box collision function. There is a bug where box can still be pushed into enemy if coming from a different direction, this is due to the way it checks direction. Should really use the keys however there were issues with walking through boxes when I did that. Still working on it
    CastielM committed May 13, 2024
    Configuration menu
    Copy the full SHA
    2bd7580 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    70d4baa View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    f893a8a View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    45d52a4 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    8ccb532 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1080c2f View commit details
    Browse the repository at this point in the history
  8. CastielM fixed a bug walking through boxes, turns out it wasn't fully…

    … fixed. Changed where box_enemy_collision was being called
    CastielM committed May 13, 2024
    Configuration menu
    Copy the full SHA
    128741c View commit details
    Browse the repository at this point in the history
  9. CastielM keep thinking issue is fixed and it's not! complete disbaned…

    … box_enemy_collision function and separated parts of it into the different key_down checks. Seems to be fixed
    CastielM committed May 13, 2024
    Configuration menu
    Copy the full SHA
    f0356bc View commit details
    Browse the repository at this point in the history

Commits on May 14, 2024

  1. CastielM added in an adjustment to enemy_move to mitigate spider gett…

    …ing trapped in box on collision
    CastielM committed May 14, 2024
    Configuration menu
    Copy the full SHA
    bed4672 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    41f4529 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4b027d8 View commit details
    Browse the repository at this point in the history
  4. CastielM adjusted variables regarding level number to make it easier …

    …for testing/debugging - only have to change one number now
    CastielM committed May 14, 2024
    Configuration menu
    Copy the full SHA
    145b312 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. Configuration menu
    Copy the full SHA
    116e013 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    1cfb8de View commit details
    Browse the repository at this point in the history