Closed bolbies closed 9 years ago
Oh and what do you guys think the mission reward vehicles (teleporter strider, supply truck, etc) should be worth? I completely forgot about those.
I think you'll need to rebase up. I just merged the updated vehicle list :-/. What are you referring to with the mission reward? Shouldn't that be a separate pull request? Also, thanks a ton for contributing once again!
@bolbies I just looked at the graph and it looks like you're pretty out of date :-) https://github.com/DUWS-R-Team/DUWS-R/network
Yeah I know school has kept me very busy for a while. I'll get on the updated vehicles. As for the mission rewards, I'm referring to the strider that serves as a mobile teleporter and the supply truck you have to obtain.
No worries. Work has kept me pretty busy as well. Besides, school comes first :-)
Updated to vehicle list. Idk what to do about UAV's either. I might have to do a special addaction for them.
Hey. I'm not sure what tool you're using to manage your Git repo so I'm going to go with Git Bash.
\ This whole section is 'one time' configuration ** First we'll make sure that your local computer knows about the central code repository
git remote -v
<-- Lists all the remotes your computer knows about. upstream [[something here]] (fetch)
upstream [[something here]] (push)
\ Now we're on to what you really want to do Next make sure you don't have any changes on your branch
git checkout DUWS_additions
<-- This puts you on your DUWS_additions branchgit status
<-- Make sure this says "working directory clean" Then we'll sync up your local branch master
and your origin
branch master with upstreams master
git checkout master
<-- put you on your local mastergit fetch upstream
<-- find out what changes are in upstreamgit rebase upstream/master
<-- sync up local master with upstream master
git push origin master:master
<-- make github's master
branch sync with your local computer master
branchWow, that was a bunch. The nice thing is that getting your DUWS_additions
branch in sync is pretty much the same process. I can guarantee you that you'll have conflicts here though. Lets get things synced up here now...
git checkout DUWS_additions
<-- switch back to the "additions" branchgit rebase master
<-- note this one doesn't say "upstream/master". That is because at this point we've already made sure that your local master is in-sync with upstreams master. Now we can use our local master as the point with which to rebase.
git mergetool
. It will list what files have conflicts and display each set of files to you. You just press enter and the merge tool with expand letting you perform the merge :smile: Now, I know all of that is a bunch of information to take in. If you'd like and/or you get stuck feel free to ping me on steam and we can look at the merge together. I have a friends child's birthday party to go to so I'm going to be away from the house a good chunk of the day. If you'd like though I usually use https://www.join.me to share screen. It's free and pretty light weight so I usually use it with my parents who are not computer savvy.
Idk what happened but github won't let me do anything anymore. It says it can't sign out of the branch because of a merge error and that I have 106 files to commit. Any ideas?
Use new pull request
Very basic "Sell Resource" script. It only checks the condition of the engine as of right now. Wheels are finicky but I'll figure something out eventually. I'll also eventually add rear rotor for helis and etc for certain vehicles. As for the taxi, you no longer have to call it from the base first. It'll fly straight there on its first run.