Skip to content

(UNFINISHED) Shopkeeper #3810

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

Open
0bby wants to merge 26 commits into
base: master
Choose a base branch
from
Open

(UNFINISHED) Shopkeeper #3810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
07fc771
Shopkeeper
0bby Apr 5, 2025
bf8b622
Clean up (some) unneeded ported files + code new ability 2 (hakoware)
0bby Apr 5, 2025
1c636c1
All in (ultimate change)
0bby Apr 5, 2025
0faa26b
Fix hakoware + all in, begin new scepter (vagabond)
0bby Apr 7, 2025
0f1c244
Add remaining missing abilities
chrisinajar Dec 18, 2025
766b957
cleaned
chrisinajar Dec 18, 2025
1e4124b
updated agents and sort alphabetyically
chrisinajar Dec 18, 2025
68b1e64
Remove unused abilities
DarkoniusXNG Dec 19, 2025
3fff56d
Entangle, Saltwater Shiv, Shadow Step, Largo
DarkoniusXNG Dec 19, 2025
4103b3a
Nature's Guise
DarkoniusXNG Dec 19, 2025
a3fffe3
Merge branch 'add-missing-ability-files' into pr/3810
0bby Dec 19, 2025
2110ad1
Update hero_selection.js
0bby Dec 19, 2025
448cb86
Update top_bar_fix.js
0bby Dec 19, 2025
1764d87
Update shopkeeper.txt
0bby Dec 19, 2025
fae492c
Fix tooltips
0bby Dec 20, 2025
3886090
Merge branch 'master' into pr/3810
0bby Dec 20, 2025
0079e35
Fix Talents AbilityType
0bby Dec 20, 2025
0e08ea5
model change path
DarkoniusXNG Dec 20, 2025
34b0aee
game/models/heroes/shopkeeper/itemmodels + particles push
0bby Dec 20, 2025
797fb6e
Decompiled Shopkeeper VMDL
0bby Dec 20, 2025
133d805
Placeholder Model + Update Talents + Tooltips
0bby Dec 20, 2025
221af0d
Create shopkeeper.fbx
DarkoniusXNG Dec 20, 2025
1dbe972
created custom shopkeeper textured model. created custom shopkeeper b…
warpdragon Dec 23, 2025
a85892a
Updated abilities
0bby Mar 2, 2026
7fb872c
Merge remote-tracking branch 'origin/master' into pr/3810
0bby Mar 2, 2026
4c3efa3
Merge master into pr/3810 and regenerate addon_english.txt
0bby Mar 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ game/models/items/*

game/models/heroes/*
!game/models/heroes/lycan/
!game/models/heroes/shopkeeper/

# IDE specific directories
.idea
Expand Down
Binary file added content/maps/prefabs/heroes/shopkeeper.vmap
View file
Open in desktop
Binary file not shown.
Loading