-
-
Notifications
You must be signed in to change notification settings - Fork 219
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
Framework Cleanup (no more client code in fw) #666
Merged
Merged
Conversation
This file contains 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
…taminate fw/client) GraphicalApplication was the biggest offender, we need to ensure that this is a base graphical application class and not a client specific class. Created UIQrCode widget Minor additions and clean up
# Conflicts: # src/client/tile.cpp # src/framework/core/graphicalapplication.cpp # src/framework/core/graphicalapplication.h # src/main.cpp
conde2
requested changes
Dec 5, 2023
Remove `image-source-base64` in favour of `image-source: base64:/path/image`
conde2
approved these changes
Dec 6, 2023
I have some more changes coming that are necessary in this PR, @conde2 I'll need another review when ever you get the chance, once I've committed my changes. |
- Readd FRAMEWORK_GRAPHICS (so we can have no graphics support) - Added creatureDiagonalWalkSpeed/playerDiagonalWalkSpeed upgrade_classification - Added getCountOrSubType to Item lua binding - Added startEvent to EventDispatcher (to start stored ScheduledEvent's) - Removed g_drawPool from the application.cpp (we use dispatchPoll) - Added startTime calculator when logging module starts - Allow commenting out otml using # - Added some math functions - Added onAdopted/onAbandoned to UIWidget for when they are added to/from parent UIWidget's - Added some more helper methods to UIWidget - Added visibleOnly to UIWidget getChildBefore/getChildAfter methods - Added onHovered for only hovered widget events - Make getChildIndex take child as optional parameter, if not provided it returns this widgets child index - Added sha1Encrpyt method - General clean up
csantbr
approved these changes
Dec 7, 2023
conde2
requested changes
Dec 7, 2023
conde2
requested changes
Dec 7, 2023
conde2
approved these changes
Dec 8, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
Reworked some major cross contamination in the framework:
Removed <client/...> includes from framework (we should never cross contaminate fw/client)
Keep
GraphicalApplication
abstract usingApplicationDrawEvents
&ApplicationContext
Moved
ShaderManager
to the frameworkCreated
UIQrCode
widgetDiscord uses update callbacks now
Minor additions and clean up
Replace
image-source-base64
withimage-source: base64:path/to/image
Added CHANGELOG.md to help with giving visibility to breaking changes
Readd FRAMEWORK_GRAPHICS (so we can have no graphics support)
Added creatureDiagonalWalkSpeed/playerDiagonalWalkSpeed setup config
Added getCountOrSubType to Item lua binding
Added startEvent to EventDispatcher (to start stored ScheduledEvent's)
Removed g_drawPool from the application.cpp (we use dispatchPoll)
Added startTime calculator when logging module starts
Allow commenting out otml using #
Added some math functions
Added some more helper methods to UIWidget
Added onHovered for only hovered widget events
Make getChildIndex take child as optional parameter, if not provided it returns this widgets child index
Added sha1Encrpyt method
General clean up
GraphicalApplication
was the biggest offender, we need to ensure that this is a base graphical application class and not a client specific class.Breaking API Changes
UIWidget
propertyqr-code
&qr-code-border
replaced withUIQrCode
propertiescode
&code-border
image-source-base64
replaced withimage-source: base64:/path/to/image
#include "shadermanager.h"
moved to#include <framework/graphics/shadermanager.h>