stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-27 22:52:41 +00:00
Code Issues Projects Releases Packages Wiki Activity
13778 commits 173 branches 41 tags 186 MiB
Commit graph

13778 commits

This branch
This branch
All branches
Author SHA1 Message Date
spherallic
cdcef41f17 2.2.11 release candidate 1 2023-04-18 02:56:59 +02:00
spherallic
3135cd37e6 Merge branch 'next' into public_next 2023-04-18 02:05:19 +02:00
spherallic
e4f92cc667 Always important 2023-04-18 02:04:23 +02:00
sphere
57b0dfcfac Merge branch 'nobotcamerareset' into 'next' 
Don't call P_ResetCamera when spawning a bot

Closes #971

See merge request STJr/SRB2!1966
 2023-04-18 00:01:04 +00:00
sphere
2e048ec6b3 Merge branch 'titlecardticker' into 'next' 
Fix titlecard hook being inconsistent on map load

Closes #965

See merge request STJr/SRB2!1965
 2023-04-18 00:01:01 +00:00
spherallic
930b1355ed Don't call P_ResetCamera when spawning a bot 2023-04-14 12:03:21 +02:00
spherallic
c61594931d Fix titlecard hook being inconsistent on map load 2023-04-14 00:28:14 +02:00
spherallic
488f0fdfab bruh 2023-04-12 20:06:02 +02:00
spherallic
9499cb5409 Merge branch 'next' into public_next 2023-04-12 19:51:17 +02:00
sphere
2df3fb53da Merge branch 'strong-lua-command-restrictions' into 'next' 
Fix up Lua command/cvar safety

See merge request STJr/SRB2!1943
 2023-04-12 17:50:01 +00:00
sphere
630c324114 Merge branch 'dedicatedaddonsfolder' into 'public_next' 
Define cv_addons_folder in dedicated

See merge request STJr/SRB2Internal!639
 2023-04-12 17:48:54 +00:00
MascaraSnake
6258f14bab Merge branch 'setcontrol-buffer-overflow' into 'next' 
Fix buffer overflow in setcontrol with 2 arguments

See merge request STJr/SRB2!1954
 2023-04-12 09:20:33 +00:00
MascaraSnake
4f8625ef76 Merge branch 'metal-sonic-use-after-free' into 'next' 
Fix use-after-free when Metal Sonic charges energy balls

See merge request STJr/SRB2!1956
 2023-04-12 09:20:00 +00:00
MascaraSnake
d6375b1e18 Merge branch 'fix-wallspike-segfault' into 'next' 
Fix segfault when destroying wall spike while it moves

See merge request STJr/SRB2!1959
 2023-04-12 09:19:50 +00:00
MascaraSnake
29582e453d Merge branch 'ptera-escape-bad-state' into 'next' 
Fix crash during debug when escaping pterabyte

See merge request STJr/SRB2!1960
 2023-04-12 09:19:40 +00:00
MascaraSnake
efee750874 Merge branch 'mapheader-alloc-fix' into 'next' 
Fix R_SkinUsable crashes in (some) custom addons

Closes #994

See merge request STJr/SRB2!1962
 2023-04-12 08:01:50 +00:00
MascaraSnake
9e8200c1e3 Merge branch 'ambient-sound-fix' into 'next' 
Fix custom ambient sound mobjs not working

See merge request STJr/SRB2!1961
 2023-04-12 08:01:38 +00:00
spherallic
4b6de096e5 Define cv_addons_folder in dedicated 2023-04-12 00:59:08 +02:00
Gustaf Alhäll
cf67ba1d01
fixup! Fix segfault when killing wall spike while it moves 2023-04-11 22:51:18 +02:00
Monster Iestyn
b98af785f5 Merge branch 'fofflags-bruh' into 'next' 
Fix flag mixup in P_GetOldFOFFlags()

Closes #995

See merge request STJr/SRB2!1958
 2023-04-11 19:08:59 +00:00
