stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-24 11:40:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
14210 commits 173 branches 41 tags 295 MiB
Commit graph

14210 commits

This branch
This branch
All branches
Author SHA1 Message Date
LJ Sonic
41f1b3cfa3 Merge branch 'jimita-why-you-done-this!!!' into 'next' 
Fix mobj unarchiving code

See merge request STJr/SRB2!1384
 2021-01-22 18:26:26 -05:00
Lachlan Wright
ea55a614d1 Merge branch 'flipped-waterrun' into 'next' 
Allow water running in reverse gravity

See merge request STJr/SRB2!1369
 2021-01-19 23:20:57 -05:00
Jaime Ita Passos
f3ad648874 Revert "Move a few mobj spawn defaults to its own function" 
This reverts commit 6f9c48a305.

# Conflicts:
#	src/p_mobj.c
 2021-01-17 23:17:46 +01:00
Shane Ellis
e19b085684 Netcode failsafe. At least until I can figure out the best way to produce bot cmds outside of player sends. 2021-01-15 22:56:48 -05:00
Shane Ellis
b73a15a0bf fixed G_AddPlayer not sending return value 2021-01-15 22:50:15 -05:00
Shane Ellis
0e9b4acb58 Update g_game.c (Account for bot type 3) 2021-01-15 19:29:03 -05:00
Shane Ellis
1583bf126b lua habits 2021-01-15 18:31:09 -05:00
Shane Ellis
505ba1ff63 Update g_game.c 2021-01-15 18:06:36 -05:00
Shane Ellis
225e7c72ac Update p_mobj.c 2021-01-15 18:00:00 -05:00
Shane Ellis
9bbebcbe9e Update d_clisrv.c 2021-01-15 17:55:14 -05:00
Shane Ellis
93562b782e Revert "Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player…" 
This reverts commit 079fe9ba7e
 2021-01-15 22:50:20 +00:00
Shane Ellis
8fa8ca6222 Update r_skins.c 2021-01-15 17:47:26 -05:00
Shane Ellis
4e029dbc67 Update lua_baselib.c 2021-01-15 17:45:41 -05:00
Shane Ellis
00462323c3 Revert "Implementation of lua function P_AddPlayer()" 
This reverts commit 5e8313e157
 2021-01-15 22:42:35 +00:00
Shane Ellis
6103d7a51e Update p_user.c 2021-01-15 17:41:16 -05:00
Shane Ellis
759ff44dfd Revert "Add conditions for new player bot type" 
This reverts commit b995e3cb75
 2021-01-15 22:32:02 +00:00
Shane Ellis
161e1c42cb Update p_enemy.c 2021-01-15 17:29:15 -05:00
Shane Ellis
56e9b99f28 Revert "Add conditions for new player bot type" 
This reverts commit 4b9a95a538
 2021-01-15 22:28:01 +00:00
Shane Ellis
a68fee3303 oops 2021-01-15 17:22:38 -05:00
Shane Ellis
079fe9ba7e Command_Kick() - Allow removal of non-consoleplayer/secondaryviewplayer player instances (e.g. player bots) 2021-01-15 17:08:16 -05:00
Shane Ellis
edc312066d Revert "CL_RemovePlayer() - Allow for removal of non-consoleplayer and…" 
This reverts commit f166af4d8b
 2021-01-15 22:01:51 +00:00
Shane Ellis
f166af4d8b CL_RemovePlayer() - Allow for removal of non-consoleplayer and non-secondaryviewplayer player instances (e.g. bot players) 2021-01-15 17:00:21 -05:00
Shane Ellis
9eeaef2e32 Exception made in R_SkinUsable() for player bot types 2021-01-15 16:55:49 -05:00
Shane Ellis
5e8313e157 Implementation of lua function P_AddPlayer() 2021-01-15 16:50:01 -05:00
Shane Ellis
b995e3cb75 Add conditions for new player bot type 2021-01-15 16:48:19 -05:00
Shane Ellis
4b9a95a538 Add conditions for new player bot type 2021-01-15 16:46:15 -05:00
Shane Ellis
794d927670 Add conditions for new player bot type 2021-01-15 16:44:26 -05:00
SteelT
65f7745775 Merge branch 'credits-229' into 'next' 
Add Logan to the credits

See merge request STJr/SRB2!1379
 2021-01-13 19:08:09 -05:00
Zippy_Zolton
216f227539 12 2021-01-13 12:03:02 -06:00
lachwright
a117ec9859 oops that doesn't work in reverse gravity 2021-01-14 04:34:43 +11:00
lachwright
149535634e Keep Metal's jet fume at a consistent height during dashmode 2021-01-14 04:24:48 +11:00
lachwright
d2be3110bd Have Metal Sonic use spinheight while dashing 2021-01-13 22:28:38 +11:00
Tatsuru
90b0242802 Put his name at the right order 2021-01-11 21:49:31 -03:00
Zippy_Zolton
129ac4633c Increased launch height 2021-01-11 13:25:42 -06:00
Zippy_Zolton
1917155adf PF_THOKKED 2021-01-11 00:19:56 -06:00
Zippy_Zolton
058b681660 P_SetObjectMomz 2021-01-10 22:01:41 -06:00
Zippy_Zolton
8e9073f11f CR_PTERABYTE tweaks 2021-01-10 21:55:25 -06:00
Tatsuru
fbcc0c25b3 Add Logan to the art credits 2021-01-10 23:17:40 -03:00
Zippy_Zolton
8aac7454b8 Make Armageddon Shield instantly kill Egg Guards 2021-01-10 17:20:07 -06:00
Hannu Hanhi
d252f074b7 Render midtextures on two-sided lines with a z-buffer offset 
This will fix z-fighting issues when they overlap with FOFs.
 2021-01-10 21:33:54 +02:00
Hannu Hanhi
eb1e7eff8f Take slopes into account even more in FOF wall cutoff in HWR_ProcessSeg 2021-01-10 20:52:03 +02:00
GoldenTails
59bc197f32 Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT. 2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
679bf5f999 Fix CA_BOUNCE when flipped 
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
 2021-01-08 16:25:10 +01:00
SteelT
52c96239ba Merge branch 'fix-lua-consvars-with-functions' into 'next' 
Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403)

Closes #403

See merge request STJr/SRB2!1346
 2021-01-07 16:33:39 -05:00
SteelT
4041e69fad Merge branch 'pressing-two-keys-in-the-console-crashes-srb2' into 'next' 
Pressing Ctrl+Backspace In An Empty Console Crashes SRB2

See merge request STJr/SRB2!1370
 2021-01-07 16:32:51 -05:00
SteelT
da37d3c168 Merge branch 'fix-ticcmd-received' into 'next' 
Fix TICCMD_RECEIVED being overridden by gamelogic

See merge request STJr/SRB2!1337
 2021-01-07 16:31:45 -05:00
SteelT
d9bdced3df Merge branch 'revert-8a30576d' into 'next' 
Revert plane sorting changes

See merge request STJr/SRB2!1353
 2021-01-07 16:20:30 -05:00
SteelT
cc20f279db Merge branch 'lua-hud-crosshair' into 'next' 
Let Lua toggle the crosshair

See merge request STJr/SRB2!1360
 2021-01-07 15:56:56 -05:00
Steel Titanium
c8627464c9 Check if GME_VERSION is defined. 
I made the assumption it would always be defined, which won't always be the case.
 2021-01-06 19:40:30 -05:00
GoldenTails
70eb3228f8 Pressing A Key Combination In The Console Crashes SRB2 
get stryder7x in on this
 2021-01-05 13:20:02 -06:00