search

ClobberXD / gunslinger

[alpha] One of the most realistic ranged weapons mod for Minetest. Consists of a gun-registration API and a comprehensive arsenal of builtin guns.
https://content.minetest.net/packages/ANAND/gunslinger
MIT License
11 stars 3 forks source link

add support for hitscan weapons #29

Closed skittlemittle closed 4 years ago

skittlemittle commented 4 years ago

Add hitscan weapons, nice to have for sniper rifles like the AWP or for quake style railguns. (basically all the counterstrike guns are hitscan, coz the maps are small)

Can even serve as a "lite mode" alternative to projectile weapons.

ClobberXD commented 4 years ago

Sorry, time's getting a little "out of hand" these days. Given that this is a major PR, it might take me a couple of weeks to even start reviewing this. Thanks for the contribution, though; hitscan would surely make sense for weapons that don't follow conventional weapon design.

skittlemittle commented 4 years ago

Sorry, time's getting a little "out of hand" these days.

no hurry

skittlemittle commented 4 years ago

If you have trouble rebasing, I can fix it for you, if you like.

ya i have no idea how to do that

skittlemittle commented 4 years ago

oh wait im an idiot, i can bring my master branch up to date then rebase on that and it should be fixed?

skittlemittle commented 4 years ago

oh wait im an idiot, i can bring my master branch up to date then rebase on that and it should be fixed?

actual stupidity, gon have to manually fix this

ClobberXD commented 4 years ago

oh wait im an idiot, i can bring my master branch up to date then rebase on that and it should be fixed?

Yeah, that's how you rebase. Although it's somewhat easier to directly rebase on MT-CTF/master - git pull --rebase <name_of_upstream_remote> master.

skittlemittle commented 4 years ago

okay so git mergetool worked and i could rebase locally but it still shows the same issues here?

skittlemittle commented 4 years ago

oh ya coz i didnt rebase onto your master branch, youll have to do that?

ClobberXD commented 4 years ago

okay so git mergetool worked and i could rebase locally but it still shows the same issues here?

You need to force push your changes: git push -f (or if you haven't configured default upstream branch, git push -f origin hitscan)

ClobberXD commented 4 years ago

@afshaan4 I'm planning to restructure the code to allow for more extensibility and less conflicts. Would you be able to redo this PR once I'm done with that (I'll let you know)? It'll be much easier to implement hitscan the next time. I'm sorry for all your troubles.

skittlemittle commented 4 years ago

ya sure