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
ZipperQR
dc0fbbb998
S_StopSoundByID Lua support
2020-05-06 16:22:04 +03: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
Wolfy
d96d86dc5d
Merge remote-tracking branch 'remotes/digiku/public-musicplus-lua' into awful-mix
...
Reimplements removed MusicPlus functions.
# Conflicts:
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_script.h
2020-04-07 03:41:26 -05:00
Wolfy
ffc232f970
Revert the removal of S_MusicExists
2020-04-07 02:56:45 -05:00
Sally Cochenour
b1ec5654bc
Merge branch 'master' into targets
2020-03-22 14:31:17 -04:00
Louis-Antoine
4e7605f0e2
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Louis-Antoine
46df2b9551
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
fickleheart
7bf9bc4b9e
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
fickleheart
83b8c53afa
Are these casts unnecessary...??
2020-03-18 22:40:11 -05:00
Latapostrophe
f98a74638f
More explicit var names for countdown and countdown2
2020-03-11 07:37:33 +01:00
Latapostrophe
1abe899060
Push race countdowns and functions to set them
2020-03-10 12:57:30 +01:00
Monster Iestyn
f186def0bf
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
James R
253ab49c07
Merge remote-tracking branch 'origin/master' into 22shadows
2020-03-05 21:36:58 -08:00
Sally Cochenour
30d391b6b2
FINISH removing the shadows...
2020-03-01 17:35:49 -05:00
Sally Cochenour
76e75d9756
Fix offroad collision
...
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
2020-03-01 14:36:13 -05:00
fickleheart
0427c6d282
Add music position functions to Lua
2020-02-23 17:58:32 -06:00
fickleheart
578d1d4f39
Expose P_PlayJingle/Music() to Lua
2020-02-23 17:19:18 -06:00
fickleheart
d55ef8db71
Make P_PlayLivesJingle player optional in Lua
2020-02-23 15:40:59 -06:00
fickleheart
c23e8d2cbd
Disable NOHUD/INLEVEL checks on Lua sound functions
...
None of these are implicitly sync-safe anyway, and most have
no need to be walled off from HUD code or intermission thinkers.
2020-02-23 12:50:45 -06:00
SwitchKaze
09373133a1
Fix userdataType typo
2020-02-23 12:17:52 -05:00
SwitchKaze
99a1840101
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-23 11:50:13 -05:00
James Hale
51137837c4
Custom skincolors
2020-02-21 21:56:39 -05:00
Steel Titanium
fc042e90f0
Merge branch 'master' into next
2020-02-21 21:01:29 -05:00
James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Steel Titanium
6d8de954e6
Restore this that got shifted.
2020-02-15 17:55:25 -05:00
Steel Titanium
46cd8fa760
New Lua functions: R_GetColorByName and R_GetNameByColor
2020-02-15 17:35:00 -05:00
James R
b77d597965
userdataType can check light userdata too!
2020-02-02 15:08:22 -08:00
Louis-Antoine
f07b432df4
Rename R_IsPointInSubsector to R_PointInSubsectorOrNull/Nil
...
The old name made it really easy to accidentally read
R_IsPointInSubsector as R_PointInSubsector, and anyway it
didn't even make sense...
2020-01-22 16:58:57 +01:00
James R
fc6fcde580
Buold.
2020-01-18 15:56:03 -08:00
Jaime Passos
1a48e6131f
add R_IsPointInSubsector to lua baselib
2020-01-17 00:49:43 -03:00
James R
9999f5d905
Expose G_BuildMapTitle to Lua
2020-01-15 20:04:50 -08:00
James R
77433dd500
Allow G_BuildMapName outside of levels
2020-01-15 19:25:48 -08:00
Jaime Passos
62d79eef2a
Same deal, but for starposts.
2019-12-27 17:14:56 -03:00
Jaime Passos
ff80c4ef4d
Preparing for the inevitable gametype rule that will handle cooplives...
2019-12-27 17:08:20 -03:00
Jaime Passos
070adb4191
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
