-
Notifications
You must be signed in to change notification settings - Fork 182
CUIItemUpgrade implementation (anvil UI) #417
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
Merged
Merged
Changes from 9 commits
Commits
Show all changes
123 commits
Select commit
Hold shift + click to select a range
4dbc470
UIItemUpgrade: Item upgrade process completed
Mervandeli b9d4b39
UIItemUpgrade: Animation loop refactored
Mervandeli 93a1634
CUIItemUpgrade: Refactored behaviour like 1299 Client
Mervandeli ac05803
Refactored IsSlotCompatible function
Mervandeli 420e029
CUIItemupgrade Header updated
Mervandeli 2b6e256
Merge branch 'master' of https://github.com/Mervandeli/KnightOnline
Mervandeli f5aed38
Merge remote-tracking branch 'origin/itemupgrade'
Mervandeli 6655aeb
resolved conflicts
Mervandeli 56e0ee2
Right click behavior added
Mervandeli c6b2594
minor updates
Mervandeli 767533b
IsSlotCompatible updated
Mervandeli 5c11509
minor review changes applied
Mervandeli eed6183
Some reviews solved
Mervandeli 5ec8e19
other reviews and ui close problem solved
Mervandeli 1baa24c
ItemCount handled outside render
Mervandeli 6c54b11
Upgrade scroll slot and ItemUpgrade slot seperated
Mervandeli 2cf1629
Removed Unnecessary functions
Mervandeli ac0338e
UI elements handled on load
Mervandeli 18fd8e3
Fixed before commit problem
Mervandeli 8c8a85e
Removed deleteiconskill function and defined magic numbers
Mervandeli cc10c0a
Removed deleteiconskill from header
Mervandeli da5f5b9
SetupIconarea used in other functions
Mervandeli ea52cd6
Upgradearea rightclick behavior fixed
Mervandeli b9fb139
Fixed some reviews
Mervandeli b032065
text ids added text_resource.h and MsgRecv_ItemUpgrade updated
Mervandeli 4e8ff9d
orher reviews and icon move bug fixed
Mervandeli b380e80
Update RestoreInventoryFromBackup logic and rename to UpdateInventory
Mervandeli ee14201
Merge branch 'Open-KO:master' into itemupgrade
Mervandeli 6b8f5e3
last countable item updateinventory problem fixed
Mervandeli 6fb3b3a
Merge errors fixed
Mervandeli 3e136de
Parent class changed N3UIWndBase to N3UIBase
Mervandeli 310f6b5
Other reviews solved
Mervandeli 9108d9a
Refactored handle functions
Mervandeli 4fb54cf
Move Icon poblem fixed
Mervandeli 65ee728
Removed some functions
Mervandeli ea03d6d
Countable Items problem fixed
Mervandeli a8824ae
Merge branch 'Open-KO:master' into itemupgrade
Mervandeli 8071438
GetWndDistrict updated and Using member reduced
Mervandeli 6e6e957
Countable icons moving like original 1299 client
Mervandeli 1f27cda
ReceiveMessage updated
Mervandeli de530bd
Minor update
Mervandeli 2b69cb7
Reduced class members
Mervandeli 8789db1
Used N3_VERIFY_UI_COMPONENT method for Success and Fail UI
Mervandeli 5f92b95
Minor update
Mervandeli d868344
Merge branch 'Open-KO:master' into itemupgrade
Mervandeli ffea50d
UIItemUpgrade.cpp error fix
Mervandeli 140283a
Merge branch 'master' into itemupgrade
Mervandeli a4feef1
Update UIItemUpgrade.cpp
Mervandeli c00c0dc
Cleanup pass to knock out low hanging fruit
twostars 2830cef
Add e_ItemEffect2, fix check
twostars 44e486e
Tidy up MsgRecv_ObjectEvent()
twostars 9279773
Add __IconItemSkill::IsStackable() helper
twostars 75ff769
Minor cleanup
twostars de50320
IsTrina method removed and Consumable item check added
Mervandeli f943008
SetVisibleWithNoSound updated and SetVisible method added
Mervandeli a643abc
SetVisibleWithNoSound updated
Mervandeli afc7f03
Removed Open method
Mervandeli 04aa31d
CleanArea method removed
Mervandeli b8afb8d
Fix: Reset m_pSelectedItem when associated item is freed to prevent i…
Mervandeli 5d5eef0
ShowItemCount removed and Countable labels logic moved to render
Mervandeli 1ebfcf9
UIMsgBoxOkCancel added
Mervandeli a9f4f05
Include untracked files missed in last commit
Mervandeli c020272
Merge branch 'Open-KO:master' into itemupgrade
Mervandeli 0a829ea
Fix missing delete in MsgRecv_ItemUpgrade
Mervandeli 69b8ff6
Merge branch master
Mervandeli 47a7348
Resolve conflicts
Mervandeli db4b22d
Resolve conflicts
Mervandeli fa0785e
untrack submodules
Mervandeli cb7eaf5
deps/db-modules removed
Mervandeli d95bcda
Fix errors
Mervandeli 7f61d81
resolve conflicts
Mervandeli f573efc
merge master
Mervandeli 7b1c566
merge master
Mervandeli 69fbf73
Merge branch 'Open-KO:master' into itemupgrade-2
Mervandeli 6f18b1c
Fix errors
Mervandeli 48b564a
Minor update
Mervandeli 2ce892b
Fix slot errors
Mervandeli cf9ea24
Formatter pass
twostars 12e446a
Add to WarFare/CMakeLists.txt
twostars 1176965
Restore forward declaration
twostars 93b1724
This branch is implemented, disable lint checker for next one
twostars 1b4f64a
Merge branch 'master' into itemupgrade
twostars 5b3c49c
Address detected clang-tidy issues
twostars 46d057f
Merge branch 'master' into itemupgrade
twostars 1f2ca23
Merge branch 'master' into itemupgrade
twostars 080277b
clang-tidy warning fixes
twostars f17ed04
Merge branch 'master' into itemupgrade
twostars af03269
Fix stack split error
Mervandeli 6a08b80
run clang-format
Mervandeli a2f6ef9
Merge branch 'master' into itemupgrade
twostars dfe3880
Merge branch 'master' into itemupgrade
twostars 9dbd068
Update e_ItemUpgradeResult naming in tests as well
twostars 137ec70
Remove redundant and nonsense definitions
twostars f89a6af
Rename for consistency
twostars b1e935f
Use 'requirement' consistently instead of 'material'
twostars f43167e
GetWndDistrict(): Be explicit to indicate how this works
twostars 31fc3c7
We don't really need a helper for this
twostars 02b53d2
Move icon creation helper to __IconItemSkill
twostars 81e91bb
Consistent free logic
twostars 6007720
Rename GetItemFromInv() -> CopyInventoryItems()
twostars afe0b2e
Fix mem leaks in CopyInventoryItems() + HandleInventoryIconRightClick()
twostars bb879fa
Use int8_t for consistency
twostars ea2be0f
Separate item being dragged from tooltip item
twostars 575c8b2
Consistently block item interactions during an upgrade
twostars 7386f38
Always allocate item for drag, refactor packet handling
twostars 3d1335c
Remove drag-specific stack hackery, modify on drag instead
twostars b77883a
Restore MouseProc(), remove UIMSG_ICON_DOWN implementation
twostars 1de2829
Req items should show a stack size of 0 in the inventory when in use
twostars 6c017f8
Don't allow upgrade slot items to be moved
twostars f178e98
__IconItemSkill: Add Clone() and block implicit copy behaviour
twostars a5b2d90
Revert GetUVRect() changes for now
twostars c4b6eec
Merge branch 'master' into itemupgrade
twostars d5db8a4
Remove redundant CreateIcon() call
twostars 39a9877
Refactor to be slightly more sensible/checked
twostars 3e93044
Sort requirement items in the client
twostars ca993fd
These are used now
twostars 6bc4fc6
These are signed
twostars 65d2d02
Be consistent
twostars 244e520
This is no longer used
twostars f847965
Restore official behaviour for single stack req items
twostars 4728f98
Only enforce upgrade UI item changes when visible
twostars 24dbe32
Right-clicks should explicitly handle behaviour based on slot
twostars 85a23f7
Ensure items are reset consistently after upgrades
twostars File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.