stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-14 23:01:05 +00:00
Code Issues Projects Releases Packages Wiki Activity
6610 commits 175 branches 41 tags 259 MiB
Commit graph

6610 commits

This branch
This branch
All branches
Author SHA1 Message Date
mazmazz
9d212b340b Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
Digiku
25f0dc7eae Merge branch 'version-string-develop' into 'master' 
Add DEVELOP build flag to version string

See merge request STJr/SRB2!401
 2018-12-20 02:28:21 -05:00
mazmazz
7f8d16d3cd Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz
60bcf92525 Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz
969960a1eb Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz
ed7178bca4 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku
722ceb5285 Merge branch 'pk3-stray-blockmap-msg' into 'master' 
Comment out stray PK3 blockmap message

See merge request STJr/SRB2!399
 2018-12-20 01:11:44 -05:00
mazmazz
78501dcd0c Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku
223257e237 Merge branch 'using-offsetof' into 'next' 
Use the `offsetof` function

See merge request STJr/SRB2!394
 2018-12-19 21:53:37 -05:00
Alam Ed Arias
e5e978f8bd Merge branch 'master' into next 2018-12-19 13:20:54 -05:00
Digiku
7982b1695a Merge branch 'ogl-zfighting-fix' into 'master' 
OpenGL z-fighting fix [by Azeonus]

Closes #43

See merge request STJr/SRB2!395
 2018-12-19 13:05:04 -05:00
Digiku
bea76aa4bf Merge branch 'save-override' into 'next' 
Feature: Save override for level header

See merge request STJr/SRB2!392
 2018-12-19 13:04:41 -05:00
Digiku
4c69fe23f6 Merge branch 'kart-luatextures-backport' into 'next' 
Lua: Kart textures backport (non-foolish vers)

See merge request STJr/SRB2!391
 2018-12-19 13:04:24 -05:00
Latapostrophe
387173ea89 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe
a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
mazmazz
96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
67cd6dcdd2 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
TehRealSalt
42a9e66883 Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication. 2018-12-18 15:03:54 -05:00
Alam Arias
ba00752c71
Merge pull request #367 from monster-psychic-cat/the_second_remote_view_camera_fix 
Fix remote viewpoint cameras for real this time
 2018-12-18 15:00:59 -05:00
TehRealSalt
0e34e7f32f G_SetCustomExitVars for setting nextmapoverride & skipstats 
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
 2018-12-18 14:48:04 -05:00
Alam Arias
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 14:11:43 -05:00
Alam Ed Arias
d5c7ca1d23 Merge branch 'master' into next 2018-12-18 14:05:07 -05:00
Alam Arias
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes 
Software plane fixes
 2018-12-18 14:02:21 -05:00
Alam Arias
e0eb64375a
Merge pull request #368 from monster-psychic-cat/automap_fix 
Automap fix
 2018-12-18 14:02:05 -05:00
Alam Arias
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 13:57:48 -05:00
TehRealSalt
03a4bd8f53 Revert default changes 
Digiku said they'd handle the new button defaults so \m/
 2018-12-18 12:55:05 -05:00
Latapostrophe
9f17039e2e Merge branch 'srb2chat' into 'SRB2-CHAT' 
fix my fucking code

See merge request SinnamonLat/SRB2!1
 2018-12-18 11:51:18 -05:00
Latapostrophe
9c9fd2e2f7 Merge branch 'SRB2-CHAT-COMPILE' into 'SRB2-CHAT' 
Compile fixes for buidbots

See merge request SinnamonLat/SRB2!2
 2018-12-18 11:45:01 -05:00
mazmazz
1fcf607b41 Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz
876ddd48f1 Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz
bf21b7c483 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz
7a92c9d3d0 Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz
245a125551 Fix compile errors 2018-12-17 18:55:21 -05:00
Monster Iestyn
bd58ff8c49 Merge branch 'frame-backslash-fix' into 'next' 
Accept '+' as substitute for '\' for sprite frames (PK3)

See merge request STJr/SRB2!380
 2018-12-17 17:34:41 -05:00
MPC
ca4329bcb6 fix the fucking warning 2018-12-17 18:09:29 -03:00
MPC
82601e881b fix my fucking code 2018-12-17 17:57:53 -03:00
Latapostrophe
2fdf27c507 make sure to change p_dispy and not y for /pm list. Also make MPC happy. 2018-12-17 21:39:49 +01:00
Latapostrophe
ff957baae3 Don't overlap ringslinger HUD 2018-12-17 21:31:31 +01:00
Jimita
1d40676f3a
Merge branch 'master' into automap_fix 2018-12-17 17:46:29 -02:00
Jimita
3329c10b60
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 17:46:17 -02:00
Jimita
f3956ffb4c
Merge branch 'master' into sw_planefixes 2018-12-17 17:45:36 -02:00
Latapostrophe
45aba493c7 2.1.21 and all of the kart additions. Woo. 2018-12-17 20:43:59 +01:00
mazmazz
b64dd82034 Attempt to fix cv_execversion being accessible by console 2018-12-17 13:39:24 -05:00
mazmazz
657e7321f6 Decouple execversion from MODVERSION; add scheme for MINORMODVERSION 2018-12-17 13:38:23 -05:00
Jimita
362fb491f7
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-17 15:40:20 -02:00
Monster Iestyn
e9be5e895e Merge branch 'master' into next 2018-12-17 17:34:41 +00:00
mazmazz
b958f00f17 Better rewrite for addons draw adjustment 2018-12-17 10:59:27 -05:00
TehRealSalt
bef3bb23f8 Undo dc92bb49 2018-12-16 21:36:54 -05:00
TehRealSalt
97639848e1 Merge remote-tracking branch 'upstream/next' into kart-luatextures-backport 2018-12-16 21:22:06 -05:00
TehRealSalt
9e596d15af Save override for level header 
Kind of like 2.2's, but with backwards-compatability with 2.1
 2018-12-16 20:09:59 -05:00