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.

Sign up for GitHub

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

Jump to bottom

refactor!: update codebase for 14.0 (originally made by Joker) #307

Open
wants to merge 9 commits into
base: dev
Choose a base branch
from
Open

refactor!: update codebase for 14.0 (originally made by Joker) #307

wants to merge 9 commits into from

Conversation

louis1706
Copy link

@louis1706 louis1706 commented Dec 7, 2024 •
edited
Loading

(probably have transpiller error because of merge conflict)

@louis1706
Squashed commit of the following:
12e4167 
    fix

commit 54ee2ed
Merge: a1756fd 0f5ecfe
Author: Yamato <[email protected]>
Date:   Sat Dec 7 11:21:42 2024 +0100

    Merge branch 'scpsl14-joker' of https://github.com/joker-119/EXILED into pr/262

commit a1756fd
Author: Yamato <[email protected]>
Date:   Sat Dec 7 11:05:02 2024 +0100

    fix

commit 9d5bd49
Merge: 7c59e0e 9633893
Author: Yamato <[email protected]>
Date:   Sat Dec 7 11:04:51 2024 +0100

    Merge branch 'scpsl14' into pr/262

commit 0f5ecfe
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 21:48:13 2024 -0800

    Smol oopsie

commit d855061
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 16:48:59 2024 -0800

    real-final thing

commit c7c9b97
Merge: 10e5f15 4c88127
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 16:47:49 2024 -0800

    Merge branch 'scpsl14' into scpsl14-joker

commit 10e5f15
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 16:42:51 2024 -0800

    Changes to shot event to make it make sense

commit 8cd9759
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 16:22:57 2024 -0800

    hmm

commit 463d036
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 02:22:05 2024 -0800

    Actual final fix

commit 7d5a9fe
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 02:15:32 2024 -0800

    Final changes

commit 94fb499
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 02:00:31 2024 -0800

    smol change

commit dad8570
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 01:58:21 2024 -0800

    Fixing someone's tinybrain

commit e104e17
Merge: 7c59e0e 609e60a
Author: joker-119 <[email protected]>
Date:   Mon Dec 2 01:56:36 2024 -0800

    Merge

commit 7c59e0e
Author: Yamato <[email protected]>
Date:   Sun Dec 1 15:02:48 2024 +0100

    Removing Nullable

commit 0993dba
Author: Yamato <[email protected]>
Date:   Sun Dec 1 14:55:53 2024 +0100

    Fix ALL error

commit b7dca81
Merge: 152ea4b fe042b6
Author: Yamato <[email protected]>
Date:   Sun Dec 1 14:02:13 2024 +0100

    Merge branch 'scpsl14' into pr/262

commit 152ea4b
Author: joker-119 <[email protected]>
Date:   Fri Nov 29 00:44:54 2024 -0800

    Fix Firearm.AmmoType
    Fix Player.AddItem giving items without initializing modules (causing guns to have 0 ammo and be unable to be reloaded, amonst other bugs)

commit 9fb98c9
Author: joker-119 <[email protected]>
Date:   Thu Nov 28 23:47:00 2024 -0800

    Re-fixing this

commit 98cf84d
Author: joker-119 <[email protected]>
Date:   Thu Nov 28 23:14:55 2024 -0800

    Fix build error - stupid merge shit

commit 97b4aae
Merge: 9956110 871b457
Author: joker-119 <[email protected]>
Date:   Thu Nov 28 23:07:09 2024 -0800

    Merge branch 'scpsl14' into scpsl14-joker

commit 9956110
Author: joker-119 <[email protected]>
Date:   Thu Nov 28 23:02:58 2024 -0800

    Re-add reloading/unloading events

commit b439558
Author: joker-119 <[email protected]>
Date:   Thu Nov 28 22:36:23 2024 -0800

    Yes
@Misaka-ZeroTwo
Copy link
Collaborator

All errors fixed?

@VALERA771 VALERA771 requested review from BoltonDev, Misfiy and VladTheCow and removed request for VladTheCow December 9, 2024 08:53
@VALERA771
Copy link

Are Firearm properties working fine?

@VALERA771
Copy link

I don't like changes in Shooting event. Previous code was fine. Maya required a little update to look better but it was not so bad. Reverted shooting event changes pls

VALERA771
VALERA771 reviewed Dec 13, 2024
View reviewed changes
Copy link

@VALERA771 VALERA771 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

  1. I didn't test events Seems no patch errors for now. Couldn't test if events are working as expected
  2. Ammo setter won't work (modify ammo is += to current)
  3. So... requiers a lot of tests to make sure that everyting will work fine

@Misaka-ZeroTwo
Copy link
Collaborator

3. So... requiers a lot of tests to make sure that everyting will work fine

Do you mean that weapon/ammo stuff or there are something else

@BoltonDev BoltonDev changed the title Joker PR without file with only using change refactor!: update codebase for 14.0 (originally made by Joker) Dec 17, 2024
@louis1706 louis1706 changed the base branch from scpsl14 to dev December 27, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@VALERA771 VALERA771 VALERA771 left review comments

@ITeMbI4 ITeMbI4 ITeMbI4 left review comments

@Misfiy Misfiy Awaiting requested review from Misfiy

@BoltonDev BoltonDev Awaiting requested review from BoltonDev

@Misaka-ZeroTwo Misaka-ZeroTwo Awaiting requested review from Misaka-ZeroTwo

@IRacle1 IRacle1 Awaiting requested review from IRacle1

Assignees

@louis1706 louis1706

Labels
API Installer Transpiler
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@louis1706 @Misaka-ZeroTwo @VALERA771 @ITeMbI4 @BoltonDev