Inuyasha
e6f7b8ab26
Merge branch 'version-constants' into 'next'
...
Version constants for Lua
Pretty simple thing. Allows scripters to use VERSION, SUBVERSION, and VERSIONSTRING to check the game's version and potentially futureproof scripts. Have tested and confirmed working on my end.
See merge request !55
2016-03-03 22:33:36 -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
wolfy852
ad0069676a
slope->normal is vector3_t, not vector2_t
2016-03-03 20:47:05 -06:00
STJrInuyasha
990c78686e
Merge pull request #66 from Yukitty/crashfix-Lua-hook_NetVars
...
Crashfix Lua hook_NetVars
2016-03-03 15:33:08 -08:00
Yukita Mayako
b368936b03
Fix bad logic in LUAh_NetArchiveHook rewrite...
...
Argh, I knew I was forgetting something! archFunc is the argument to be passed to the hooks, not tables!
2016-03-03 17:30:46 -05:00
Yukita Mayako
9d6e75ae4f
Cleanup LUAh_NetArchiveHook prototype mess.
2016-03-03 17:30:10 -05:00
Yukita Mayako
0bdc976d50
Shut up compiler warning.
2016-03-03 17:19:35 -05:00
Yukita Mayako
7ae871c7f8
Fix errenous stack pop.
...
This function is intended to leave the stack in the same state it recieved it.
2016-03-03 17:19:21 -05:00
Yukita Mayako
0b704ba618
Updated NetArchiveHook to lua_hooklib.c
...
Fixes I_Assert failure crash due to hooks working differently now.
2016-03-03 17:07:05 -05:00
Monster Iestyn
4f9bb15e4d
"Loading SOC from" console message now also displays the name of the SOC_ lump
2016-03-03 18:31:17 +00:00
Monster Iestyn
b3d842e859
Fix accidental copy+paste of o to d and normal in slope_get code
2016-03-03 14:43:42 +00:00
Inuyasha
61a0d1bcd1
don't use lstring
...
you have space for a null terminator there...
2016-03-03 03:09:35 -08:00
Inuyasha
7349cbdbc0
Backwards compatibility.
...
A test WAD for all possible use cases I can think of
can be found here:
https://dl.dropboxusercontent.com/u/3518218/21/secret/bc_test.wad
2016-03-03 02:54:07 -08:00
wolfy852
b0cbc8ab2a
Lua slope manipulation stuff!
...
Warning: Incomplete. Very prone to crashing and I might not have handled some things properly. Use with caution.
2016-03-02 23:47:06 -06:00
Monster Iestyn
668cc85d7b
P_ClosestPointOnLine can now (optionally) take custom coordinates that you want to make up your line
2016-03-02 20:31:04 +00:00
wolfy852
ab288a7d1a
Allow Lua to read VERSION, SUBVERSION, and VERSIONSTRING constants
2016-03-01 17:48:10 -06:00
Monster Iestyn
eb1c85db48
Merge branch 'slope-fixes' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes
2016-03-01 19:55:48 +00:00
Monster Iestyn
98fd5ca63b
Made some FOF-related seg code account for slopes, as requested by some TODOs
...
The funny thing is you really can't see ANY change here unless you have a sloped FOF intersecting a sector floor/ceiling (and a second FOF on the other side), which has other problems anyway lol
2016-03-01 19:55:13 +00:00
Inuyasha
fc35c8557e
Super color code cleaning, speed 50%, nothing special
2016-02-29 01:18:33 -08:00
Monster Iestyn
ffa9a4e056
Removed the removal of SF_SUPER from skins other than Sonic
...
# Conflicts:
# src/r_things.c
2016-02-29 01:16:17 -08:00
Inuyasha
75270f878c
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-29 00:07:10 -08:00
Inuyasha
372002d2ad
Merge branch 'backport_state-animations' into 'next'
...
BACKPORT: FF_ANIMATE simplistic state animations
this is a lot more complex due to the need to remove the dispoffset related code as well as a lot of the redefinitions; combined with the code changes due to the sprite2 system in internal master.
~~BEFORE ACCEPTING THIS: get sryder to look at and fix any possible brokenness with OpenGL MD2s~~
See merge request !45
2016-02-29 03:04:00 -05:00
Inuyasha
be642b41e2
Merge branch 'backport_special-stage-fade' into 'next'
...
BACKPORT: special stage fade
literally a straight cherry-pick of the old repository, this is a very simple change after all.
See merge request !44
2016-02-29 03:02:30 -05:00
Inuyasha
4bb7143967
Merge branch 'fof-flag-change-hotfix' into 'next'
...
Fof flag change hotfix
This fixes rendering issues caused by changing FOF flags mid-level via Lua or linedef type 445. Everything else that toggles FF_EXISTS already had this fix it turns out.
Not sure if this is safe for master too, could someone check that for me?
See merge request !53
2016-02-29 02:57:47 -05:00
Inuyasha
e2b3adc04f
Randy Heit -> Randi Heit
2016-02-28 18:21:37 -08:00
Monster Iestyn
4b447b3d0d
Don't add polyobjects to a mobj's sector nodes list. This causes the player to teeter whenever they are above the polyobject's bottom, whether or not it is solid
...
Also, a minor tweak for the teetering code itself, though it looks a right mess and probably should be redone in the future
2016-02-28 18:30:29 +00:00
wolfy852
c3166e40b0
Update names in credits
...
Same as the commit in internal, minus toaster's name (by request, of course.)
2016-02-27 14:27:14 -06:00
Monster Iestyn
c7ba1d1532
Make sure target sector's lightlist is reset whenever FOF flags are changed.
...
This fixes how removing certain flags (such as FF_EXISTS) from FOFs can cause HOMs on walls bordering their target sectors. Also fixes how the force-FOF-to-vanish linedef special can leave behind the FOF's shadow
2016-02-26 18:11:12 +00:00
Inuyasha
f5ba192f0b
remove extraneous va() calls
2016-02-25 23:31:48 -08:00
Alam Ed Arias
2ba90082c3
Merge branch 'next' into gl-slopes
2016-02-26 02:14:00 -05:00
Alam Ed Arias
2b12e5ff20
Merge branch 'next' into backport_unslot-music
2016-02-26 02:11:29 -05:00
Alam Ed Arias
07d331676b
Merge branch 'next' into slope-fixes
2016-02-26 02:09:03 -05:00
Alam Ed Arias
77dc27d070
Merge branch 'next' into backport_state-animations
2016-02-26 02:06:57 -05:00
Alam Ed Arias
0a2078d0c0
Merge branch 'next' into playerspawn-hook
2016-02-26 02:05:24 -05:00
Alam Ed Arias
49877262e3
Merge branch 'next' into backport_special-stage-fade
2016-02-26 02:00:38 -05:00
Alam Ed Arias
9d3f7d760b
Merge branch 'next' into portal-fix
2016-02-26 01:58:55 -05:00
Alam Ed Arias
8d2b4102d1
Merge branch 'next' into Lua-video-lib-expansion
2016-02-26 01:58:19 -05:00
Alam Ed Arias
18688f476f
Merge branch 'next' into new-SOC-lump-names
2016-02-26 01:58:07 -05:00
Alam Ed Arias
09d2bbc448
Merge branch 'next' into lua-sector-lines
2016-02-26 01:57:15 -05:00
Alam Ed Arias
6655e92410
Merge branch 'master' into next
2016-02-26 01:56:27 -05:00
Alam Ed Arias
41f8b25c36
travis: add verbose and server-response to wget
2016-02-26 01:48:11 -05:00
Alam Ed Arias
9b55244dc3
travis: use SRB2-v2114-assets.7z
2016-02-26 01:39:08 -05:00
wolfy852
8f0abb267e
Don't mix declarations and code
2016-02-25 22:47:52 -06:00
wolfy852
5c9aaf2fe4
Move hook into G_SpawnPlayer
2016-02-25 22:28:19 -06:00
Alam Ed Arias
cb9542848b
Merge remote-tracking branch 'public/next' into next
2016-02-25 18:42:28 -05:00
Inuyasha
8b7e0347fd
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
...
# Conflicts:
# src/sdl/i_system.c
2016-02-25 15:41:13 -08:00
Alam Ed Arias
b3b5521e1b
Merge branch 'master' into next
2016-02-25 18:33:29 -05:00
Alam Ed Arias
8a369d969b
whitespace clean
2016-02-25 18:31:40 -05:00
Inuyasha
5108bb97f4
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next
2016-02-25 15:16:15 -08:00
Inuyasha
1e15ed2f7b
Merge branch 'i-hate-stupid-speedrun-tricks' into 'next'
...
Fix chain launching
Basically you're not allowed to launch off a chain the frame you touch it anymore.
Coincidentally the changes here allow you to actually use PF_*STASIS in a Lua script now and have it work as you'd expect it to (it lasts for a tic).
See merge request !49
2016-02-25 18:12:39 -05:00
