Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: guysoft/EnergySource
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: guysoft/EnergySource
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: weapons
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 16 commits
  • 15 files changed
  • 2 contributors

Commits on Jan 9, 2022

  1. Make left and right variable names the same

    @guysoft
    guysoft committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    e97263a View commit details
    Browse the repository at this point in the history

  2. Add basic code to switch weapons, and a tab in the main menu

    @guysoft
    guysoft committed Jan 9, 2022
    Configuration menu
    Copy the full SHA
    8b9597c View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2022

  1. Fix spawning of cube as new wepon for now, remove Position3D that is … 

    …not needed
    @guysoft
    guysoft committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    5c35eae View commit details
    Browse the repository at this point in the history

  2. Make collision shape the same name

    @guysoft
    guysoft committed Mar 27, 2022
    Configuration menu
    Copy the full SHA
    fe004a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2022

  1. move remove children function to utility singleton
    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    3b139ec View commit details
    Browse the repository at this point in the history

  2. add references to each hand controller in player script

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    07640c9 View commit details
    Browse the repository at this point in the history

  3. add new weapon class and scene for first weapon, the saber

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    50edefc View commit details
    Browse the repository at this point in the history

  4. Modify player scene with new hierarchy for weapons

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    adaa9df View commit details
    Browse the repository at this point in the history

  5. Modify player script to handle equipping weapons

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    ba20b9a View commit details
    Browse the repository at this point in the history

  6. Add test weapon and modify weapon class to be more generic

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    3eaaee6 View commit details
    Browse the repository at this point in the history

  7. add standard weapon material

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    e52a4ec View commit details
    Browse the repository at this point in the history 

  8. debug tweaks
    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    a9a5327 View commit details
    Browse the repository at this point in the history

  9. Update weapons with new material and event trigger

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    ec85182 View commit details
    Browse the repository at this point in the history

  10. fix equip script on controller

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    9e36b4c View commit details
    Browse the repository at this point in the history

  11. refactor switch weapon function and add weapons list to game variables

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    6e599ac View commit details
    Browse the repository at this point in the history

  12. fix mismatched weapon colors

    @rainerweston
    rainerweston committed Mar 31, 2022
    Configuration menu
    Copy the full SHA
    697fab3 View commit details
    Browse the repository at this point in the history
Loading