search

f3cuk / WICKED-AI

Wicked AI missions for your server
30 stars 59 forks source link

Many fixes #53

Closed SJossy closed 10 years ago

SJossy commented 10 years ago

Added debug area checks for chernarus, cleaned up safepos checks to use less loops, added bunny ranch mission to special missions prostitutes will be neg humanity the pimp will be positive so both heroes and bandits can do it

f3cuk commented 10 years ago

Shit,

Second time this has happened. Github for Windows really needs a notifier for pull request. Have been working on fixing some issues today and just pushed a commit myself.

Ah well, i'll look at what you have done and try to incorporate manually. Since i know how to use the command line to resolve merge conflicts.

SJossy commented 10 years ago

Doh! Well I'm glad you do because I had a look at it and didn't want to risk breaking anything lol

SJossy commented 10 years ago

I did a branch sync just before I made the changes so it shouldn't be much

f3cuk commented 10 years ago

It's a testbranch, its supposed to be broken :P

I'll work on merging the stuff after dinner. Next time we might want to let each other know what we are working on.

SJossy commented 10 years ago

ok well I'll give it a go next time it wont auto merge heh

and as for what I'm working on right now, sleep! :)

tomorrow I'll do some bug searching and fixes, like the ai count is wrong somehow still, it went to -1 ground units lol

f3cuk commented 10 years ago

Haha okay, it's dinner time here. I'll merge the stuff after dinner and try to release a BETA 2.1.0 tonight, should be almost there.

I already fixed the AI count. Don't worry about that.

f3cuk commented 10 years ago

Commits have been merged manually, i'll close this one.

About the Bunny Ranch missions. I like the idea of a totally different mission, but 4 briefcases for killing one guy? That will kill economy on any server..

SJossy commented 10 years ago

lol I do agree, that was just the defaults from the guy who made it :P