stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-26 12:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
4537 commits 173 branches 41 tags 295 MiB
Commit graph

4537 commits

This branch
This branch
All branches
Author SHA1 Message Date
Inuyasha
83e9eb6df4 patch.dta officially in use. Version number updated. 2016-03-09 18:30:11 -08:00
Alam Arias
771c1ecb8a Merge pull request #68 from Yukitty/revert-Lua-angles 
Revert "Change angle_t handling in Lua."
 2016-03-09 11:58:51 -05:00
Monster Iestyn
b7d9d96451 Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git 2016-03-09 14:30:26 +00:00
Inuyasha
3c2fe056ed Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 
And by "merge" I mean "just don't do anything"
 2016-03-09 06:28:45 -08:00
Inuyasha
a7cb049b65 leave a dummy string in dehacked, nothing more. 
a courtesy fuck you to gitlab for making me have to keep
the previous screwed up bullshit in this branch.
 2016-03-09 06:23:57 -08:00
Inuyasha
f40cfb0271 Revert "MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh" 
This reverts commit 4625118ee8.
 2016-03-09 06:22:40 -08:00
Monster Iestyn
4625118ee8 MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh 2016-03-09 14:03:20 +00:00
Monster Iestyn
bf415b8618 Revert "Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo" 
This reverts commit 280e932f02.
 2016-03-09 13:59:10 +00:00
Monster Iestyn
280e932f02 Shifted down the last few mobj eflags to close gap left by MF2_PUSHED -> MFE_PUSHED undo 2016-03-09 13:38:30 +00:00
JTE
54f95eb387 Revert "Change angle_t handling in Lua." 
This partially reverts commit ef0e61fc33.
 2016-03-09 08:38:10 -05:00
Monster Iestyn
6a4bbfb25d Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git 2016-03-09 13:21:49 +00:00
Inuyasha
1ee01063e3 All SRB1 objects, states, and sprites removed. 2016-03-09 02:54:09 -08:00
Inuyasha
b61959051e Revert "Revert "MF2_PUSHED is now MFE_PUSHED..."" 
This reverts commit 694220155e.
 2016-03-09 01:30:52 -08:00
Inuyasha
62b2e5c17e Revert "Readded EvalMath to Lua." 
This partially reverts commit cfcd7ce0d3.
 2016-03-09 01:29:58 -08:00
Inuyasha
b229cac57a Revert "Revert "No more stupidity for No More Enemies special plz"" 
This reverts commit 7ae87cc2c6.
 2016-03-09 01:24:13 -08:00
Inuyasha
317161221d Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-03-09 01:23:48 -08:00
Inuyasha
5a38088623 Well, we don't need "experimental" slopes anymore either 
Not when we have properly working ones!
 2016-03-09 01:09:21 -08:00
Inuyasha
6aa708b5af I don't think we need the BLUE_SPHERES define anymore... 2016-03-09 00:49:35 -08:00
Inuyasha
436bcdf19a Objectplace handles slopes. 
Sorry MI, I'm hijacking your branch for a bit.
 2016-03-08 23:43:43 -08:00
Inuyasha
7ae87cc2c6 Revert "No more stupidity for No More Enemies special plz" 
This reverts commit 474ad01b46.
 2016-03-08 22:22:30 -08:00
Inuyasha
cfcd7ce0d3 Readded EvalMath to Lua. 
There is a caveat to this: The first time EvalMath is used, a
deprecated function warning will be shown to the user that tells
them to use _G[] instead.

This reverts commit 9d36cf37bd.
 2016-03-08 22:15:26 -08:00
Inuyasha
694220155e Revert "MF2_PUSHED is now MFE_PUSHED, for the simple reason that it makes more sense as an eflags object flag than a flags2 object flag!" 
This reverts commit c8c7878005.

# Conflicts:
#	src/dehacked.c
#	src/p_mobj.c
#	src/p_mobj.h
 2016-03-08 21:30:12 -08:00
