Update code versions to 2.1.22
Wee, who knew it would be so soon?
Incrementing MODVERSION because of new editing features; that's the correct procedure, yeah? (EDIT: I guess MODVERSION is incremented regardless of anything.)
Edited by mazmazz
Merge request reports
Activity
Filter activity
added 9 commits
- 657e7321 - Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
- b64dd820 - Attempt to fix cv_execversion being accessible by console
- 969960a1 - Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION*…
- 60bcf925 - Adjust execversion retrieval in CV_FilterVarByVersion
- 04916edc - Update EXECVERSION to MODVERSION 27
- 6affe807 - Merge branch '2122-version' into 2122-execversion
- 9be1ee4a - Hardcode define MAJOREXECVERSION to MODVERSION
- f1fea300 - Properly restrict EXECVERSION from cvar updates
- edbf9073 - Merge branch '2122-execversion' into '2122-version'
Toggle commit listadded 112 commits
-
edbf9073...a72d79da - 110 commits from branch
next
- b49cf11f - Merge remote-tracking branch 'public-gl/next' into 2122-version
- e3d106d5 - Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
-
edbf9073...a72d79da - 110 commits from branch
added 6 commits
- 6f8b1265 - Add G_FilterKeyByVersion() to setcontrol
- e20c70d5 - Skip setting control if keynum is -1 (for KEY_PAUSE) handling
- dd4c7b53 - Fix joy button default override when filling keynum2 with default
- 3277cf69 - Add JOY10 default to gc_centerview
- 8f596376 - Merge branch '2122-version' into execversion-filtercontrols
- e23e0c9e - Merge branch 'execversion-filtercontrols' into '2122-version'
Toggle commit listadded 61 commits
-
e23e0c9e...2d675750 - 16 commits from branch
next
- ac7c249f - SRB2chat test rework
- ad187c26 - Repositionning chat & bugfixes
- 03dc4c96 - Fixed sub 400p chat for console
- 8747a852 - Changed chat position,
- b09019dc - Fix old chat detection.
- 40b4d636 - Fix capslock being wonky.
- 25e6d538 - merge conflict
- 45aba493 - 2.1.21 and all of the kart additions. Woo.
- ff957baa - Don't overlap ringslinger HUD
- 2fdf27c5 - make sure to change p_dispy and not y for /pm list. Also make MPC happy.
- 82601e88 - fix my fucking code
- ca4329bc - fix the fucking warning
- 245a1255 - Fix compile errors
- 7a92c9d3 - Mixed D&C fixes; replace a couple int's with INT32
- bf21b7c4 - Mixed D&C fixes for HU_DrawTeamTabRankings
- 876ddd48 - Change int to INT32
- 1fcf607b - Fix strncpy nodenum length overflow
- 9c9fd2e2 - Merge branch 'SRB2-CHAT-COMPILE' into 'SRB2-CHAT'
- 9f17039e - Merge branch 'srb2chat' into 'SRB2-CHAT'
- a31b85e1 - Some messages relevant to discussions now go in the chat.
- 387173ea - Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
- 06ff171e - Adjust vid.width floating point comparson for CHAT
- d6c99a01 - Merge branch 'SRB2-CHAT-FLOAT-FIX' into 'SRB2-CHAT'
- e42bcd5b - Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat
- 10521d16 - Fix various bugs with the chat.
- b1ccfa1f - Merge branch 'latsrb2chat' into 'SRB2-CHAT'
- 619dd9d0 - Fixed various issues: added some free()s, lua_optboolean, other things, and also…
- c7060aa5 - Remove mute boolean from playermsg hook, fix username stuff still being there,…
- 5badc111 - Fix integer overflow on for loop decrements
- 0f0e3092 - One more free(nodenum)
- fb3722a6 - Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN
- a66a2021 - Draw up and down arrows by string
- 7e9411f3 - Minor code cleanup, CHAT
- e0176670 - Correct splitscreen check in OLDCHAT
- 64007290 - Extend HU_FONTSTART to STCFN022 (from 2.2)
- 56320a35 - Use TinyFont for chat arrows
- a9fb17da - Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)"
- 6ebc41a5 - Check target < MAXPLAYERS before PM
- 3703a032 - Buildbot fixes
- 1b61e15b - Merge branch 'master' into SRB2-CHAT
- 809bb8a9 - Merge branch 'SRB2-CHAT' into 'SRB2-CHAT'
- 11f44f7c - Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT
- db8e1c03 - Fix the chat being displayed in singleplayer if there are stillmessages
- b7d7472a - Merge branch 'next' into SRB2-CHAT
- 7a64e3d1 - Merge branch 'SRB2-CHAT' into '2122-version'
Toggle commit list-
e23e0c9e...2d675750 - 16 commits from branch
added 7 commits
-
7a64e3d1...140152c2 - 5 commits from branch
next
- 2b8cdc03 - Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'""
- fa36b8f5 - Merge branch 'menu-mpjoy-fix' into '2122-version'
-
7a64e3d1...140152c2 - 5 commits from branch
added 14 commits
- b32f5064 - Merge branch 'addons_menu' into 'master'
- 0a3b3736 - Handle Kart-specific changes; add PK3 to exttable
- 37950341 - Merge remote-tracking branch 'public-gitlab/next' into addons-backport
- f0967520 - Compile fixes; enable PK3 support in addons menu
- c3ff0b6d - Uncomment Secrets menu toggle when exiting Addons
- 6d94568f - Hide kart-specific addons behavior behind USE_KART
- 046d36a6 - Remove Kart entries from NMUSlist
- 899120e4 - Revert NMUSlist to original 2.1
- 296b678d - Wstrict-overflow adjustment
- 2d2bd590 - Remove FIXUPO0 GCC pragma
- 6dbe9309 - Use labs for long value
- b958f00f - Better rewrite for addons draw adjustment
- ec530323 - Fix mainwads check in d_main
- 8d56c2f4 - Merge branch 'addons-backport' into '2122-version'
Toggle commit listadded 7 commits
- 94858aed - Extend HU_FONTSTART to STCFN022 (from 2.2)
- 8723eb9a - Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update
- 33434395 - Add SRB2 Community Contributors to Special Thanks
- 31cfa255 - Merge branch '2122-version' into 2122-patch-dta-update
- 7fb73cf2 - New patch.dta hash for 2.1.22
- f600c5fe - Credits update
- d72e3fe7 - Merge branch '2122-patch-dta-update' into '2122-version'
Toggle commit listadded 6 commits
- 71da6836 - Reset default controls for LOADCONFIG command
- f55623ef - Clear all control keys before loading defaults in LoadConfig
- 402860dc - Merge branch 'loadconfig-defaultcontrols' into 'master'
- c0a0c5ac - Merge remote-tracking branch 'public-gl/next' into 2122-version
- 83a6f5d6 - Merge remote-tracking branch 'public-gl/master' into 2122-version
- cb01ebeb - Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
Toggle commit listadded 18 commits
-
306ffe48...f06fd414 - 8 commits from branch
next
- 66e13cf1 - SDL:Auto grab input
- 40a037f6 - A more through out attempt to lock the mouse
- 46d1a866 - Another attempt to lock the mouse
- ed410575 - Only SetWindowGrab if !disable_mouse; toggle cursor visibility
- 8044e2a7 - Merge branch 'sdl-autograb-revise' into 'sdl-autograb'
- cb13ace7 - Merge branch 'master' into sdl-autograb
- 4656a0d0 - Merge branch 'sdl-autograb' into 'master'
- c2dc5788 - Merge remote-tracking branch 'public-gl/next' into 2122-version
- 7fc79f0b - Merge remote-tracking branch 'public-gl/master' into 2122-version
- 776ba8cc - Fix gcc 8 compile by using strcpy instead of memcpy for PM
Toggle commit list-
306ffe48...f06fd414 - 8 commits from branch
added 1 commit
- 32697ddf - Fix gcc 8 compile by using strcpy instead of memcpy for PM
added 17 commits
-
32697ddf...1d474626 - 6 commits from branch
next
- 58728ec3 - Fix float comparison for colormap maskamt
- e9e51287 - Use DBL_EPSILON for colormap comparison
- c65f44e8 - Remove log message
- 10a3e3fe - Define EPSILONs only if not already defined
- cb42702e - Merge branch 'float-compare-colormap-fix' into 'master'
- bfc501a2 - Revert default console backcolor to green; changed from CHAT commit
- b7edc7f8 - Revert "Merge branch 'side-discolor-fix' into 'master'"
- 0b81debf - Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
- a5b3f039 - Merge branch 'undo-old-side-discolor-fix' into 'master'
- a6266605 - Merge remote-tracking branch 'public-gl/next' into 2122-version
- 842bcfc8 - Merge remote-tracking branch 'public-gl/master' into 2122-version
Toggle commit list-
32697ddf...1d474626 - 6 commits from branch
Everything's a go. My main two concerns for testing were:
- Is CHAT stable? Yes.
- PM works, copy-paste works, and sayteam works.
- Did the Addons Menu cause any regressions for wadfile downloading for joiners? No.
- There's this bug since <=2.1.20 that if the wadfile list was close to the max, the joiner may stall in one of the last few downloads if they have to download all the wadfiles. This bug hasn't changed in this version. I don't consider this a regression.
I verified that all merges are here since
21-version
.Buildbot approved: https://travis-ci.org/mazmazz/SRB2/builds/472023957
Edited by mazmazz- Is CHAT stable? Yes.
mentioned in commit 26f956ac
Please register or sign in to reply