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

Fixed long Deagle and revamped sight set #181

Merged
merged 35 commits into from
Jun 30, 2023
Merged
Show file tree
Hide file tree
Changes from 31 commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
690f06c
texturing improvements
Braiam23 Jun 22, 2023
1d074d1
Fixed Line 793: "drum100rndmag.png"
Braiam23 Jun 22, 2023
58b4347
Fix z fighting in both models
Braiam23 Jun 22, 2023
161ca55
Changelog
Braiam23 Jun 23, 2023
e9801cc
FN F2000 visual bug fixed
Braiam23 Jun 24, 2023
5d6ba4a
Update Changelog.md
Desoroxxx Jun 24, 2023
44f73d2
Update F2000Factory.java
Desoroxxx Jun 24, 2023
e7fae7b
Fix M16 Stock in M4A1
Braiam23 Jun 25, 2023
faacfdf
Malyuk bugs visual fixed
Braiam23 Jun 25, 2023
ec6f8f5
third person weapons no longer float
Braiam23 Jun 25, 2023
64aacb7
Fixed 3rd person Magnum and attachment visual bugs
Braiam23 Jun 25, 2023
c0e0802
Changelog
Braiam23 Jun 25, 2023
3986591
Merge branch 'master' into master
Braiam23 Jun 25, 2023
0521dce
Update CZ805BrenFactory.java
Desoroxxx Jun 25, 2023
40e7415
Update M4A1Factory.java
Desoroxxx Jun 25, 2023
4222af9
Update PythonFactory.java
Desoroxxx Jun 25, 2023
f1b76f1
Fixed line 9 "import com.paneedah.mwc.wearables.Bullets;"
Braiam23 Jun 25, 2023
066e3d5
Update PythonFactory.java
Desoroxxx Jun 25, 2023
e0483f4
Set of Better Textured Scopes
Braiam23 Jun 25, 2023
f40656f
revamped sight set
Braiam23 Jun 25, 2023
425e805
Deagle Long Fixed
Braiam23 Jun 25, 2023
90577c6
Deagle long texture
Braiam23 Jun 25, 2023
7b471a1
Important for all changes to work
Braiam23 Jun 25, 2023
3699890
Update Changelog.md
Braiam23 Jun 25, 2023
5e0c2af
Merge branch 'master' into master
Braiam23 Jun 25, 2023
cde840e
Update Changelog.md
Braiam23 Jun 26, 2023
c179f92
Add files via upload
Braiam23 Jun 27, 2023
951946a
Update Changelog.md
Braiam23 Jun 27, 2023
b236225
Update Changelog.md
Braiam23 Jun 27, 2023
d94ad34
Revision of the current java Attachment file, with the modifications …
Braiam23 Jun 28, 2023
666883c
Merge branch 'master' into master
Braiam23 Jun 28, 2023
3e5323f
Update Changelog.md
Braiam23 Jun 29, 2023
6afa2a7
Update Changelog.md
Desoroxxx Jun 30, 2023
5fd27db
Update Changelog.md
Desoroxxx Jun 30, 2023
94afaf8
Update Changelog.md
Desoroxxx Jun 30, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,9 @@ and this project follows to [RagnarΓΆk Versioning Convention](https://gist.githu

### Changed

- Overhauled textures of AAC Honey Badger, Beowulf, HK 417, M16A1, 100 Rounds NATO Drum Magazine, Aimpoint Comp M5 Sight and the pink camo skin
- Overhauled textures of AAC Honey Badger, Beowulf, HK 417, M16A1, 100 Rounds NATO Drum Magazine and the pink camo skin
- Overhauled animations of the M40A6
- Overhauled the texture of the Leupold scope, holographic sight, Aim Point Comp M5 sight, OKP-7 sight, Bijia Reflex sight, RMR sight and Eotech Hybrid sight
Desoroxxx marked this conversation as resolved.
Show resolved Hide resolved
- Reworked the config system:
- Old XML config has been removed, and all configs have been consolidated into a new JSON config. Issues with some non-functioning configs have been resolved
- Adjusted craftingmappings.json to now only override recipes, rather than removing all recipes
Expand Down Expand Up @@ -89,7 +90,9 @@ and this project follows to [RagnarΓΆk Versioning Convention](https://gist.githu
- Fixed 7.62x54mm SVD magazine using 7.62x39mm bullets
- Fixed 3rd person hovering weapons such as the MP7, CZ-805 Bren, and Python and Taurus revolvers
- Fixed the visual bug of the FN F2000 especially when aiming the gun
- Fixed M4A1 "M16 Stock" visual bugs, Malyuk "grip" visual bugs
- Fixed M4A1 "M16 Stock" visual bugs, Malyuk visual bugs
- Fixed Uzi sound effects
- Fixed the attachment of the Long Deagle

### Removed

Expand Down
1,034 changes: 299 additions & 735 deletions src/main/java/com/paneedah/mwc/models/BijiaReflex.java

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/main/java/com/paneedah/mwc/models/DesertEagle.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,8 @@ public class DesertEagle extends ModelWithAttachments {
private final ModelRenderer gun114_r1;

public DesertEagle() {
textureWidth = 128;
textureHeight = 128;
textureWidth = 150;
textureHeight = 150;

gun = new ModelRenderer(this);
gun.setRotationPoint(0.0F, 24.0F, 0.0F);
Expand Down
3,335 changes: 660 additions & 2,675 deletions src/main/java/com/paneedah/mwc/models/DesertEagleLong.java

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/main/java/com/paneedah/mwc/models/DesertEagleMag.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ public class DesertEagleMag extends ModelWithAttachments {
private final ModelRenderer mag5_r1;

public DesertEagleMag() {
textureWidth = 128;
textureHeight = 128;
textureWidth = 150;
textureHeight = 150;

magazine = new ModelRenderer(this);
magazine.setRotationPoint(0.0F, 24.0F, 0.0F);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/paneedah/mwc/models/DesertEagleSlide.java
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ public class DesertEagleSlide extends ModelWithAttachments {
private final ModelRenderer slide104_r1;

public DesertEagleSlide() {
textureWidth = 128;
textureHeight = 128;
textureWidth = 150;
textureHeight = 150;

slide = new ModelRenderer(this);
slide.setRotationPoint(0.0F, 24.0F, 0.0F);
Expand Down
2,061 changes: 582 additions & 1,479 deletions src/main/java/com/paneedah/mwc/models/EotechHybrid2.java

Large diffs are not rendered by default.

1,002 changes: 252 additions & 750 deletions src/main/java/com/paneedah/mwc/models/Holographic.java

Large diffs are not rendered by default.

Loading
Loading