lp:~dokomix/dokomix/+git/gzdoom-drfrag666

Author: drfrag
Author Date: 2024-05-31 19:19:47 UTC

Merge commit '6112307cc811357e3379adf0a3851995c84f6792'

# Conflicts:
# CMakeLists.txt
# src/common/fonts/v_font.cpp
# src/common/platform/posix/sdl/sdlglvideo.cpp
# src/common/rendering/r_videoscale.cpp
# src/common/rendering/v_video.cpp
# src/hu_scores.cpp
# wadsrc/static/menudef.txt

Author: drfrag
Author Date: 2023-08-31 19:56:28 UTC

- Fix Commander Keen not appearing on Unholy Massacre skill.

Author: Christoph Oelckers
Author Date: 2022-04-13 06:09:49 UTC

- fixed y-offsets of bal7scr* decal images.

Author: drfrag
Author Date: 2021-07-14 19:42:29 UTC

- Forgot to change the solution name.

Author: drfrag
Author Date: 2021-07-09 09:34:03 UTC

- Bumped version numbers.

Author: drfrag
Author Date: 2021-07-09 09:34:03 UTC

- Bumped version numbers.

Author: drfrag
Author Date: 2020-11-22 10:55:51 UTC

- Use the internal version of _stat() unconditionally since it's broken on Windows.

Author: drfrag
Author Date: 2020-10-05 16:02:13 UTC

- Fixed: NetServerInfo was not being saved after the exit cleanup.

Author: Mekboss
Author Date: 2020-06-09 10:11:47 UTC

Adopt the 'distance squared' check in Proximity functions.

Author: drfrag
Author Date: 2019-12-06 16:59:36 UTC

Merge branch 'master' into classic_ui

Author: drfrag
Author Date: 2019-08-31 10:44:43 UTC

- Fixed: the menu must be closed to change the UI type.

Author: Christoph Oelckers
Author Date: 2019-03-29 18:09:22 UTC

- removed unused (now always active) gl_trimsprites option from the menu.

# Conflicts:
# src/gl/system/gl_menu.cpp

# Conflicts:
# wadsrc/static/menudef.txt

# Conflicts:
# wadsrc/static/menudef.zz

Author: drfrag666
Author Date: 2019-04-22 14:08:22 UTC

- Missing include on Linux.

Author: drfrag666
Author Date: 2019-02-14 09:14:34 UTC

Revert "Emit a message when trying to use something non-integral as a boolean"

This reverts commit 5a8275b9154e85168d09de625a497bb8e20f17d4.

This patch was not applicable and caused a crash with some mods.

Author: drfrag666
Author Date: 2019-01-09 16:05:56 UTC

- Fixed and simplified 3x2 and 4x4 low detail modes.
- Swapped 3x2 and 4x2 modes.

# Conflicts:
# src/r_draw.cpp
# wadsrc/static/menudef.txt

Author: alexey.lysiuk
Author Date: 2018-08-12 07:55:24 UTC

- creation of dither texture no longer affects active unit

Red checkerboard was rendered upon startup instead of
* the first saved game's thumbnail
* the first game frame

Author: drfrag666
Author Date: 2018-06-19 07:19:59 UTC

- Made new save order CVAR controlled.

Author: drfrag666
Author Date: 2018-06-18 17:04:20 UTC

- Fixed zdoom.rc for MinGW.

Author: drfrag
Author Date: 2018-03-01 20:44:47 UTC

- Fixed compilation with gcc 5.1. (patch by Graf Zahl)

Author: drfrag666
Author Date: 2018-04-04 09:24:28 UTC

- Increased size of the savegame comment area.

Author: drfrag
Author Date: 2017-09-23 23:57:28 UTC

- Fixed capped sky drawers. (patch by dpJudas)

Author: drfrag
Author Date: 2017-06-26 19:55:23 UTC

- Added quad horizontally and double vertically low detail mode but it's hidden this time.

Author: Christoph Oelckers
Author Date: 2017-05-01 20:44:58 UTC

- fixed: FxActionSpecialCall did not resolve float to int casts.

Author: Chris Robinson
Author Date: 2017-04-22 22:04:39 UTC

Fix the default loop end point

Author: Rachael Alexanderson
Author Date: 2017-03-21 12:46:42 UTC

- fixed: moved blur before and outside of menu dimming code.

Author: Magnus Norddahl
Author Date: 2017-04-14 02:14:20 UTC

- Fix packed normal order bug

Author: Christoph Oelckers
Author Date: 2017-03-19 20:36:18 UTC

- fixed: FxAssign used the wrong value type for emitting the store operation.

It used the expression's value type, but needs to use the variable's, which can be different when the assignment is synthesized from a builtin function.

