-
Notifications
You must be signed in to change notification settings - Fork 11
Permalink
Loading
Choose a base ref
{{ refName }}
default
Loading
Choose a head ref
{{ refName }}
default
Comparing changes
Choose two branches to see what’s changed or to start a new pull request.
If you need to, you can also or
learn more about diff comparisons.
Open a pull request
Create a new pull request by comparing changes across two branches. If you need to, you can also .
Learn more about diff comparisons here.
base repository: ekolis/FrEee
base: 407a55ca99
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
...
head repository: ekolis/FrEee
compare: master
Could not load branches
Nothing to show
Loading
Could not load tags
Nothing to show
{{ refName }}
default
Loading
- 8 commits
- 818 files changed
- 3 contributors
Commits on Apr 14, 2024
-
Configuration menu - View commit details
-
Copy full SHA for b5c561b - Browse repository at this point
Copy the full SHA b5c561bView commit details
Commits on Apr 21, 2024
-
304 port UI to blazor proof of concept (#308)
* Add a Razor class library but for some reason the Razor component can't be referenced from WinForms * Add HTML boilerplate * Rename FrEee.WinForms to FrEee.UI.WinForms * Update namespaces * Update project/solutoin * Undo some accidentally committed changes * Blazorified the GameProgressBar * Adjust styling * Don't allow progress bar to overflow * Set up the new font thingy, not using it yet because I haven't found a good place to put it in the progress bar * Fix right text of progress bar not getting set * Fix crashing when refreshing progress bar * comments for things to clean up * Wrap view model properties without having useless local fields * Move some code from WinForms to the Blazor view model * Fix crash when calling a WinForms modal dialog from Blazor while debugging * Remove references to nonexitent FrEee.UI project * Add comment, that's weird that it's inconsistent * Fix progress bar not refreshing again * Add resource display but it's broken. Also added Blazor test form. * Actually render the Blazor view in the resource display * Try to fix the resource displays' colors and icons but not quite. Icons are not appearing, not sure how to make that work in Blazor outside of wwwroot. Seems like we need middleware but how to install it in a WinForms app? Also trying to fix the margins on the GameProgressBar but no luck there iether... * Fixed resource displays (hopefully the symlinks will persist in the builds or we'll need to find another way to display images in Blazor) * Fix Blazor image path issue by moving index.html to the root. This feels so dastardly... * Delete empty wwwroot folder * Install a couple NuGet packages to fix inability to put Blazor-based controls on form * Combine multile ResourceDisplays into a ResourceQuantityDisplay * Refactor some code into a base BlazorControl * Remove unneeded analytics packages and a using statement * Adjust a few things in the BlazorControl * Get rid of a generic type parameter, somehow partially fix resource displays for empire inventory * Get rid of the other generic type parameter for BlazorControl * Fix BlazorWebView based controls in WinForms designer by using some sort of abtsractoin * Fix resource inventory display * Delerte an unused method * Move controls that have been converted to Blazor to their own namespace, for organization * Adjust namespaces of moved controls * Moved the wrong control oops * GamePictureBox is now Blazor; for some reason there's a scvroll bar * Actually show text on full size GamePictureBox forms * Display name of Blazor control in WinForms designer * Add a pie chart Blazor component, the HTML checks out in a browser bu tfor some reason it's not rendering in the test form. * Fix pie chart rendering * Blazor galaxy map WIP * Somewhat fix layout of galaxy map, somewhat break that of resource display * Fix image alignment/sizing * Implement presence map mode * Set up MEF and dropdown for galaxy map modes * Trying to draw warp lines * Draw warp lines, but they're scaled wrong * Delete unused function * Cleaning up the map, add green grid because green grids are cool * Don't place star systems off the lower or right edges of the map * Fixed map rendering * Render the selected star system with a white border * Clicking a system actually selects it * Get rid of background click handler for galaxy map because it's causing weird errors when clicked repeatedly * Fix numbers being hidden on the resourve display * Fix vertical alignment of resource display text
Configuration menu - View commit details
-
Copy full SHA for 05733a0 - Browse repository at this point
Copy the full SHA 05733a0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7e28dd9 - Browse repository at this point
Copy the full SHA 7e28dd9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6b2e70e - Browse repository at this point
Copy the full SHA 6b2e70eView commit details
Commits on Jun 9, 2024
-
300 split freeecore into a hierarchy of projects take2 (#314)
* Split out some utility code into a FrEee.Core.Utility project * Rename FrEee project to FrEee.Core (finally!) * Clarify purpose of FrEee.Core.Utility project * Delete an extraneous quote * Move combat from Objects to Processes * Move Parser and some extension methods to FrEee.Core.Utility * Delete some unused extension methods * Move AI from Objects to Processes * Move some galaxy/mod reference type stuff to appropriate places * Delete duplicate class * Move abilities from Objects to Modding * Move AbilityExtensions to Modding.Abilities * Move game setup to Processes * Move MiningModle to FrEee.Core, it doesn't reference game objects but it kind of is one..
Configuration menu - View commit details
-
Copy full SHA for d23739e - Browse repository at this point
Copy the full SHA d23739eView commit details
Commits on Jun 14, 2024
-
312 create data models take2 (#316)
Not actually creating the data models, but a little refactoring * Rename FrEee.Core, this time to FrEee.Core.Domain * Actually reference the domain project * Move IReferrrable to Objects.GameState * Store a GameSetup inside the Galaxy, instead of all its properties
Configuration menu - View commit details
-
Copy full SHA for eb17005 - Browse repository at this point
Copy the full SHA eb17005View commit details
Commits on Jun 23, 2024
-
Mistake moving projects? (#317)
Also I think "diag" file is not needed
Configuration menu - View commit details
-
Copy full SHA for 184b290 - Browse repository at this point
Copy the full SHA 184b290View commit details
Commits on Jun 29, 2024
-
Configuration menu - View commit details
-
Copy full SHA for 8fa29ab - Browse repository at this point
Copy the full SHA 8fa29abView commit details
Loading
This comparison is taking too long to generate.
Unfortunately it looks like we can’t render this comparison for you right now. It might be too big, or there might be something weird with your repository.
You can try running this command locally to see the comparison on your machine:
git diff 407a55ca99...master