Skip to content
Snippets Groups Projects

Slopes and stuff

Merged colette requested to merge angles into next

Adds support for slopes, slopes on FOFs, slopes on translucent FOFs, slopes on FOFs with holes in the flat, slope physics, dynamic slopes, vertex slopes, dynamic vertex slopes, and a ham sandwich to the game. Only for software mode right now, though. (OGL still gets the physics and the sandwich.) Some things still need to be done, but for now this can be merged in to be finished later.

Please make sure nothing in the vanilla game breaks before giving the thumbs up for this merge.

Since this doesn't merge automatically, if the code review turns out positive and nobody else has done it, I'll handle the merging.

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • colette Added 1 new commit:

    Added 1 new commit:

  • Alam Ed Arias Added 2 new commits:

    Added 2 new commits:

    • f3d40c34 - git warning: trailing whitespace
    • c64e4d58 - git warning: new blank line at EOF
  • Alam Ed Arias Added 1 new commit:

    Added 1 new commit:

    • 96c71c68 - remove NEED_FIXED_VECTOR and fix angelchk testcase
  • Yukita Mayako Added 43 new commits:

    Added 43 new commits:

    • fa935be1 - Fixed the issue where diagonal springs couldn't teleport you to their centers an…
    • 8f8fbf0c - Merge branch 'spring-fixes' into 'next'
    • 45515df7 - Make sure "word" in readlevelheader gets reset
    • 9422ca44 - Merge pull request #44 (closed) from STJrInuyasha/patch-1
    • c6ade27b - Fixes to CTF flag respawning, particularly reverse gravity and z-positioning.
    • b88600da - tmfloorthing and tmhitthing are set to NULL at the start of P_MobjThinker, preve…
    • f7747f43 - Merge branch 'misc-fixes-tomerge' into 'next'
    • 3bc56a91 - Hotfix for platform movement being dropped on players.
    • 213a0caa - Hotfix amendment
    • a1c67e7e - Add MFE_APPLYPMOMZ to fix camera movement.
    • c16516ef - Partial revert.
    • 9a9025b1 - Remove pmomz from players who are on ground.
    • fc649ce1 - Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz
    • 36cf4c1b - Fix comma error.
    • a03fc205 - Merge branch 'hotfix-pltz' into 'next'
    • f0054be9 - whitespace fixup
    • ddd66b9e - Make A_SetObjectFlags only reset sector/bmap links if needed
    • b2e330d6 - Merge branch 'idk-what-to-call-this-branch' into 'next'
    • c139e93f - Applied new finesine table.
    • 904c3c22 - Merge branch 'trigonometry-fix' into 'next'
    • 4016d15f - Adjusted platform-creating velocity of goo water.
    • 4f06650a - Removed the small velocity boost you get for surfacing from goo.
    • c4ac9643 - Merge branch 'goop-dampen' into 'next'
    • 48d75912 - Have super sparks scale with the player
    • c4235471 - Merge branch 'super-sparks-scaling' into next
    • 1e62be15 - ALL7EMERALDS is a boolean you idiot, not an integer.
    • 9d36cf37 - Removed EvalMath from base Lua.
    • ef0e61fc - Change LUA_NUMBER to fixed_t, change angle_t handling in Lua.
    • dfa8ac7c - Added sidedef texture and offset manipulation to Lua.
    • 6ee50e80 - Wrapped Lua MapLoad hook in P_MapStart / P_MapEnd.
    • c91cd386 - Revert "Wrapped Lua MapLoad hook in P_MapStart / P_MapEnd."
    • f783df71 - Reset tmthing after P_CheckSector calls from Lua
    • ecdf3412 - Rewrote the entirety of lua_hooklib.c
    • 120c9c5a - Change int32_t to __int32 on MSC.
    • 6ac50138 - Only push userdata to the stack when needed!!
    • 06b82d17 - lua_pushfstring only allows %d not %x
    • 0af32ee2 - Move garbage collection out of Lua hooks.
    • ac5c8f10 - Merge remote-tracking branch 'public/lua-32bit-changes' into next
    • 61388459 - Removed all "-1"s from R_PointToAngle and R_PointToAngle2, in order to allow ALL…
    • 79ecbc40 - Merge branch 'pointtoangle-fix' into 'next'
    • f8b43976 - Fixed Tag and H&S getting each other's suicide behaviors by mistake.
    • 14bb811d - Merge branch 'fixing-two-gametypes-noone-cares-about' into 'next'
    • 2fb03a7c - Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles
  • colette Added 1 new commit:

    Added 1 new commit:

    • 9155fd6c - Fix unexpected behavior with colormaps in sloped sectors
  • So, any questions about this merge?

  • Author Contributor

    There is STJr/SRB2Internal#15 to worry about, but I think that only happens with sloped sectors in certain configurations so it doesn't necessarily have to hold back a merge? I would like the branch left up after merging so I(/possibly others) can continue working on the last few fixed/features desired without needing to set up the branch again.

  • Alam Ed Arias Status changed to merged

    Status changed to merged

  • Alam Ed Arias mentioned in commit 3917b021

    mentioned in commit 3917b021

Please register or sign in to reply
Loading