Alam Ed Arias
7cf5dd0c3c Merge branch 'next' into skybox-hotfix 2016-03-07 16:47:10 -05:00
Alam Ed Arias
407bf4f39d Merge branch 'next' into polyobj-teeter-fix 2016-03-07 16:46:32 -05:00
Alam Ed Arias
55a6355e15 Merge branch 'next' into slope-fixes 2016-03-07 16:45:51 -05:00
Alam Ed Arias
b173c3e31e Merge branch 'next' into portal-fix 2016-03-07 16:44:59 -05:00
Alam Ed Arias
6b0c73f2ec Merge branch 'master' into changeangle-hotfix 2016-03-07 16:25:13 -05:00
Alam Ed Arias
178d904bb9 Merge branch 'master' into portal-fix 2016-03-07 16:22:41 -05:00
Alam Ed Arias
c4b0c6ec56 Merge branch 'master' into gl-slopes 2016-03-07 16:22:10 -05:00
Alam Ed Arias
3ab3de20d7 Merge branch 'master' into polyobj-teeter-fix 2016-03-07 16:21:32 -05:00
Alam Ed Arias
bc81ad8dcd Merge branch 'master' into closestpointonline 2016-03-07 16:20:53 -05:00
Alam Ed Arias
ae3b7e0623 Merge branch 'master' into next 2016-03-07 16:18:08 -05:00
Alam Ed Arias
e21776a511 Merge branch 'master' into skybox-hotfix 2016-03-07 16:18:00 -05:00
Alam Ed Arias
fbbc028ff2 Merge branch 'master' into cmake-fix 2016-03-07 16:17:38 -05:00
Alam Ed Arias
6ab6cc959c Merge branch 'master' into slope-fixes 2016-03-07 16:16:40 -05:00
Monster Iestyn
eab51414f3 Fix typo in A_ChangeAngleAbsolute 2016-03-07 21:16:02 +00:00
Alam Ed Arias
c7b18207f5 travis: do not error on making cache folder, if it already restored from cache 2016-03-07 16:06:04 -05:00
Monster Iestyn
60ea2ecb77 Whoops, forgot these 2016-03-07 21:02:35 +00:00
Monster Iestyn
2f539a4df9 R_RenderThickSideRange now checks for slopes in the front sector's lightlist 
This appears to fix a few holes that have been known to appear with FOF slopes sometimes, dunno how they actually came about exactly but this apparently sorts them out
 2016-03-07 20:42:25 +00:00
Monster Iestyn
4ab2c336e7 Possibly fixed the issues with LibGME mentioned in issue #14. 
Not even the HAVE_LIBGME macro was defined apparently, huh.
 2016-03-06 19:32:07 +00:00
Monster Iestyn
099e25824f First person view now should correctly take the skybox centerpoint's angle into account 2016-03-05 16:29:25 +00:00
Monster Iestyn
ed955a2d20 Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git 2016-03-04 16:10:05 +00:00
Alam Ed Arias
13056fe2a0 Merge branch 'public_next' into private_master 2016-03-04 11:03:38 -05: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
Wolfy
7eaf3cf221 Merge branch 'new-SOC-lump-names' into 'next' 
SOC_**** lump name support

Exactly what it says on the tin: lumps with "SOC_" prefix now are read as SOC lumps like with MAINCFG/OBJCTCFG. Go nuts.

As a bonus, I've changed things with SOC lump detection so MAINCFG, OBJCTCFG and the new SOC_**** lumps are loaded in the order you find them in WAD files (rather than an arbitrary load-MAINCFG-then-load-OBJCTCFG thing as before). All of these are still loaded after Lua scripts though, mind.

See merge request !38
 2016-03-04 10:23:20 -05:00
Wolfy
891c7843ca Merge branch 'Lua-video-lib-expansion' into 'next' 
Lua video lib expansion

New video/drawer library functions for hud.add to use:

v.width() and v.height() return the screen width and height respectively (in other words you get the screen resolution), while v.renderer() returns the string for the renderer used ("software", "opengl", or "none").

Possibly add more stuff later, but for now these things at the least can be merged in next

See merge request !40
 2016-03-04 10:21:15 -05:00
Monster Iestyn
4302cfaa00 Merge branch 'playerspawn-hook' into 'next' 
Add PlayerSpawn hook to Lua

I don't know how I did this but I did. Something about staring at code from 3AM till 5AM...

Here's a test script too:

```Lua
addHook("PlayerSpawn", function(player) player.health = 99 end)

```

See merge request !48
 2016-03-04 10:19:18 -05:00
Monster Iestyn
e66491e65e Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git 2016-03-04 15:08:44 +00:00
Inuyasha
8c23168061 Remove stray comment from merge 2016-03-03 22:12:31 -08:00
Inuyasha
e0f5312d13 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into unslot-music 
# Conflicts:
#	src/dehacked.c
#	src/f_finale.c
#	src/lua_baselib.c
#	src/lua_maplib.c
#	src/m_menu.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_setup.c
#	src/p_user.c
#	src/s_sound.c
#	src/y_inter.c
 2016-03-03 22:09:24 -08:00