Closed HellDragon-HK closed 6 years ago
Needs to be rebased.
@100GPing100: git blame
says this was your code; was there some good reason to remove the streamers?
What do you mean rebased, this was done after the purge?
I'm guessing GP didn't know about them and thought there weren't any, after all they don't show on PS3, and there's also the locked camera issue in UT3 making it more difficult to see them.
I accepted another edit to the same file, hence there's a conflict and you need to rebase this. That happens always when a file is modified in two different ways.
Yea, that's plausible, but I'd like to hear from zeluisping to make sure.
Ok I get it now, then so a new request is needed, should I wait for GP to reply (which could be awhile) or just do it?
Restoring the streamers was actually a lot easier than I thought, what I was trying to do previously was just completely rebuild them when all that was needed was removing the overridden functions.
The streamers are now back with updated placement and opacity to be closer to UT3.