Skip to content
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

Add a FLTK-driven boot window #500

Merged
merged 50 commits into from
Jan 2, 2022
Merged

Add a FLTK-driven boot window #500

merged 50 commits into from
Jan 2, 2022

Conversation

AlexMax
Copy link
Contributor

@AlexMax AlexMax commented Jan 1, 2022

This branch adds a boot window to Odamex. The aim is to significantly ease the story surrounding setting up and selecting IWADs for first-time users.

odamex_18feYEuJ5F

  • It catalogs all IWAD files in your waddirs and allows you to select which IWAD to use.
  • You can also add and remove directories from your waddirs if you don't see any IWADs....or even if you do.
  • If you want to turn this feature off, "Don't show this again" will do what you expect. If you want to show it again, there's a new options menu option that will re-enable it.
  • A number of command line params like -file and -warp short-circuit past it.

@AlexMax
Add FLTK and a preliminary target that uses it
ffe61a3 
I think I want to use this for an RCON tool or an alternate interface
for odasrv, but this is already WAY easier to corral than wx, so that's
promising.
@AlexMax
Merge branch 'protobreak' into fltk
1d54fcc 
# Conflicts:
#	.gitmodules
@AlexMax
Merge branch 'protobreak' into fltk
216aaef
@AlexMax
Update to FLTK 1.4, use it for a boot window
1f60aa1
@AlexMax
Scale the window properly
fb50e31
@AlexMax
Bump FLTK to version that fixes scaling with manifests
b9c5d8c
@AlexMax
Clean up layout, add image
c75bd43
@AlexMax
Attempt to fix zlib/libjpeg deps
0d8a8c4
@AlexMax
Fix system JPEG in FLTK
ae01481
@AlexMax
Add CRC file hashing function
ce91034 
Also adds ZLIB to server so we can use its CRC instead.

(cherry picked from commit a666600)
@AlexMax
Clean up ident table
d3d541a 
Also add CRCsum slot.
@AlexMax
Add CRC32 hashing support
ffaa90b 
Plus a helper class to deal with CRC32 and MD5 hashes.
@AlexMax
Split MD5 and CRC into two hash types
d0b0783
@AlexMax
Pipe the IWADs to the GUI
c995f21
@AlexMax
Attempting to figure out why FLTK Windows build fails
eb8a425
@AlexMax
Commit FLUID files, fix UNIX/Mac issues
e1439af
@AlexMax
Make CI build verbose
62bc817
@AlexMax
Build libraries verbose
0bc02a3
@AlexMax
Try Windows 2022
9f720d6
@AlexMax
Generate 2022 builds on the 2022 CI
7f8a395
@AlexMax
Revert "Try Windows 2022"
0e7cc8f 
This reverts commit 9f720d6.
@AlexMax
Don't look for any external libraries in build
c148d19
@AlexMax
Attempt to use CMAKE_PREFIX_PATH to point to libs
c067333
@AlexMax
Get rid of "verbose"
6fccdd8
@AlexMax
Merge branch 'fltk-ci' into fltk
74be9df
@AlexMax
Increase dimensions
73f99b3
@AlexMax
Fix some compile errors
d3a1124
@AlexMax
Add POSIX M_BaseFilesScanDir
f9cc2dd
@AlexMax
Make rescanning IWADs a part of the class
31f2cf2
@AlexMax
Fix remaining POSIX issues
c962b26
@AlexMax
Remove dupes from IWAD list
3f20561
@AlexMax
Attempt to correct endianness checking on mac
b2023bf
@AlexMax
Get IWAD selector to actually work
afa4393
@AlexMax
Update idName and groupName to something nicer
ecc94fa
@AlexMax
Start work on WAD dir manager
3e3feb9
@AlexMax
Implement delete and swap
9ed1794 
The boot window is now mostly usable.
@AlexMax
Carry the selection with move up/down
93a1303
@AlexMax
Make skipping the boot screen work properly
e5acf72
@AlexMax
Replace lookspring option with skip boot window
8f87db0 
Move lookspring to mouse options where it belongs.
@AlexMax
Set icon on the boot window
fa286bb
@AlexMax
Ho ho ho, here's a sorted IWAD list
a009e06
@AlexMax
Add some missing CRC32's and idents
246207d
@AlexMax
Merge branch 'protobreak' into fltk
27ab991
@AlexMax
Regenerate IWAD list if we change our WAD dirs
703e4c6 
Only regenerated if we click back to the first tab and our waddirs is
different.
@AlexMax
Bump the scaled resolution to HD+
2b3684d
@AlexMax
Treat HACX like Doom 2
ddaf728 
There's still some unimplemented MAPINFO tokens though.
@AlexMax
Fix loading HACX
f153742
@AlexMax
Fix Ubuntu build
eda2672
@AlexMax
Link against AppKit on macOS
502d232
@AlexMax
Add -connect to skip params
ba204b8
@rakohus
Copy link
Contributor

rakohus commented Jan 2, 2022

Tests fine

@AlexMax AlexMax merged commit 118cfb8 into protobreak Jan 2, 2022
@AlexMax AlexMax deleted the fltk branch January 2, 2022 03:40
@AlexMax
Copy link
Contributor Author

AlexMax commented Jan 2, 2022

The CentOS workflow is having an issue that has nothing to do with our code, so I'll go ahead and merge this and hope the workflow turns green this time.

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
@AlexMax @rakohus