# Conflicts:
# src/scripting/backend/vmbuilder.cpp

Author: Magnus Norddahl
Author Date: 2017-03-16 00:50:53 UTC

- added a Direct3D 11 framebuffer

Author: Magnus Norddahl
Author Date: 2017-03-12 21:53:20 UTC

- Added thread safety to texture loading in the software renderer

Author: Christoph Oelckers
Author Date: 2017-01-11 00:24:16 UTC

This is 2.3.2.

Author: Christoph Oelckers
Author Date: 2017-01-06 14:06:17 UTC

- let the prediction code handle all 4 threaded lists an actor gets linked into.

This is mostly a straight refactoring of the existing code to work independently of specific member variables in the involved classes, using a bit of template magic to avoid redundancy and moving the work code into subfunctions.
It still needs some testing to see if it a) helps fix the crash issues and b) doesn't break anything-

Author: Christoph Oelckers
Author Date: 2016-12-03 19:09:25 UTC

- allow swapping the order of gl_finish and SwapBuffers calls, because some cards do not seem to like the correct order.

Author: Christoph Oelckers
Author Date: 2016-09-18 15:50:14 UTC

- version bump.

Author: Christoph Oelckers
Author Date: 2016-04-24 12:17:06 UTC

- fixed incorrect sky texture check with Transfer_Heights. The actual sector was checked, not the one created by gl_FakeFlat.

Author: alexey.lysiuk
Author Date: 2016-04-10 08:22:00 UTC

Fixed inconsistent merge of p_3dfloors.cpp

Author: Christoph Oelckers
Author Date: 2016-04-04 10:25:36 UTC

Merge branch 'master' into floatcvt

Author: Christoph Oelckers
Author Date: 2016-03-20 01:08:05 UTC

- fixed z-offset handling of A_SkelMissile.

I can't believe I missed this for more than 10 years, considering that A_CustomMissile explicitly implements this case:
It makes a crucial difference whether P_SpawnMissileZ is used or the actual z-position is temporarily changed.
Reverted this function to the position changing method of the original.

Author: Christoph Oelckers
Author Date: 2016-02-23 09:20:43 UTC

- bump version to 2.1.1

Author: Christoph Oelckers
Author Date: 2016-02-16 20:00:34 UTC

- added NextHighestCeiling/NextLowestFloorAt functions. Not tested yet!

Author: Christoph Oelckers
Author Date: 2016-02-14 11:29:59 UTC

Merge branch 'master' into portals

# Conflicts:
# src/actor.h
# src/gl/scene/gl_portal.h
# src/gl/scene/gl_sky.cpp
# src/gl/scene/gl_wall.h
# src/gl/scene/gl_walls.cpp
# src/p_local.h
# src/p_map.cpp
# src/p_spec.cpp
# src/r_data/r_interpolate.cpp
# wadsrc/static/xlat/eternity.txt

(note: this has not been tested. It may not compile!)

Author: Christoph Oelckers
Author Date: 2016-01-12 08:13:55 UTC

- at least get the terms being used right. Of course it's not EDF (which would way beyond the scope of what's intended here) but only Extradata, that's being supported.

(For EDF an external converter would make more sense.)

Conflicts:
 src/p_spec.cpp

Author: Christoph Oelckers
Author Date: 2016-01-01 12:35:49 UTC

- first round of fixes to abandoned commit.

Author: Christoph Oelckers
Author Date: 2015-09-06 06:55:23 UTC

Merge branch 'master' of https://github.com/rheit/zdoom into Branch_g1.8.07

Conflicts:
 dumb/vc6/dumb_static/dumb_static.vcproj
 src/CMakeLists.txt
 src/p_3dfloors.cpp
 src/posix/sdl/hardware.cpp
 src/version.h
 wadsrc/static/compatibility.txt

Author: Christoph Oelckers
Author Date: 2014-09-15 08:27:09 UTC

- fixed: The light uniform buffer may not be mapped with GL_MAP_INVALIDATE_BUFFER_BIT, because it needs to be mapped for each portal in a scene but it must preserve the existing data for the remaining translucent objects.

Author: Christoph Oelckers
Author Date: 2014-08-01 18:59:39 UTC

- use the light buffer to handle dynamic lighting.

Author: Christoph Oelckers
Author Date: 2014-07-15 15:34:54 UTC

Merge branch 'master' into GZDoom_Lite

Author: Christoph Oelckers
Author Date: 2014-06-14 13:20:37 UTC

Merge branch 'Glew_Version_For_Real' into Buffer_For_All

Conflicts:
 src/gl/data/gl_vertexbuffer.h

