Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port ranged weapons #29

Closed
wants to merge 10 commits into from
Closed

Port ranged weapons #29

wants to merge 10 commits into from

Conversation

Dennis-Nesterenko
Copy link
Member

@Dennis-Nesterenko Dennis-Nesterenko commented Apr 19, 2023

Porting a bunch of the ranged weapons, energy and physical. 23 in total. From the GoogleDrive.

Physical

Handguns

  • 357 Revolver
  • Eastranger 9mm
  • Glock
  • Tarsen Tactical
  • Proxima Army

Rifles

  • 20mm Cannon
  • 762 Rifle
  • L6
  • L1055
  • M4

Shotguns

  • Bulldog
  • Pump Shotgun
  • Sawed Double Barrel

Energy

Handguns

  • Captain's Gun
  • Ion Pistol
  • Laser Pistol
  • Laser Tag Guns
  • Retro Laser Gun
  • Taser

Rifles

  • Ion Rifle
  • Laser Cannon
  • Laser Rifle
  • X-Ray Laser Gun

Contributors

Many assets modified by me to fit the characters and the art style better, nothing too severe.

Goao
- Captain's Laser Gun
- Ion Pistol V3
- Laser Pistol V2
- I'm noticing a pattern here
- Retro and Laser Tag Guns
- Taser V2
- Laser Rifle
- .357 Magnum
- L6 LMG
- Pump Shotgun V2
- Sawed Double Barrel Shotgun
Liddius
- Ion Rifle
Kiwav
- Laser Cannon
SanukiTheRomeroZombie
- X-ray Laser Gun
SanukiTheRomeroZombie
- X-ray Laser Gun
Baga
- 20mm Cannon
- 7.62 Rifle
- L105
Models taken from 'Officer Pistol Pack'
- Eastranger
- Tarsen Tactical
- Proxima Army
Grimmie
- M4
Chinwizard
- Bulldog Shotgun

Adds in 3 shotguns and 4 handguns. WIP tag until I get the names of everyone who made the weapons

Handguns:
Glock - #
Eastranger - #
TarsenTactical - #
357Revolver - #

Shotguns:
Bulldog - #
PumpShotgunV3 -
SawedOffDoubleBarrel -
Adds 3 rifles, an LMG, and a cannon
6 in total
4 of them
@cosmiccoincidence
Copy link
Member

Where are you porting these from?

@Dennis-Nesterenko
Copy link
Member Author

Im taking them from the google drive

@cosmiccoincidence cosmiccoincidence self-requested a review April 19, 2023 05:37
Proxima army it was called
@Dennis-Nesterenko Dennis-Nesterenko changed the title [WIP] Port ranged weapons Port ranged weapons Apr 19, 2023
@Dennis-Nesterenko
Copy link
Member Author

Alright everything should be properly named and credited

@@ -3,3 +3,4 @@

# Autogenerated Blender files
*.blend1
*.ini
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll give it a full review tomorrow but what is an .ini? I've never seen that file type before, at least not from Blender.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

its a windows data file. Honestly I dont know why its in the gitignore but its not like our art repo needs .inis anyway

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You didn't add it to the .gitignore? Did it happen automatically?

Sure the repo doesn't need it, but it also doesn't need many other file types.

Unless one of the programs you are using is actually generating .inis and saving them in your local repo directory, then there is no reason to add it to the .gitignore.

Lots of useless  materials
Yeah
@cosmiccoincidence
Copy link
Member

cosmiccoincidence commented Apr 21, 2023

This PR is attempting to complete parts of #10 but it is currently blocked because according to #4; #9 needs to be completed first.

#9 needs to be completed before #10 because the assets in #9 are newer and will supersede the ones from the Googledrive. I didn't look at all of them but I did notice a couple files in this PR that do not need to be here because they will be ported from the outdated branch in #9.

I'm going to close this for now, and when you reattempt asset porting, please follow the tasks I have written for them. For example, when porting guns from the googledrive, please do all physical handguns in 1 PR, all physical rifles in another, etc. This makes tracking what was ported and what wasn't a lot easier, as opposed to porting a few assets from this folder and a few from that one, or whatever... See #10 for details, or ask me directly.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants