thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
21306 commits 1 branch 12 tags 205 MiB
Commit graph

171 commits

Author SHA1 Message Date
TehRealSalt
dde29e47c5 Expose R_TextureNumForName 
Backport from SRB2Kart
 2018-12-16 15:58:47 -05:00
TehRealSalt
4507ee18fd Merge remote-tracking branch 'srb2public/next' into merge-next 2018-11-29 08:49:50 -05:00
Monster Iestyn
d824e05a6f Merge branch 'master' into next 2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456 Update source copyrights to 2018 2018-11-25 07:35:38 -05:00
mazmazz
df7d23f00d Merge branch 'master' into musicplus-core 2018-11-13 13:46:30 -05:00
Monster Iestyn
027ad8aca9 adding lua_maplib.c comments for new slope-related userdata types 2018-11-10 15:47:04 +00:00
Monster Iestyn
7989e9a482 Merge branch 'public_next' 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/dehacked.c
#	src/g_game.h
#	src/hardware/hw_draw.c
#	src/hardware/hw_main.c
#	src/lua_baselib.c
#	src/lua_hook.h
#	src/lua_hooklib.c
#	src/lua_hudlib.c
#	src/lua_libs.h
#	src/lua_maplib.c
#	src/lua_script.c
#	src/m_misc.h
#	src/p_mobj.c
#	src/s_sound.c
#	src/sdl12/mixer_sound.c
#	src/w_wad.c
 2018-11-10 15:41:57 +00:00
TehRealSalt
5b6efcba0c Merge remote-tracking branch 'srb2public/next' 2018-11-08 17:37:05 -05:00
Monster Iestyn
7d31440ca6 WHY DID I FORGET THIS 2018-11-08 21:22:45 +00:00
Monster Iestyn
8440664c2f Remove hasslope, per colette's warning about it potentially causing desyncs 2018-11-08 21:13:58 +00:00
TehRealSalt
6017bf8064 Make K_FindJawzTarget and K_GetKartDriftSparkValue HUD safe 2018-11-08 15:11:22 -05:00
TehRealSalt
f027f2038e Make the texture stuff completely integer-based again, but expose R_TextureNumForName 
Decided that being able to set a string and then have it return an integer when retrieving would ultimately be confusing, so let's just let the user handle the string functions.
 2018-11-08 14:58:31 -05:00
TehRealSalt
fa3bb9b317 Textures' string bits are now optional. 
I thought about just exposing R_TextureNumForName and leaving it to the user, since that makes it obvious that this is still an integer field, but I also liked being able to just specify a string and be done with it. I'm not picky either way.
 2018-11-07 22:01:57 -05:00
TehRealSalt
cf61784f5f toptexture, bottomtexture, and midtexture use strings instead of magic numbers 2018-11-07 17:53:49 -05:00
Monster Iestyn
ea009ae304 missed this ESLOPE-needed area from a few commits ago apparently :V 2018-10-21 20:35:14 +01:00
Monster Iestyn
7fb41f4bfa Fix editing slope xydirection with Lua 2018-10-21 18:25:13 +01:00
Monster Iestyn
1c9f6fa5a6 Fix up the ability to edit slope zdelta and zangle with Lua (zangle is untested as of writing) 2018-10-21 17:32:53 +01:00
Monster Iestyn
3895de5ab0 add ESLOPE ifdef checks around all the Lua slope support code that was there before I was involved 2018-10-21 16:27:54 +01:00
Monster Iestyn
2ccf0967c9 zangle should be shifted down by ANGLETOFINESHIFT if we're to use FINETANGENT on it 2018-10-20 23:36:06 +01:00
Monster Iestyn
f7c97ba0bb add vector2 and vector3 userdata types to simplify getting a slope's o/d/normal 2018-10-20 19:00:37 +01:00
Monster Iestyn
7729abe5b9 Merge branch 'next' into lua-slopes 
# Conflicts:
#	src/lua_maplib.c
 2018-10-20 18:31:06 +01:00
toaster
1142fddc71 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain 
# Conflicts:
#	src/d_netcmd.c
#	src/d_netcmd.h
#	src/g_game.c
#	src/p_floor.c
#	src/p_user.c
#	src/r_data.c
#	src/r_data.h
#	src/v_video.c
 2018-10-14 21:52:05 +01:00
mazmazz
32c48af258 MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport 2018-09-18 10:22:17 -04:00
mazmazz
5f5ea5eec6 Merge branch 'musicplus-core' into musicplus-feature-postboss 2018-09-16 23:32:18 -04:00
mazmazz
9c56f953a5 Merge branch 'master' into musicplus-core 2018-09-13 13:24:46 -04:00
mazmazz
73842cec71 Add MUSICPOSTBOSSFADEIN 2018-09-01 13:10:50 -04:00
Digiku
e5a1db2870 Merge branch 'intermission-bonuslivesmax' into 'master' 
Intermission: MaxBonusLives level header option for # of lives in score tally

See merge request STJr/SRB2Internal!162
 2018-08-29 04:25:03 -04:00
mazmazz
e588460fe5 MUSICPOSITION -> MUSICPOS 
* Added muspos level header var to lua

# Conflicts:
#	src/dehacked.c
#	src/lua_maplib.c
#	src/p_setup.c
 2018-08-25 16:23:01 -04:00