Author: Christoph Oelckers
Author Date: 2014-05-12 18:23:54 UTC

- enable use of vertex buffer for sprite rendering.

Author: Christoph Oelckers
Author Date: 2014-05-10 12:29:22 UTC

- write parameter index to the buffer.

Author: Randy Heit
Author Date: 2013-06-08 03:24:41 UTC

- Revert r4244. It seems to be working well enough like this, since there have been no complaints.

SVN r4341 (trunk)

Author: Randy Heit
Author Date: 2012-07-27 23:08:44 UTC

Merged in non-floatbobbing changes from trunk.

Merged revision(s) 3731-3734, 3736-3743, 3745-3751, 3754, 3756-3757, 3761-3766, 3774-3781, 3783-3787, 3791 from zdoom/trunk:
- Added support for Eternity Engine's function pointer ACS instructions. (Note that an alternative ACS compiler is necessary to use these instructions properly.)
........
- Fixed: ACS function pointer instructions need to call GetFunction on the tagged module instead of the active behavior.
........
- Fixed: DDrawFB should not recreate all its resources when the palette changes if we were
  the one responsible for the palette change.
- Fixed: DDrawFB::CreateSurfacesComplex() starting tries at 2 instead of 0 is not "debugging cruft"
  since it counts down, not up. (Partially reverts r3195)
........
- Do not set the mouse pointer if the display is 8 bit, since such displays don't support color cursors.
........
- Added Hacx 2.0 detection.
........
- Do do not disable config writing before DoGameSetup() (introduced in r3653) if the config file
  does not already exist. This way, we can create a default config file without removing anything
  from an existing config file if things go wrong early during setup.
........
- Don't use abbreviations in exception descriptions.
........
- This was not supposed to be committed as part of r3737.
........
- Fixed: Editing the player (thing #1) with DeHacked would remove its MF2_PUSHWALL flag.
........
- Fixed: The action function version of ACS_NamedExecuteWithResult only accepted three script parameters.
........
- What I didn't have this saved? ugh
........
- We don't need to keep the FloatBobOffsets[] verison of DoWaggle around.
........
- Fixed: MF6_BUMPSPECIAL only worked when bumped from X/Y movement but not Z movement.
........
- Added UsePlayerStartZ MAPINFO option to cause P_SpawnPlayer() to offset the spawned player's
  Z position by the MapThing's Z, just like for any other MapThing.
- P_SpawnPlayer() now respects a player's SPAWNCEILING and SPAWNFLOAT flags.
........
- Fix some GCC 4.7.1 warnings.
........
- Pass playernum as a parameter to P_SpawnPlayer(). Now P_SpawnMapThing() is the only thing
  that uses the MapThing's type to determine the which player is spawning.
........
- Added MAPINFO flag RandomPlayerStarts. In this mode, no voodoo dolls are spawned. Instead, all
  player starts are added to a pool, and players spawn at a random spot.
........
- The complete FMapThing is overkill for storing player starts, so use a new minimal structure for them.
........
- Added the item flag IF_RESTRICTABSOLUTELY. When this is set, players of the wrong class cannot
  pickup an item at all. (For instance, normally players in Hexen can still pick up other players'
  weapons for ammo. With this flag set, they cannot do that either.)
........
- Fixed: PCD_SCRIPTWAITDIRECT had different semantics than PCD_SCRIPTWAIT.
........
- Added PCD_SCRIPTWAITNAMED p-code.
........
- Enumerate ZDaemon's ACSF_ values.
........
- Added compatibility options for Requiem map04 and Hell Revealed map19.
........
- Fixed type in A_Respawn.
........
- Fixed: Getting remorphed into a chicken should give you a Tome of Power so that you become a
  super chicken. Rawr! The PlayerPawn flag CANSUPERMORPH now enables this.
........
- Fixed: FListMenuItemPlayerDisplay could crash at various points if a class does not have a See state.
........
- Fixed: Toggling the automap could cancel out ending the level, among other things.
........
- Remove Item from StateCallData, since it isn't read anywhere.

........
- Added a 90 degree offset to all voxels, since Build's compass directions start at north
  rather than east.
........
- Fixed: R_ExtendSpriteFrames() would change spr.spriteframes even when it wasn't moving them around.
........
- Fixed: hud_scale is supposed use strictly integral scaling factors.
........
- Fix typo: MF6_SEEINVISIBLE is in flags6, not flags.
........
- Fixed typo: Midtextures with world panning replaced rw_midtexturemid with the rowoffset instead of adding them together.
........
- Fixed: Pain flashes were not inheritable.
........
- Fixed: player_t::settings_controller was not serialized.
........
- snd_midipatchset and fluid_patchset are now processed through NicePath() for variable
  substitution. In addition, on Windows, if they contain no path separator, they will
  automatically have $PROGDIR prepended to them.
........
- Fixed: DSBarInfo::ScreenSizeChanged() must call its supermethod.
........
- Fixed: FStateDefinitions::FinishStates() must ResolveGotoLabels before resolving labelled gotos. Otherwise, something like this fails:
      Goto State1
    State1:
      Goto State2
    State2:
  because when "Goto State1" is processed, State1 is still pointing at the string "State2" rather than State2's state, so the goto will end up pointing at a string (which will soon be
  freed from memory) instead of at an actual state.
