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

Part 2 #10

Open
wants to merge 86 commits into
base: part-1
Choose a base branch
from
Open

Part 2 #10

wants to merge 86 commits into from

Commits on Jun 16, 2022

  1. Configuration menu
    Copy the full SHA
    bc4a368 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2 from mimuw-jnp2-rust/kasia

    Add util for spawning bundles
    KatKlo authored Jun 16, 2022
    Configuration menu
    Copy the full SHA
    96ae00e View commit details
    Browse the repository at this point in the history
  3. Add easy menu after death

    KatKlo committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    c852d03 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b28c0c0 View commit details
    Browse the repository at this point in the history
  5. Add end menu and finish line

    KatKlo committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    989bbe2 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'main' into menu

    KatKlo committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    b44a3f3 View commit details
    Browse the repository at this point in the history
  7. Make player falling impossible

    KatKlo committed Jun 16, 2022
    Configuration menu
    Copy the full SHA
    5beadf6 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2022

  1. More refactor

    KatKlo committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    c31c446 View commit details
    Browse the repository at this point in the history
  2. player_textures -> game_textures

    Patryk Bundyra committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    c8200c6 View commit details
    Browse the repository at this point in the history
  3. Booster -> Powerup

    Patryk Bundyra committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    b647db7 View commit details
    Browse the repository at this point in the history
  4. Adding living being component and killing player as event

    Patryk Bundyra committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    d704378 View commit details
    Browse the repository at this point in the history
  5. Killing enemies by event and removing NASA calculations

    Patryk Bundyra committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    ca9c16d View commit details
    Browse the repository at this point in the history
  6. Adding kira audio

    Patryk Bundyra committed Jun 17, 2022
    Configuration menu
    Copy the full SHA
    02092c2 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2022

  1. Adding basic audio

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    b7d2e5c View commit details
    Browse the repository at this point in the history
  2. Adding differents hit sound effects

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    46862ee View commit details
    Browse the repository at this point in the history
  3. Exetending audio features

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    b02da3a View commit details
    Browse the repository at this point in the history
  4. Add random generator

    KatKlo committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    742d98c View commit details
    Browse the repository at this point in the history
  5. Better menu

    KatKlo committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    1a20fb2 View commit details
    Browse the repository at this point in the history
  6. Add missing files

    KatKlo committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    de3382e View commit details
    Browse the repository at this point in the history
  7. Audio pretty much finished

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    1e6dc69 View commit details
    Browse the repository at this point in the history
  8. better ai

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    f1d3e82 View commit details
    Browse the repository at this point in the history
  9. Fixing bug with double despawn of monsters

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    420fe5c View commit details
    Browse the repository at this point in the history
  10. Adding shooting timestep

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    bad074d View commit details
    Browse the repository at this point in the history
  11. Removing it cuz it sucks

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    08b3b5c View commit details
    Browse the repository at this point in the history
  12. Add input for seed in menu

    KatKlo committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    a2c4488 View commit details
    Browse the repository at this point in the history
  13. Resolving bug with double despawning monsters

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    2489769 View commit details
    Browse the repository at this point in the history
  14. Adding timers for powerups

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    6086f20 View commit details
    Browse the repository at this point in the history
  15. Adding assets

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    49d702f View commit details
    Browse the repository at this point in the history
  16. Merging changes

    Patryk Bundyra committed Jun 18, 2022
    Configuration menu
    Copy the full SHA
    f7c0f87 View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2022

  1. Add basic levels

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    c88f506 View commit details
    Browse the repository at this point in the history
  2. Merge changes

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    1e346ab View commit details
    Browse the repository at this point in the history
  3. Delete unused imports

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    c4d618f View commit details
    Browse the repository at this point in the history
  4. Better map generating

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    154fcdc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    9235489 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5436742 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    3d0bbb0 View commit details
    Browse the repository at this point in the history
  8. small fix in player's collider

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    22e0eb5 View commit details
    Browse the repository at this point in the history
  9. Menu + sensors + refactor

    * Add easy menu after death
    
    * Add end menu and finish line
    
    * Make player falling impossible
    
    * More refactor
    
    * player_textures -> game_textures
    
    * Booster -> Powerup
    
    * Adding living being component and killing player as event
    
    * Killing enemies by event and removing NASA calculations
    
    * Adding kira audio
    
    * Adding basic audio
    
    * Adding differents hit sound effects
    
    * Exetending audio features
    
    * Add random generator
    
    * Better menu
    
    * Add missing files
    
    * Audio pretty much finished
    
    * better ai
    
    * Fixing bug with double despawn of monsters
    
    * Adding shooting timestep
    
    * Removing it cuz it sucks
    
    * Add input for seed in menu
    
    * Resolving bug with double despawning monsters
    
    * Adding timers for powerups
    
    * Adding assets
    
    * Add basic levels
    
    * Delete unused imports
    
    * Better map generating
    
    * Better spawning objects with components
    
    * Add sensor colliders and fix problems with bullets and powerups
    
    * Cleaner way of taking player from query
    
    * small fix in player's collider
    
    Co-authored-by: Patryk Bundyra <[email protected]>
    KatKlo and Patryk Bundyra authored Jun 19, 2022
    Configuration menu
    Copy the full SHA
    86e2932 View commit details
    Browse the repository at this point in the history
  10. Merging changes

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    ac53128 View commit details
    Browse the repository at this point in the history
  11. Refactoring with rustfm

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    285629c View commit details
    Browse the repository at this point in the history
  12. Better ai

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    15d88d1 View commit details
    Browse the repository at this point in the history
  13. Player cant jump using bullets

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    99f2605 View commit details
    Browse the repository at this point in the history
  14. Add images in win/fail menu

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    0f4762a View commit details
    Browse the repository at this point in the history
  15. Add difficulty and few images

    KatKlo committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    2f201d3 View commit details
    Browse the repository at this point in the history
  16. Proper jumping reset

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    6cc72f2 View commit details
    Browse the repository at this point in the history
  17. Refactoring events

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    350b543 View commit details
    Browse the repository at this point in the history
  18. Moving powerups functionalities to its own plugin

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    f913617 View commit details
    Browse the repository at this point in the history
  19. Handling death event

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    e2ad785 View commit details
    Browse the repository at this point in the history
  20. Increasing jump impulse

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    71793a8 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    0438c1c View commit details
    Browse the repository at this point in the history
  22. Deleting redundant comment

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    3941b06 View commit details
    Browse the repository at this point in the history
  23. Merge branch 'kasia' into patryk

    # Conflicts:
    #	src/game/audio.rs
    #	src/game/bullets.rs
    #	src/game/camera.rs
    #	src/game/components.rs
    #	src/game/map.rs
    #	src/game/mod.rs
    #	src/game/monster.rs
    #	src/game/moster_ai.rs
    #	src/game/player.rs
    #	src/game/powerups.rs
    #	src/game/utils.rs
    #	src/main.rs
    #	src/menu/mod.rs
    #	src/menu/structs.rs
    #	src/menu/systems.rs
    #	src/menu/utils.rs
    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    e180d88 View commit details
    Browse the repository at this point in the history
  24. Merging branches

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    3a06087 View commit details
    Browse the repository at this point in the history
  25. Monster doesnt collide with powerups

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    5569af3 View commit details
    Browse the repository at this point in the history
  26. Renaming

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    89a9b6b View commit details
    Browse the repository at this point in the history
  27. Enhancing performance by avoiding iterating over bullets

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    ebca2f4 View commit details
    Browse the repository at this point in the history
  28. Pleasing clippy...

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    9b6e602 View commit details
    Browse the repository at this point in the history
  29. Adding valgrind

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    c73de5d View commit details
    Browse the repository at this point in the history
  30. Improving toml

    Patryk Bundyra committed Jun 19, 2022
    Configuration menu
    Copy the full SHA
    cf37120 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2022

  1. Valgrinds shoot properly

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    1fa3970 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    96b6b70 View commit details
    Browse the repository at this point in the history
  3. Previous audio

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    df7c20e View commit details
    Browse the repository at this point in the history
  4. Before deleting livingbeing module

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    f271749 View commit details
    Browse the repository at this point in the history
  5. Deleting livingbeing module

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    7d74257 View commit details
    Browse the repository at this point in the history
  6. Making bullets module seperate plugin

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    2e65fe1 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b79b719 View commit details
    Browse the repository at this point in the history
  8. Pleasing clippy

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    6d1958d View commit details
    Browse the repository at this point in the history
  9. Merge branch 'kasia' into patryk

    Patryk Bundyra committed Jun 20, 2022
    Configuration menu
    Copy the full SHA
    595c98c View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2022

  1. Adding com

    PBundyra authored Jun 21, 2022
    Configuration menu
    Copy the full SHA
    8a23c4a View commit details
    Browse the repository at this point in the history
  2. Deleting redundant functions

    Patryk Bundyra committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    4aedda0 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'patryk' of github.com:mimuw-jnp2-rust/project-katklo-pb…

    …undyra into patryk
    Patryk Bundyra committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    d34979e View commit details
    Browse the repository at this point in the history
  4. Improving style

    Patryk Bundyra committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    2b40988 View commit details
    Browse the repository at this point in the history
  5. Updating readme

    Patryk Bundyra committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    d121759 View commit details
    Browse the repository at this point in the history
  6. Updating readme

    Patryk Bundyra committed Jun 21, 2022
    Configuration menu
    Copy the full SHA
    0590c2d View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2022

  1. Update Cargo.toml

    Co-authored-by: Andrzej Głuszak <[email protected]>
    PBundyra and agluszak authored Jun 22, 2022
    Configuration menu
    Copy the full SHA
    fcfb057 View commit details
    Browse the repository at this point in the history
  2. Cleaner rng in audio

    Patryk Bundyra committed Jun 22, 2022
    Configuration menu
    Copy the full SHA
    994b923 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2022

  1. Fix review issues

    * Cleaner rng in audio
    
    * Fix few things from review
    
    * Refactor audio events system and change some names
    
    * Refactor strange match statements
    
    * Add resuming game
    
    Co-authored-by: Patryk Bundyra <[email protected]>
    KatKlo and Patryk Bundyra authored Jun 26, 2022
    Configuration menu
    Copy the full SHA
    ed283d2 View commit details
    Browse the repository at this point in the history
  2. Better audio

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    4cb403e View commit details
    Browse the repository at this point in the history
  3. Better jumping

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    bae4ace View commit details
    Browse the repository at this point in the history
  4. Merge branch 'part-2' into patryk

    # Conflicts:
    #	src/game/audio.rs
    #	src/game/player.rs
    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    53c92e7 View commit details
    Browse the repository at this point in the history
  5. More generic audio plugin

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    86c9fa7 View commit details
    Browse the repository at this point in the history
  6. Resolving a bug with bullets flying beyond the map

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    b243605 View commit details
    Browse the repository at this point in the history
  7. A sligh improvement of the complex audio event handler

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    bbdcca1 View commit details
    Browse the repository at this point in the history
  8. Fixing a typo

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    933e568 View commit details
    Browse the repository at this point in the history
  9. Merge pull request #12 from mimuw-jnp2-rust/patryk

    A more generic audio plugin, resolving a bug with jumping, resolving a bug with bullets flying beyond the map
    PBundyra authored Jun 26, 2022
    Configuration menu
    Copy the full SHA
    e8c103b View commit details
    Browse the repository at this point in the history
  10. Fixing a typo

    Patryk Bundyra committed Jun 26, 2022
    Configuration menu
    Copy the full SHA
    71a9a8d View commit details
    Browse the repository at this point in the history