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

Credits/Shop: Add hooks for credit related events. #1451

Merged
merged 16 commits into from
Aug 21, 2024
Merged

Credits/Shop: Add hooks for credit related events. #1451

merged 16 commits into from
Aug 21, 2024

Commits on Apr 2, 2023

  1. Add and run new hooks related to credit awards. 

     - TTT2ReceivedTeamAwardCredits
 - TTT2ReceivedKillCredits
 - TTT2OnGiveFoundCredits
 - TTT2TransferedCredits
    @pkillboredom
    pkillboredom committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    4ea223b View commit details
    Browse the repository at this point in the history

  2. Add TTT2OrderedEquipment hook run to sv_shop::RerollShopForCredit 

    Fixed some errors.
    @pkillboredom
    pkillboredom committed Apr 2, 2023
    Configuration menu
    Copy the full SHA
    78a95de View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2024

  1. Merge remote-tracking branch 'upstream/master' 

     Conflicts:
	gamemodes/terrortown/gamemode/server/sv_corpse.lua
	gamemodes/terrortown/gamemode/server/sv_player_ext.lua
	gamemodes/terrortown/gamemode/server/sv_shop.lua
	lua/ttt2/libraries/credits.lua
    @pkillboredom
    pkillboredom committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    ce275fc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream/master' into 20240303-upstream… 

    …-merge

# Conflicts:
#	gamemodes/terrortown/gamemode/server/sv_corpse.lua
#	gamemodes/terrortown/gamemode/server/sv_player_ext.lua
#	gamemodes/terrortown/gamemode/server/sv_shop.lua
#	gamemodes/terrortown/gamemode/shared/sh_shop.lua
#	lua/ttt2/libraries/credits.lua
    @pkillboredom
    pkillboredom committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    ce119b4 View commit details
    Browse the repository at this point in the history

  3. whitespace only changes

    @pkillboredom
    pkillboredom committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    26e3f78 View commit details
    Browse the repository at this point in the history

  4. Merge commit 'ded4f19fa53f737c223c62f23f05bd1fc971d933' into 20240303… 

    …-upstream-merge
    @pkillboredom
    pkillboredom committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    df6d3da View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'upstream/master' into 20240303-upstream… 

    …-merge
    @pkillboredom
    pkillboredom committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    265228b View commit details
    Browse the repository at this point in the history

  6. Update Changelog.

    @pkillboredom
    pkillboredom committed Mar 3, 2024
    Configuration menu
    Copy the full SHA
    c95331f View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2024

  1. Add missing realm comments.

    @pkillboredom
    pkillboredom committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    97d509c View commit details
    Browse the repository at this point in the history

  2. Add missing newline in sv_player_ext.lua to satisfy stylua.

    @pkillboredom
    pkillboredom committed Mar 4, 2024
    Configuration menu
    Copy the full SHA
    55f2103 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2024

  1. Rename hooks and fix missing OnGiveFoundCredits() call (missed that t… 

    …he call location moved to bodysearch)
    @pkillboredom
    pkillboredom committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    7fb4ee8 View commit details
    Browse the repository at this point in the history

  2. Update hook calls with new names

    @pkillboredom
    pkillboredom committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    82d7cb1 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/master' into 20240303-upstream… 

    …-merge

# Conflicts:
#	CHANGELOG.md
    @pkillboredom
    pkillboredom committed Mar 28, 2024
    Configuration menu
    Copy the full SHA
    48224f0 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2024

  1. Merge remote-tracking branch 'upstream/master' into 20240303-upstream… 

    …-merge

# Conflicts:
#	CHANGELOG.md
    @pkillboredom
    pkillboredom committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    71d956a View commit details
    Browse the repository at this point in the history

  2. Add missing doc comment

    @pkillboredom
    pkillboredom committed Apr 6, 2024
    Configuration menu
    Copy the full SHA
    ed62904 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Merge branch 'master' into 20240303-upstream-merge

    @TimGoll
    TimGoll authored Aug 21, 2024
    Configuration menu
    Copy the full SHA
    74304d8 View commit details
    Browse the repository at this point in the history