........
- Fixed: The label offset has no business being involved in the positioning of the options menu cursor. Also put the cursor towards the bottom of tall small fonts.
........
- Remove LabelOffset from menus entirely and just compute things so that the console font and
  small font, when mixed on the same line, align at their baselines.
........
- Remove LabelOffset from menudef.txt.
........
- Fixed: menu_endgame showed no text during a netgame, nor did it block you from ending a netgame.
........
Merged revision(s) 3771, 3782 from zdoom/trunk:
- Draw 1 pixel of border at the edges of the status bar to prevent imprecision HOMs (only top and bottom for non-widescreen for now).
- The completeborder command is handled at the base statusbar now since it can do so more efficiently.
........
- Fixed: 1 pixel border was drawn when there was no status bar.
........

SVN r3793 (2.6)

Author: Christoph Oelckers
Author Date: 2012-05-12 08:12:39 UTC

- AFADoomer's initial minimap submission.

SVN r3642 (minimap)

Author: Christoph Oelckers
Author Date: 2011-07-15 11:24:53 UTC

- remove savegame compatibility handling code.

SVN r3273 (savegamefix)

Author: Randy Heit
Author Date: 2011-04-10 17:25:44 UTC

- Only allocate as much width as is needed for xplanes, rather than the whole viewwidth.

SVN r3177 (3dfloors3)

Author: Christoph Oelckers
Author Date: 2011-01-29 10:54:06 UTC

- sync 3D floor branch with trunk.

SVN r3123 (3dfloors2)

Author: Randy Heit
Author Date: 2010-12-26 22:04:29 UTC

- Fixed voxel rendering to not get the vertical scale horribly messed up when forcing an aspect
  ratio with vid_aspect/vid_nowidescreen that does not match the dimensions of the resolution.

SVN r3079 (voxel)

Author: Christoph Oelckers
Author Date: 2010-10-07 07:14:53 UTC

- converted more code to doubles, including the camera actors.

SVN r2920 (float)

Author: Christoph Oelckers
Author Date: 2010-10-06 10:22:59 UTC

- fixed: Hexen Deathkings needs its own default MAPINFO to clear the text message off cluster 3 which is its last one.

SVN r2910 (finale)

Author: Christoph Oelckers
Author Date: 2010-09-17 22:38:00 UTC

- undo last commit

SVN r2815 (menu)

Author: Braden Obrzut
Author Date: 2010-09-14 19:32:11 UTC

- Sync 3dfloors branch with trunk.

SVN r2773 (3dfloors)

Author: Christoph Oelckers
Author Date: 2010-08-27 15:05:01 UTC

- variable reordering for 64 bit in subsector_t.

SVN r2608 (automap)

Author: Braden Obrzut
Author Date: 2010-08-18 09:10:06 UTC

[USDF branch]
- Removed limits on the number of item checks that can be made with ifitem and cost blocks.

SVN r2551 (usdf)

Author: Randy Heit
Author Date: 2010-07-31 04:53:49 UTC

- Same as last ZDBSP change: Do not count the segs in a separate pass in CreateNode().
  With this, I can't think of any other simplifications I can make to speed up polyobject
  splitting.

  In my totally unscientific timedemo test, using the nodebuilder to sort polyobjects
  inside their subsectors amounted to just 0.1 ms longer per frame (a difference of 321.3 vs
  334.9 fps). I think that's acceptable. (For comparison, the unsimplified nodebuilder was
  about 0.05 ms slower per frame, or 315.8 vs 334.9 fps. Is that considered a 33% speedup?)

SVN r2479 (polyobjects)

Author: Christoph Oelckers
Author Date: 2009-02-03 18:13:58 UTC

- cleaned up g_level.cpp

SVN r1392 (newmapinfo)

Author: Randy Heit
Author Date: 2008-03-06 18:12:16 UTC

- Fixed: StatusBar and screen need to be barriered, because they are roots
  but can also change at runtime.
- Fixed: Objects that are forcibly deleted outside the GC need to be removed
  from the gray list too.

SVN r786 (gc)