Sally Coolatta
5a6263c36b
Make it past p_mobj
2020-08-14 20:48:06 -04:00
Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -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
SteelT
84a4c7ba62
Fix some more ifdefs
2020-08-10 18:57:58 -04:00
Sally Coolatta
ecec1e8a8f
OK the compiler still didn't like it, so just properly remove it entirely.
2020-08-10 17:22:55 -04:00
SteelT
f2967d30d3
Merge lua_baselib.c
2020-08-10 12:34:38 -04:00
Sally Coolatta
e296e1309a
YAY, round 2
2020-08-09 21:02:56 -04:00
Sally Coolatta
9b778d6ce6
Merge lua_baselib.c
2020-08-05 14:00:35 -04:00
Nev3r
3d90a6aebe
Merge branch 'udmf-next' into 'next'
...
Merge udmf-next into next
See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
Sally Coolatta
3d53adaa2b
Sliding HUD
...
- Split HUD stuff into k_hud.c/h
- V_SPLITSCREEN replaces the old function that sets V_SPLITSCREEN/V_HORZSCREEN flags system, and instead automatically moves it based on player number
- V_SLIDEIN makes HUD items slide in after the intro animation.
2020-07-26 05:47:53 -04:00
James R
2613a29396
Merge remote-tracking branch 'origin/next' into g_findmap-lua
2020-07-24 02:14:03 -07:00
lachwright
c9d8fcc1cb
Fix default NiGHTS skin brightness for non-super characters
2020-07-20 22:24:16 +08:00
James R
f8b659e4bd
Merge branch 'various-color-fixes' into 'next'
...
Various color fixes
See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
GoldenTails
80b42ba46e
Expose P_MovePlayer to Lua.
2020-07-12 18:02:50 -05:00
GoldenTails
a913a8a652
Expose P_PlayerZMovement to Lua.
...
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
GoldenTails
6124e010b2
Expose P_SceneryZMovement to Lua.
...
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
GoldenTails
93edc25cae
Expose P_RingZMovement to Lua.
...
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
GoldenTails
d0f9d79170
Expose P_ZMovement to Lua.
...
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
1fb799203c
Expose P_SceneryXYMovement to Lua.
...
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
0bbd08f980
Expose P_RingXYMovement to Lua.
...
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
GoldenTails
12bae0cb24
Expose P_XYMovement to Lua.
...
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
2020-07-12 18:02:49 -05:00
kaysrishaq
be8f10d039
various color fixes
2020-07-12 07:39:52 -04:00
GoldenTails
e63c296e01
Expose P_RailThinker to Lua.
2020-07-12 00:36:22 -05:00
Nev3r
6b38fe4b2c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02:00
lachwright
10b09f49c3
Add sightcheck boolean to P_RadiusAttack
...
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
lachwright
0a3b728e81
Knuckles changes:
...
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
Nev3r
e301d268ec
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
James R
34eeb98cc4
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
MascaraSnake
3ce62d7780
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sal
f0ed1a58ce
Merge branch 'demoman-tf2' into 'master'
...
Additional local explosion effects.
See merge request KartKrew/Kart!263
2020-05-23 21:29:38 -04:00
SwitchKaze
58cac1fd73
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
SwitchKaze
afe56667b8
Update to 2.2.4
2020-05-22 16:47:51 -05:00
James R
0e25e9a074
Merge branch 'more-lua-map-names' into 'next'
...
G_BuildMapTitle for Lua, G_BuildMapName outside of levels
See merge request STJr/SRB2!694
2020-05-19 23:13:35 -04:00
Louis-Antoine
4c37c18385
Fix P_GetZAt for Lua
2020-05-18 16:16:45 +02:00
Louis-Antoine
74fa35221d
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
6af2871fa5
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
Monster Iestyn
6531fc6e85
lib_sStopSoundByID: fixed mixed declaration and code compiler warning
2020-05-16 16:14:47 +01:00
Latapostrophe
fc789790bb
Create a quick P_StartQuake without epicenter/radius support and clean up the grand total of 4 earthquake uses in the code
2020-05-14 17:28:33 +02:00
Sally Coolatta
249fff87ad
Merge branch 'new-cars-movie' into colorize-tweak
2020-05-12 22:46:46 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
Sally Coolatta
b4f5d931cc
Skincolor code cleanup
...
Split everything off into its own file and turn SETBRIGHTNESS from a define into a function (K_ColorRelativeLuminance).
2020-05-11 02:28:25 -04:00
Jaime Passos
a4d6addbca
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
ZipperQR
dc0fbbb998
S_StopSoundByID Lua support
2020-05-06 16:22:04 +03:00
Nev3r
1dae8df2f5
Merge branch 'udmf-next' into udmf-thingargs
2020-04-12 10:02:12 +02:00
Nev3r
860c44d953
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Nev3r
dec80cb2a7
Add mapthing arg support.
2020-04-11 12:54:34 +02:00
James R
7ff3e7f18b
Merge branch 'lightmemedata' into 'next'
...
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
2020-04-09 19:48:39 -04:00
Wolfy
1d1b1514b4
Remove stupid dumbfuck #ifdefs
...
WHY THE FUCK DID THESE BREAK IT AAAAAAAAAAAAAAAAAAA
2020-04-07 05:24:38 -05:00
Wolfy
8fabcc1228
Fix unterminated #ifdef
2020-04-07 04:25:11 -05:00