MascaraSnake
8486bd083a R_SkinUsable: Only check header of current map if one exists 2023-04-11 19:13:30 +02:00
MascaraSnake
846cf71e6a F_StartTitleScreen: Make sure the level header for gamemap always exists 2023-04-11 18:48:23 +02:00
MascaraSnake
1cd5e10ab0 Fix custom ambient sound mobjs not working 2023-04-11 16:19:27 +02:00
Gustaf Alhäll
4c02bde4e9
Fix crash during debug when escaping pterabyte 2023-04-10 18:31:12 +02:00
Gustaf Alhäll
8b77af7378
Fix segfault when killing wall spike while it moves 2023-04-10 14:55:19 +02:00
MascaraSnake
16ad23f06d Fix flag mixup in P_GetOldFOFFlags() 2023-04-10 14:08:53 +02:00
Gustaf Alhäll
8218ce0fe2
Fix use-after-free when Metal Sonic charges energy balls 2023-04-07 14:49:31 +02:00
Gustaf Alhäll
2e3963fd16
Fix buffer overflow for setcontrol with 2 arguments 2023-04-02 21:58:42 +02:00
spherallic
9d6456c326 Merge branch 'next' into public_next 2023-04-02 19:33:16 +02:00
sphere
3c81938496 Merge branch 'io-limit' into 'next' 
Add basic rate limitation for Lua file access

See merge request STJr/SRB2!1947
 2023-03-31 16:13:42 +00:00
sphere
3f499178b0 Merge branch 'forceverticalflipflag' into 'next' 
Add flag to action 433 to force MFE_VERTICALFLIP

See merge request STJr/SRB2!1948
 2023-03-31 16:13:23 +00:00
sphere
e82bb933e7 Merge branch 'botchanges' into 'next' 
Bot adjustments

See merge request STJr/SRB2!1951
 2023-03-31 16:13:05 +00:00
spherallic
1470d099e3 Update copyright year & credits 2023-03-31 14:53:31 +02:00
spherallic
91ef59f76b Fix tiny regression with special stage tally 2023-03-31 13:36:54 +02:00
spherallic
540c5d6cc0 Add flag to action 433 to force MFE_VERTICALFLIP 2023-03-20 15:46:15 +01:00
LJ Sonic
0f9c5582a3 Add basic rate limitation for Lua file access 2023-03-19 14:52:12 +01:00
LJ Sonic
62aef145f5 Fix time functions not starting from zero 2023-03-19 14:44:18 +01:00
James R
07e4497320 Add COM_LUA to a bunch of commands 
These commands be run from Lua:

- add
- addfile
- addfolder
- archivetest
- ban
- banip
- causecfail
- cecho
- cechoduration
- cechoflags
- changeteam
- changeteam2
- charability
- charspeed
- cheats
- clearbans
- clearscores
- connect
- countmobjs
- csay
- demote
- devmode
- displayplayer
- downloads
- drop
- droprate
- dumplua
- echo
- exitgame
- exitlevel
- gametype
- getallemeralds
- getplayernum
- god
- gravflip
- help
- hurtme
- isgamemodified
- jumptoaxis
- kick
- listwad
- login
- manual
- map
- mapmd5
- masterserver_update
- memdump
- memfree
- mod_details
- motd
- noclip
- nodes
- notarget
- numnodes
- numthinkers
- objectplace
- password
- pause
- ping
- playintro
- promote
- quit
- reloadbans
- resendgamestate
- resetcamera
- resetemeralds
- restartaudio
- retry
- rteleport
- runsoc
- savecheckpoint
- say
- sayteam
- sayto
- scale
- screenshot
- serverchangeteam
- setcontinues
- setlives
- setrings
- showbanlist
- showmap
- showscores
- showtime
- skynum
- startmovie
- stopdemo
- stopmovie
- suicide
- teleport
- toggle
- togglemodified
- toggletwod
- tunes
- version
- vid_info
- vid_modelist
- vid_nummodes
- weather
 2023-03-15 17:22:56 -07:00