mazmazz
6bb5280fbc MUSICPOSITION -> MUSICPOS 
* Added muspos level header var to lua
 2018-08-25 16:21:34 -04:00
mazmazz
26d309992a MUSICPOSTBOSSPOSITION -> MUSICPOSTBOSSPOS 2018-08-25 16:18:09 -04:00
mazmazz
13854fbffb Added MUSICPOSTBOSSTRACK and MUSICPOSTBOSSPOSITION level header/variables 2018-08-25 16:10:46 -04:00
mazmazz
f30cf2b6cc Added MUSICPOSTBOSS level header for boss post-defeat music 2018-08-25 16:02:12 -04:00
Monster Iestyn
3cce0b8a33 Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/i_cdmus.c
#	src/win32ce/win_cd.c
 2018-08-21 15:40:54 +01:00
mazmazz
53303174c1 MaxBonusLives level header option for # of lives in score tally 2018-08-13 14:17:38 -04:00
Monster Iestyn
73ca0b4814 Trim off any extra null bytes off the end of sector floorpic/ceiling when you access them in Lua 2018-08-06 22:37:44 +01:00
TehRealSalt
a1fad489c6 actnum is now a 2 character long string 
For Cloud Cradle Zone, Act K
 2018-06-05 01:34:05 -04:00
TehRealSalt
db1f584c13 MobjScale setting for map headers 
Replacement for Oldbrak mode, lets you set any scale instead of only
1/2, also modified some of Kart's scale shenanigans to be compatible.

Requested by Sev for Dimension Heist
 2017-12-16 15:38:15 -05:00
ZTsukei
a1f2f5b675 New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all. 2017-09-01 13:01:59 -04:00
Monster Iestyn
2ac3f68438 Added in-level checks to a lot of these functions and tables for Lua use 
This makes it less likely for the game to crash when stuff is used outside a level when they shouldn't be
 2017-01-18 22:02:28 +00:00
Alam Ed Arias
94025ae947 Merge branch 'master' into lua-additions 2017-01-13 16:47:57 -05:00
Monster Iestyn
ab423f99c6 Optimising retrieval of sector_floorpic/ceilingpic 
As LJSonic has pointed out, there's no need for a for loop in either case; just use sector->floorpic/ceilingpic as a levelflats index directly

(Besides, if that was to stop any out-of-bounds indexes being used, that's hardly the way to do it anyway)
 2016-12-09 21:18:06 +00:00
Monster Iestyn
d294c9d15c P_NetUnArchiveWorld now uses P_AddLevelFlatRuntime instead of P_AddLevelFlat. 
Also created P_CheckLevelFlat to just return the flat # from a name, since that's all P_NetArchiveWorld really needed from P_AddLevelFlat anyway
 2016-12-08 21:45:25 +00:00
Monster Iestyn
aa146dee41 Disabled all seg_t/node_t-related Lua code for now 
To re-enable support for the above, uncomment the define HAVE_LUA_SEGS line in lua_script.h. Plain bbox userdata stuff is not disabled (though currently it's not used anyway)
 2016-11-24 21:11:44 +00:00
Monster Iestyn
ebb1fd1470 node.children now also takes "right" and "left" as fields, as alternatives to integers 0 and 1 
in other words node.children[0] == node.children.right and node.children[1] == node.children.left
 2016-08-04 19:20:34 +01:00
Monster Iestyn
e3ab77ef21 node.bbox now works with the format node.bbox(child, bboxcoord) 
child can be 0 or 1 (or "right" and "left", alternatively)
bbox coord can be 0,1,2 or 3 (or "top", "bottom", "left" and "right", alternatively)

Also added some support for bbox userdata taking "top" "bottom"  "left" "right" fields. Not that there's any use for non-node bbox userdata just yet...
 2016-08-04 18:54:29 +01:00
Monster Iestyn
4c723d05ac Added node_t and nodes[] to Lua 
Still some issues with node.bbox, but the rest seems to work
 2016-07-08 20:05:54 +01:00
Monster Iestyn
8211e89aec Add seg_t to Lua, may be of use to Nev3r (and possibly others, I guess) 
segs[i] is the segs table, "for seg in segs.iterate" iterates through segs, you know the drill by now I hope
 2016-05-25 17:15:44 +01:00
Inuyasha
f07585191b copyright dates/statements updated and such 
(no actual SLOC changes)
 2016-05-17 17:42:11 -07:00
Wolfy
e769b7882c Merge branch 'lua-sector-lines' into 'next' 
Lua sector lines

Adds support for "sector.lines" in Lua, an array containing all the linedefs in a particular sector variable:

#sector.lines returns the number of lines in the sector.

sector.lines\[ _i_ \] (e.g. sector.lines[0], sector.lines[1], sector.lines[2], etc ....) gives you individual linedefs in the sector. If the number you supply is equal to or greater than #sector.lines, this returns nil.

Test script for your benefit: (see comments)

Type "luatest" in console in any level and you'll get a few print messages that tests these features for sectors[0]

See merge request !32
 2016-03-04 10:23:42 -05:00
Inuyasha
a8bca89dbd Merge branch 'backport_unslot-music' into 'next' 
BACKPORT: removal of music slots

Relevant commits cherry-picked. Basically everything except the internal music track name switches.

See merge request !43
 2016-03-03 22:31:21 -05:00