Skip to content

Pull in changes to main branch into this fork - cancelled, handing via command line #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.

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
Closed
wants to merge 1,252 commits into from
Closed

Pull in changes to main branch into this fork - cancelled, handing via command line #9

wants to merge 1,252 commits into from

Conversation

LeafOnTheWind42
Copy link

Changes proposed:

  • This is my first time pulling changes into this fork. I'm not trying to push any changes to the main branch. I hope I'm doing this correctly.

Target branch(es): 335/6x

Issues addressed: Fixes #

Tests performed: (Does it build, tested in-game, etc)

Known issues and TODO list:

  • [ ]
  • [ ]

Travis CI User and others added 30 commits February 8, 2021 17:41
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
f436961
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
6e94b45
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
3ad3d3d
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
22e0867
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
36db3a7
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
7a66047
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
c457012
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
4572ff1
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
89e7b8c
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
6db7891
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
c20ec5f
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
4aad1d8
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
5c5e1c0
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
11633f5
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
795df79
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
bdf4971
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
7c3bba1
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
7c45181
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
778407f
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
5b3051c
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
83f1e81
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
b3f0253
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
e300a57
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
363c883
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
12df119
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
1be3dde
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
07378b7
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
bf13585
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
e4404ba
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
f204588
Rochet2 and others added 28 commits August 20, 2022 01:26
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
ff88307
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
b7035b3
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
c8b6547
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
8ef06ab
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
d65d642
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
092ce24
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
69cf955
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
3096c73
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
79e3391
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
40686ed
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
52eaea6
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
3652b33
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
f3cdf04
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
5a534d6
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
ee145f0
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
ce6c2c4
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
4d39ba9
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
2310a82
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
c59e87a
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
8c96be3
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
f7dffe6
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
d1eb3e5
@Rochet2
Merge TrinityCore 3.3.5 to transmogvendor_3.3.5 [skip ci]
8fb50b9
@LeafOnTheWind42
Merge Rochet2 transmogvendor_3.3.5
eb686d1
@LeafOnTheWind42
Make transmogged armor appearance show up on NPCBots
6640fa5 
Add and call GetNPCBotTransmogGuid function use transmogged item_template.displayid, when applicable, when sending SMSG_MIRRORIMAGE_DATA packets.
@LeafOnTheWind42
Update Readme
b539a6b
@LeafOnTheWind42
Change function name to GetNPCBotTransmogDisplayId
c291329 
That name matches what it is actually doing.
@LeafOnTheWind42
Fix Readme to match previous code changes
f9251c3
@LeafOnTheWind42 LeafOnTheWind42 changed the title Pull in changes to main branch into this fork Pull in changes to main branch into this fork - cancelled, handing via command line Aug 23, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@LeafOnTheWind42 @Rochet2