James R
49f1462f75 Only let Lua run commands registered with COM_LUA 2023-03-15 16:40:21 -07:00
James R
8a6f2e568b Add a flags parameter to COM_AddCommand 2023-03-15 16:40:21 -07:00
James R
0405df1a47 Merge COM_SAFE with other COM flags 
Renames COM_SAFE to COM_LUA.
 2023-03-15 16:40:21 -07:00
James R
ff0f6e9b74 Add CV_ALLOWLUA to a bunch of cvars 
These cvars can be modified by Lua.

- advancemap
- allowexitlevel
- allowjoin
- allowmlook
- allowseenames
- allowteamchange
- autobalance
- basenumlaps
- cam2_adjust
- cam2_centertoggle
- cam2_curdist
- cam2_curheight
- cam2_dist
- cam2_height
- cam2_lockaimassist
- cam2_lockedinput
- cam2_orbit
- cam2_rotate
- cam2_rotspeed
- cam2_shiftfacingchar
- cam2_simpledist
- cam2_simpleheight
- cam2_speed
- cam2_still
- cam2_turnfacingability
- cam2_turnfacingchar
- cam2_turnfacinginput
- cam2_turnfacingspindash
- cam2_turnmultiplier
- cam_adjust
- cam_centertoggle
- cam_curdist
- cam_curheight
- cam_dist
- cam_height
- cam_lockaimassist
- cam_lockedinput
- cam_orbit
- cam_rotate
- cam_rotspeed
- cam_shiftfacingchar
- cam_simpledist
- cam_simpleheight
- cam_speed
- cam_still
- cam_turnfacingability
- cam_turnfacingchar
- cam_turnfacinginput
- cam_turnfacingspindash
- cam_turnmultiplier
- color
- color2
- competitionboxes
- cooplives
- coopstarposts
- countdowntime
- exitmove
- flagtime
- forceskin
- friendlyfire
- gravity
- hidetime
- inttime
- itemfinder
- killingdead
- matchboxes
- maxplayers
- mute
- numlaps
- overtime
- pausepermission
- playersforexit
- pointlimit
- powerstones
- respawndelay
- respawnitem
- respawnitemtime
- restrictskinchange
- ringslinger
- runscripts
- scrambleonchange
- seenames
- servername
- showhud
- showinputjoy
- skin
- skin2
- specialrings
- startinglives
- tailspickup
- teamscramble
- timelimit
- touchtag
- tv_1up
- tv_bombshield
- tv_eggman
- tv_forceshield
- tv_invincibility
- tv_jumpshield
- tv_recycler
- tv_ringshield
- tv_superring
- tv_supersneaker
- tv_teleporter
- tv_watershield
 2023-03-15 16:40:21 -07:00
James R
15e3d0e667 Fix toggle command and add command being able to bypass Lua restriction 2023-03-15 16:40:21 -07:00
James R
5d08bfd706 Rename CV_NOLUA to CV_ALLOWLUA, opt IN to Lua mutability 2023-03-15 16:40:21 -07:00
James R
a39f69c9c7 Reset com_flags at end of COM_BufExecute 
Fixes com_flags being discarded after the first command in
a chain (semicolon list).
 2023-03-15 16:40:21 -07:00
James R
e48786961a exec: pass on com_flags 2023-03-15 16:40:21 -07:00
James R
db4de0f50e sdl/i_video.c: fix compile prior to SDL 2.0.18 2023-03-15 16:39:53 -07:00
Tatsuru
2a50626b00 Initial commit 2023-03-15 17:50:13 -03:00
LJ Sonic
404492cb30 Merge branch 'floorspriteslope-interp-disable' into 'next' 
Disable floor splat slope interpolation

See merge request STJr/SRB2!1934
 2023-03-13 18:28:31 +00:00
LJ Sonic
ac4d89e4d8 Merge branch 'sw-vsync-fix' into 'next' 
Fix software vsync

See merge request STJr/SRB2!1940
 2023-03-13 18:28:28 +00:00