Welcome,
Guest
. Please
login
or
register
.
Did you miss your
activation email
?
September 08, 2024, 03:46:36 am
News:
If you can't login, please
contact us
with your username and e-mail so we can fix it.
Home
Help
Search
Calendar
Login
Register
OpenXcom Forum
»
Contributions
»
Programming
»
Soldier Reordering
« previous
next »
Print
Pages: [
1
]
Go Down
Author
Topic: Soldier Reordering (Read 5301 times)
pmprog
Commander
Posts: 647
Contributor
Soldier Reordering
«
on:
October 24, 2012, 12:41:25 am »
I thought this had been done, but wasn't when I had a look, so I've added it in to my pull request.
https://github.com/SupSuper/OpenXcom/pull/151
One thing I wasn't expecting was that if the user clicks an arrow button on a row, the row click event still fires. I just used MouseX * ScaleX to exclude the area where the buttons were. Hope this was okay?
Logged
radius75
Colonel
Posts: 108
I am the average PC user!
Re: Soldier Reordering
«
Reply #1 on:
October 24, 2012, 10:59:00 am »
I would like to add something
https://github.com/pmprog/OpenXcom/pull/1
Logged
pmprog
Commander
Posts: 647
Contributor
Re: Soldier Reordering
«
Reply #2 on:
October 24, 2012, 11:26:54 am »
I've merged it with mine, but that won't auto-merge with SupSuper's. Though when I get around to doing some more unit rendering functions for battlescape, I guess it'll merge with that pull request too...
Logged
radius75
Colonel
Posts: 108
I am the average PC user!
Re: Soldier Reordering
«
Reply #3 on:
October 24, 2012, 11:37:01 am »
I so just wanted. If @SupSuper merged your Branch, this is together from my commits.
https://github.com/SupSuper/OpenXcom/pull/151/commits
Edit
"Conflict merge" in SupSuper/OpenXcom should not be.
My Branch "adjustment_for_ #151" I created from your "remote master".
EDIT
If you need still change something locally in remote pmprog/master:
First Fetch your origin/master (+my commit)
Merge into local master << remote origin master
«
Last Edit: October 24, 2012, 12:12:25 pm by radius75
»
Logged
Print
Pages: [
1
]
Go Up
« previous
next »
OpenXcom Forum
»
Contributions
»
Programming
»
Soldier Reordering