James R
|
29b6bd5df9
|
Merge branch 'fix-mobj-slidemove' into 'next'
Make sliding against objects actually work (Fixes #400)
Closes #400
See merge request STJr/SRB2!1348
|
2021-01-26 20:43:17 -05:00 |
|
LJ Sonic
|
36c193f317
|
Merge branch 'fix-boss2pogotarget' into 'next'
Make several actions actually check for a player smh (Fixes #387)
Closes #387
See merge request STJr/SRB2!1340
|
2021-01-25 18:11:38 -05:00 |
|
LJ Sonic
|
83947d4428
|
Merge branch 'redundant-hypot' into 'next'
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
|
2021-01-25 18:08:25 -05:00 |
|
LJ Sonic
|
2d3e302929
|
Merge branch 'mode0-centering' into 'next'
Fix video mode 0 not getting centered
See merge request STJr/SRB2!1344
|
2021-01-25 17:59:26 -05:00 |
|
LJ Sonic
|
14ee92ef67
|
Merge branch 'gl-levelflat-fix' into 'next'
Fix a misuse of levelflat_t.picture in OpenGL
See merge request STJr/SRB2!1327
|
2021-01-25 16:40:02 -05:00 |
|
Shane Ellis
|
ca00e2d508
|
correction to nights bot clause
|
2021-01-24 12:46:03 -05:00 |
|
Shane Ellis
|
ea6879b5c2
|
missed a couple spots
|
2021-01-24 12:43:13 -05:00 |
|
CobaltBW
|
a2fce68f14
|
Specialized Lua function for bot removal
|
2021-01-23 17:01:48 -08:00 |
|
CobaltBW
|
93ec472c78
|
Expose BOT_ to lua
|
2021-01-23 14:49:20 -08:00 |
|
CobaltBW
|
0a60fe0b1d
|
Almost forgot: player.blocked
|
2021-01-23 14:05:36 -08:00 |
|
CobaltBW
|
b112e12c93
|
Merge remote-tracking branch 'origin/next' into addplayer
|
2021-01-23 13:33:19 -08:00 |
|
Shane Ellis
|
135032c293
|
Correction to implicit declaration of B_UpdateBotleader()
|
2021-01-23 10:58:34 -05:00 |
|
Shane Ellis
|
1274b4651e
|
Added botstuffs to savestate
|
2021-01-23 10:39:59 -05:00 |
|
Shane Ellis
|
25bf4b54e2
|
Restructured botticcmds into G_Ticker
|
2021-01-23 10:36:44 -05:00 |
|
Shane Ellis
|
4e47f240ad
|
Add new botstuffs
|
2021-01-23 10:30:07 -05:00 |
|
Shane Ellis
|
b8fea55f67
|
Update b_bot.c
|
2021-01-23 10:25:35 -05:00 |
|
Shane Ellis
|
fd536e91a3
|
void B_UpdateBotleader(player_t *player);
|
2021-01-23 10:17:05 -05:00 |
|
Shane Ellis
|
2016caa70b
|
Update references to player->bot
|
2021-01-23 10:16:27 -05:00 |
|
Shane Ellis
|
2e528216ac
|
Updated references to player->bot
|
2021-01-23 10:15:33 -05:00 |
|
Shane Ellis
|
2abf89e800
|
Update G_AddPlayer()
|
2021-01-23 10:13:16 -05:00 |
|
Shane Ellis
|
c391d76c11
|
buttons_last -> lastbuttons
|
2021-01-23 10:06:47 -05:00 |
|
Shane Ellis
|
ce8e389a2d
|
Add lua player.botleader and player.buttons_last (read+write)
|
2021-01-23 09:49:57 -05:00 |
|
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 |
|