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.

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

Config, Texture and Map updates #111

Merged
merged 47 commits into from Mar 7, 2024
Merged

Config, Texture and Map updates #111

merged 47 commits into from Mar 7, 2024

Conversation

MissLavender-LQ
Copy link
Owner

@MissLavender-LQ MissLavender-LQ commented Mar 5, 2024

this pull req contains updated for

  • configs to get librequake looking more constant between engines
  • engine specific menu icons
  • updates to the lq_dev.wad
  • a new wad lq_palette.wad that takes all the flat colors from the dev wad
  • updates to all the transition/temp maps
  • updates to the 2 start maps "start and start_e0"
  • dev map was also updated

old commit msg

im so sorry that this is all under 1 pull req 

did my best to write well in the more recent commits 

with this commit 
its gonna break some textures on maps on main due to 
https://github.com/MissLavender-LQ/LibreQuake/commit/c93f639b83f27e79a1e04f50de746e6965c69f03

i need to have this merged so i can then fix those issues since some maps are newer on main then in my branch```

MissLavender-LQ and others added 30 commits February 4, 2024 16:53
This reverts commit 2dd83e5.
This reverts commit d3a2986.
if this file is not added
u cant enter any maps due to flame0.mdl being missing since i believe it replaces  flame.mdl
added -config.cfg  which just contains
vid_width "1280"
vid_height "800"
which is needed to change the default res in qs based engines
and flame0.mdl was added for joequake support
this contains
vid_width "1280"
vid_height "800"
which are needed to change the default res in qs based engines
since they dont listen to those commands if they are in default.cfg
and the reason we are changing the default res is because at the standard qs res the ui has scaling artifacts
basicly just really wonky looking pixles on the text and ui buttons
alot of engine specific commands added to get LibreQuake to look and play more consistently between engines
still gonna do more work to this file later just wanting to back this up
doesn't exactly work since markv seems to embed its pak into the program so doesn't get over written but if any other port uses these files it will hopefully work for those
- moved all the flat palette textures from lq_dev to lq_palette
(this was done to not over crowd lq_dev since it made it harder to look through it)
when i made the textures they were made at 64x64 even tho they tile at 32x32 did not realise this till today so this was me fixing it
made a new 16x16 texture for lq_dev
this includes the new "dot" textures and a new setup with in the file to make it easier to work for me with in the future
what was changed?

intermission screen was turned off on these maps
designs of each transition map was updated with different textures used to try to look a bit better then before

all transition maps were updated
e1m4
e1m6
e2m1
e2m6
e2m7
e3m1
e3m2
e3m5
e3m6
e3m7
e4m2
e4m6
e4m7
e4m8
all of the above are still temp maps
removed teleskip and h20tele skip since they dont work
the engine only understands waterskip so the others were removed since they didnt work
some changes to the boss room
made the platforms shorter and  made the misc teleport teleport brush visible

added a return teleport to the boss room since before once in u were stuck and would have to kill the player to escape

removed intermission screen from the map selects in the dev map

added lq_palette.wad to wad list since this map uses some textures from it that were in lq_dev.wad
the teleport selection on the start map was updated to use the teleporters from the new transition maps

lighting updated

added purple light to dev map teleporter
Copy link
Collaborator

@MotoLegacy MotoLegacy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Primary issue here is related to configuration file changes. Additionally, please give the PR title something more verbose and remove "(im so sorry)". e.g., "configuration file and wad texture update" or something.

Also, please squash-and-merge if/when this is ever accepted. As opposed to a normal merge.

lq1/-config.cfg Outdated Show resolved Hide resolved
lq1/default.cfg Outdated Show resolved Hide resolved
lq1/default.cfg Outdated Show resolved Hide resolved
lq1/default.cfg Outdated Show resolved Hide resolved
lq1/default.cfg Show resolved Hide resolved
lq1/dev.cfg Show resolved Hide resolved
@MotoLegacy
Copy link
Collaborator

Marked all as resolved, just change the PR name and I'll be happy to approve review :)

@MissLavender-LQ
Copy link
Owner Author

Marked all as resolved, just change the PR name and I'll be happy to approve review :)

with this commit its gonna break some textures on maps on main due to c93f639

i need to have this merged so i can then fix those issues since some maps are newer on main then in my branch

fixing this first since i remembered i can pull main into this branch even if my branch is behind

e0 maps now have lq_palette.wad

added lq_palette.wad to the wad list since these maps may have used the flats in some places
this has to be done due to this change

c93f639

start_e0, e0m6 and e0m9 were also updated with new
transision design "map-trans-e0"

e1 maps now have lq_palette.wad

added lq_palette.wad to the wad list since these maps may have used the flats in some places
this has to be done due to this change

c93f639

e2 maps now have lq_palette.wad

added lq_palette.wad to the wad list since these maps may have used the flats in some places
this has to be done due to this change

c93f639

e3 maps now have lq_palette.wad

added lq_palette.wad to the wad list since these maps may have used the flats in some places
this has to be done due to this change

c93f639

e4 maps now have lq_palette.wad

added lq_palette.wad to the wad list since these maps may have used the flats in some places
this has to be done due to this change

c93f639
check this commit for more info
ca6cd39
check this commit for more info
ca6cd39
updated the wave pattern to match the new one on waterskip and change the contrast a little bit
the textures some how became unaligned at some point
added lq_palette.wad to the wad list since these maps may have used the flats in some places
this has to be done due to this change

c93f639

also some updates were made to old-start since some things were broken
@MissLavender-LQ MissLavender-LQ changed the title Massive update (im so sorry) Config, Texture and Map updates Mar 7, 2024
Copy link
Collaborator

@MotoLegacy MotoLegacy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! :) Thank you for addressing the changes requested and let this be the last mega-branch mega-PR we see here!

@MissLavender-LQ MissLavender-LQ merged commit 5e872b9 into main Mar 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants