-
Notifications
You must be signed in to change notification settings - Fork 9
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
Closed
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
4743ae0
[WIP] Port firearms
Dennis-Nesterenko d49038c
[WIP] Porting firearms pt 2
Dennis-Nesterenko 074449b
energy handguns
Dennis-Nesterenko 45e576f
Laser rifles
Dennis-Nesterenko 8ea7ff7
Fix gitignore
Dennis-Nesterenko dc93124
Fix names
Dennis-Nesterenko 4d5828b
Fix name
Dennis-Nesterenko 90652b4
Adds an extra gun
Dennis-Nesterenko 9f2dab8
Clean up the blend files
Dennis-Nesterenko 0c131ba
More
Dennis-Nesterenko File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,3 +3,4 @@ | |
|
|
||
| # Autogenerated Blender files | ||
| *.blend1 | ||
| *.ini | ||
Binary file added
BIN
+269 KB
Assets/Models/Items/Ranged/Energy/Energy Handguns/CaptainsLaserGun.blend
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+265 KB
Assets/Models/Items/Ranged/Energy/Energy Handguns/LaserPistol V2.blend
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+306 KB
Assets/Models/Items/Ranged/Physical/Handguns/.357 Special Revolver.blend
Binary file not shown.
Binary file added
BIN
+304 KB
Assets/Models/Items/Ranged/Physical/Handguns/Eastranger_S_019_9mm.blend
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+267 KB
Assets/Models/Items/Ranged/Physical/Handguns/ProximaArmy L1-M3T 9mm.blend
Binary file not shown.
Binary file added
BIN
+303 KB
Assets/Models/Items/Ranged/Physical/Handguns/TarsenTactical_NT_T_122_Long.blend
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added
BIN
+261 KB
Assets/Models/Items/Ranged/Physical/Shotguns/SawedDoubleBarrelShotgun.blend
Binary file not shown.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.