General > Discussion
New wound and healing system on 2.5-dev
geever:
--- Quote from: kurja on August 04, 2012, 06:21:57 pm ---I ran the update, says Aug 3rd version in console, but I'm not seeing a new wound system - I get hit and lose hitpoints, use a medkit and get the hp back, just like before?!?
--- End quote ---
Maybe you're on another branch? Or you fetch but not merge? you should use git pull --rebase if so.
-geever
kurja:
--- Quote from: geever on August 04, 2012, 07:29:03 pm ---Maybe you're on another branch? Or you fetch but not merge? you should use git pull --rebase if so.
-geever
--- End quote ---
I've only updated with fetch. I'm not really familiar with git, and it was my understanding that if I only use fetch and then rebuild with make I'm always running master, not any branch? git pull --rebase returns Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
Nokim:
--- Quote from: DarkRain on July 31, 2012, 06:21:40 pm ---Does that mean they fall unconscious simply by shooting them? That doesn't seems right (and doesn't happen for me)
--- End quote ---
Yes. Not too often but i have got enough them to fill alien contamination unit several times. Sometimes they die from wounds before fight is over. In that case they are not counted as killed in stats (hoverer message in combat say so - Alien killed)
geever:
--- Quote from: kurja on August 05, 2012, 02:12:18 pm ---I've only updated with fetch. I'm not really familiar with git, and it was my understanding that if I only use fetch and then rebuild with make I'm always running master, not any branch? git pull --rebase returns Cannot pull with rebase: You have unstaged changes.
Please commit or stash them.
--- End quote ---
When you fetch, you download the updates to the index, but not merging on your copy of sourcecode. So you still have the individual files unmodified. pull does this merging, --rebase is useful if you do modifications, it keeps your local commits on the top of the commit tree.
You have unstaged changes. means you have not committed changes which are in the way of the update.
A solution: save (and drop) your modifications then update and finally restore your modifications:
--- Code: ---git stash save
git pull --rebase
git stash pop
--- End code ---
There is a chance that your modifications conflict with the code change we made in that case you need to resolve the conflict but I don't think it will be the case now. If you have any problems, just ask.
-geever
kurja:
--- Quote from: geever on August 05, 2012, 04:25:59 pm ---When you fetch, you download the updates to the index, but not merging on your copy of sourcecode. So you still have the individual files unmodified. pull does this merging, --rebase is useful if you do modifications, it keeps your local commits on the top of the commit tree.
You have unstaged changes. means you have not committed changes which are in the way of the update.
A solution: save (and drop) your modifications then update and finally restore your modifications:
--- Code: ---git stash save
git pull --rebase
git stash pop
--- End code ---
There is a chance that your modifications conflict with the code change we made in that case you need to resolve the conflict but I don't think it will be the case now. If you have any problems, just ask.
-geever
--- End quote ---
it appears the "modification" was the gl range indication bug fix patch(?). I ran the commands in your post, and now I get "nn has been wounded" messages in battlescape so I guess it's working...
Navigation
[0] Message Index
[#] Next page
[*] Previous page
Go to full version