-
Notifications
You must be signed in to change notification settings - Fork 318
Development #11
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
Open
campervd
wants to merge
19
commits into
CEN4020-Fall:master
Choose a base branch
from
campervd:development
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Development #11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…tatus > docs/status.txt
-Added comments to Jet.cpp -Changed random number generation to add 41 from 40 -Included PoweredVehicle.h instead of Vehicle.h in Jet.h
-Swapped fuelType and numReindeer parameters and arguments to match other classes
-Removed library included for random number generation from Jet.cpp
-Removed library included for random number generation from Sleigh.cpp
-Added RandomFloat function to Skateboard.cpp and Skateboard.h -Corrected numberofReindeer variables in Sleigh.cpp -Added random generator seed to main.cpp
-Changed Sleigh.cpp so that if mileage is below 0, return 0.
…into development
…remote somehow got out of sync, so I had to "git checkout HEAD^ sleigh.cpp", pull, then update Sleigh.cpp again
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Merging Project