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

8605 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
a749d79aa5 Fix up S_ChangeMusic usage from merge so things can compile again 2016-03-13 20:53:10 +00:00
Monster Iestyn
f9c4b877ca Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2Internal.git into damage-control 2016-03-13 20:37:43 +00:00
Monster Iestyn
13f4ef2f34 Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into slope-fixes 2016-03-12 23:06:37 +00:00
Monster Iestyn
accab7da6a Fixed precipitation not checking for slopes 2016-03-12 23:03:56 +00:00
Monster Iestyn
c67683eb0a Fixed slope walls displaying sprites through them if they weren't completely above you 
Sadly this does not fix ALL sprite issues, but just some of them at the least
 2016-03-12 19:59:32 +00:00
Monster Iestyn
d82c9a66db Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2.git into skybox-hotfix 2016-03-11 17:13:31 +00:00
Wolfy
3232549971 Merge branch 'changeangle-hotfix' into 'next' 
Changeangle hotfix

Fixes an issue with A_ChangeAngleAbsolute reported on the MB https://mb.srb2.org/showthread.php?t=41236

See merge request !59
 2016-03-11 02:57:51 -05:00
Alam Ed Arias
81fc9df8d3 Merge branch 'master' into next 2016-03-10 18:02:23 -05:00
Alam Ed Arias
ee5190480d Merge branch 'cmake-fix' into 'master' 
Cmake fix

This branch SHOULD fix issue #14, but I haven't been able to check for myself without any GME stuff to test in-game with.

See merge request !58
 2016-03-10 18:00:51 -05:00
Alam Ed Arias
65c94218b9 Merge branch 'next' into changeangle-hotfix 2016-03-10 17:39:35 -05:00
Alam Ed Arias
9599d7f6dd Merge branch 'master' into next 2016-03-10 16:47:55 -05:00
Alam Ed Arias
ab4179dfb0 Merge branch 'travis-ci' 2016-03-10 16:46:57 -05:00
Alam Ed Arias
509516f59f travis: enable apt and ccache cache 2016-03-10 16:38:06 -05:00
Monster Iestyn
5b89164cf7 Fix camera going nuts around intangible polyobjects 2016-03-10 20:50:54 +00:00
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
a9df436311 Merge branch 'master' into lua-slopes 2016-03-07 16:18:58 -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