James R
e30232e103
Kill last of MF2_TWOD -- toggletwod, line action 432
2022-09-29 03:16:11 -07:00
James R
0444e70413
Rearrange player cheat flags
...
PC_GODMODE -> PF_GODMODE
PC_NOCLIP -> MF_NOCLIP
2022-09-29 02:23:07 -07:00
Sally Coolatta
4165fae63f
Merge branch 'master' into cheats-streamline
2022-09-25 17:29:38 -04:00
toaster
5c36e72115
Merge branch 'master' of https://git.do.srb2.org/KartKrew/Kart into rng-states-2
...
# Conflicts:
# src/p_enemy.c
2022-09-24 20:29:53 +01:00
Sally Coolatta
a60d48202f
Merge branch 'master' into cheats-streamline
2022-09-24 14:32:15 -04:00
Sally Coolatta
117d791424
Merge branch 'master' into cheats-streamline
2022-09-23 14:38:54 -04:00
James R
bcdf41ec64
Remove PF_ATTACKDOWN/PF_ACCELDOWN/PF_BRAKEDOWN, use oldcmd.buttons
2022-09-22 08:49:44 -07:00
Sally Coolatta
a60d4a13a1
RNG classes, take 2
...
Redone version of my old branch
2022-09-19 00:04:57 -04:00
Sally Coolatta
36b8ab1eac
Streamline cheats
...
"cheats" is a proper cvar now. Enabling it allows for cheats to be used any time, even in multiplayer, and disables gamedata saving. Turning it off undoes as many cheat commands as reasonably possible. Based a little bit off of some vanilla work I also did.
Many cheat commands are still SP-only, but can reasonably be allowed in netgames now if a net command is created for them.
2022-06-08 12:46:56 -04:00
toaster
73dabaeab6
Merge branch 'master' into new-menus
...
# Conflicts:
# src/d_clisrv.c
# src/deh_soc.c
# src/lua_baselib.c
# src/m_cheat.c
# src/m_menu.h
# src/y_inter.c
2022-03-29 17:14:38 +01:00
James R
82f4364eb4
pedantic: fix misc leniencies and GNU-isms
2022-02-20 03:28:22 -08:00
James R
a64263c96d
Merge remote-tracking branch 'origin/master' into new-menus
2021-12-03 14:56:48 -08:00
Sally Coolatta
c43f8da5e6
P_SetOrigin & P_MoveOrigin to replace P_TeleportMove
2021-11-29 08:20:27 -05:00
toaster
b4af07ffed
Merge branch 'master' into new-menus
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/v_video.c
# src/y_inter.c
2021-10-18 01:18:37 +01:00
toaster
00972a83d2
remove the prefix since everything seems to function
2021-04-17 11:30:08 +01:00
toaster
b3d006b093
structs gunched
2021-04-17 00:27:13 +01:00
toaster
40cbc30bff
Mammoth commit, sorry.
...
All my work thus far on solving the drawflag/renderflag/additive/subtractive conundrum.
Outstandng problems:
* Bad additive/subtractive tables means that they appear opaque except under certain conditions.
* No support for FOFs, Polyobjects, or linedefs in OpenGL yet.
* All OpenGL support mostly done blind, may or may not function in practice.
If nothing else, the hard engineering problems are solved and it's just bug hammering...
2021-03-31 22:46:23 +01:00
Sally Coolatta
9d7ec0ab8f
Merge SRB2 next
...
Probably doesn't compile yet, but I got rid of all of the conflicts for anyone who wants to take a stab at it.
2021-02-27 05:18:36 -05:00
Sally Coolatta
a14cf1f029
Merge branch 'master' into new-menus
2021-01-10 21:31:09 -05:00
Nev3r
f94d9825b4
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
4f5d6f6197
Merge branch 'write-thingies' into 'next'
...
The lump is not needed for P_WriteThings
See merge request STJr/SRB2!1231
2020-11-08 20:35:51 -05:00
Sally Coolatta
e6a9e5a68e
Merge branch 'master' into new-menus
2020-11-08 02:49:28 -05:00
Sally Coolatta
91ed67bece
Start on Chaos Emeralds
...
Functional! However, you don't drop them yet.
2020-11-01 23:44:54 -05:00
James R
972b0c084e
The lump is not needed for P_WriteThings
2020-11-01 19:31:10 -08:00
Nev3r
df6a903592
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Sally Coolatta
f121ed210a
Fix flashing tics
2020-10-25 09:57:51 -04:00
James R
b812c7a6d6
Whoops
2020-10-24 20:44:42 -07:00
Sally Coolatta
7c2bd0d1c2
Merge remote-tracking branch 'srb2/next' into the-scary-22-merge
2020-10-24 20:50:58 -04:00
Sally Coolatta
ddf466d61f
Fix compile errors
2020-10-24 19:52:09 -04:00
Sally Coolatta
9b6aa946ea
Merge remote-tracking branch 'srb2/master' into the-scary-22-merge
2020-10-24 19:28:06 -04:00
James R
a0150e3ddf
Fix objectplace -silent
2020-10-24 15:29:31 -07:00
James R
b7c4a82a0f
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Sally Coolatta
99a1bacb81
Turning code overhaul
...
Packet drops are still broken, but at least netgames are playable now.
2020-09-22 00:35:44 -04:00
lachwright
89eccd7e87
Set additional UDMF parameters on objectplaced mapthings to defaults
2020-09-07 13:08:22 +09:30
lachwright
c4a4608236
Let analog control schemes control objectplace like standard control schemes
2020-09-06 19:03:17 +09:30
lachwright
e77ebf1234
Objectplace improvements:
...
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
2020-09-06 17:28:34 +09:30
Sally Coolatta
3e446a167c
Restructure how damage works in kart COMPLETELY
...
Instead of doing its best to avoid P_DamageMobj, it embraces it, using the damagetype system to decide how the player takes damage. Overall less stupid.
2020-08-19 00:55:36 -04:00
Sally Coolatta
a251c3909b
Lots of little fixes
...
Gameplay seems to work (besides the addplayer & client config stuff), but visuals (mostly sprites, but a little bit of HUD) are really messed up
2020-08-16 00:29:04 -04:00
Sally Coolatta
5a98c00405
NOW we make it past p_mobj
2020-08-14 22:28:49 -04:00
Sally Coolatta
c665393bd0
actaully I was incorrect, it didn't make it past it. Now it makes it TO it at least :V
2020-08-14 21:21:17 -04:00
Sally Coolatta
2f2e813e52
m_anigif, m_cheat, m_cond, m_fixed
...
Up to m_menu, and it's screaming, so I'm going to take a break :V
2020-08-14 01:31:37 -04:00
Sally Coolatta
6ef0af4ba5
g_game and g_input now compile
2020-08-13 00:05:44 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
135e9b9797
f_finale now compiles
2020-08-11 23:13:25 -04:00
Sally Coolatta
b9436ee015
More fixing up
...
Got tired again, but now it makes it to f_finale
2020-08-11 18:46:00 -04:00
Sally Coolatta
8731c6b7a4
Another round of fixing up
...
- gametyperules are now fitting for kart, not applied to the whole codebase though
- a few more files compile
2020-08-11 16:13:17 -04:00
Sally Coolatta
c96bd5f64a
Many removals
...
Lots of NiGHTS code, lots of ringslinger code, revert actnum behavior back to vanilla
2020-08-10 21:45:51 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
SteelT
7417e95dcb
Merge m_cheat.c
2020-08-02 17:06:27 -04:00
GoldenTails
36e1c30e19
Replace all occurances of BT_USE with BT_SPIN (2.3?)
...
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00