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

11142 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
54b35c3975 Fix GME library path, consider 64-bit systems for png/zlib/SDL2 paths/libraries 2016-09-26 21:58:25 +01:00
toasterbabe
5f4f6fdac8 Public remake of a merge request I shouldn't have put in Internal in the first place. 2016-09-26 18:35:13 +01:00
toasterbabe
28f5e7d1bc Did I not commit this fix? Woops. 2016-09-26 12:25:10 +01:00
Inuyasha
1d71dfa5a3 animate icons using FF_ANIMATE 
(this also means they last one second again, and the powerup is given after 1/2 a second, things which were lost when the flip was added)
 2016-09-25 20:55:08 -07:00
Monster Iestyn
27acd8c3ac Added SRB2_CONFIG_USE_INTERNAL_LIBRARIES option (defaults to off right now), some WIP work on making it ...actually do what it says on the tin. 
Basically, it manually sets *_FOUND, *_INCLUDE_DIRS and *_LIBRARIES instead of using find_package. Frankly I have no idea how well what I've done works currently though, not even sure if I've set the _LIBRARIES variables correctly. Again, it's WIP work, this can probably be fixed eventually I suppose.
 2016-09-25 20:33:07 +01:00
toasterbabe
be0e898bae * Skin-controlled radius is no longer set each tic, only on skin change and player spawn. 
* Camerascale, shieldscale, height and spinheight are now player attributes which are set to the skin attribute on skin change, not read directly from the skin.
* P_GetPlayerHeight and P_GetPlayerSpinHeight are now macros instead of functions.
* Extra protection against switching to a locked skin.
 2016-09-25 18:21:52 +01:00
toasterbabe
64a9a94604 GETSPEED -> GETFRACBITS completion. woops 2016-09-25 15:23:22 +01:00
toasterbabe
9f69850c05 Basically seriously un-fucked the rope hang and zoom tube code from my experimentations (i just wanted to compare speed and distance and got carried away...) 2016-09-25 15:07:00 +01:00
Inuyasha
1a4b894589 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into repeat-monitors 
# Conflicts:
#	src/info.c
 2016-09-24 23:05:01 -07:00
MonsterIestyn
3843533c24 Merge pull request #118 from ilag11111/linux-replay-fix 
Fix demo recording in Linux
 2016-09-24 19:54:49 +01:00
toasterbabe
50a44d96b1 Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta). 2016-09-24 17:15:42 +01:00
toasterbabe
28523760c3 FF_VERTICALFLIP, since I've been messing around with sprite stuff. 
* flips the sprite ala MFE_VERTICALFLIP except you don't need to flip the direction of gravity for the object just to draw upside down
* stacks properly with reverse gravity
 2016-09-24 14:23:00 +01:00
toasterbabe
da1db42b14 Forgot some compilers would complain about this. 2016-09-24 13:39:04 +01:00
toasterbabe
f933210c03 Let's simplify a lot of stuff. PF_CANCARRY instead of a horrible assortment of checks. 2016-09-24 13:18:08 +01:00
toasterbabe
eb64e4ccd9 Tightened some restrictions on Tails carry because right now the looseness leads to edge case noise spam when trying to pick up a player off a rope hang, for example. 2016-09-24 12:38:37 +01:00
toasterbabe
41b4d9c565 Fixed carry bug that I introduced a while ago. 2016-09-24 12:06:00 +01:00
toasterbabe
1de32b3dac Fixed my mistake with static rope hangs. 
Also, the same smoothness changes have been ported over to zoom tubes!
 2016-09-24 00:37:18 +01:00
toasterbabe
e16648a72b Introducing player->powers[pw_carry]! Also, I made rope hangs a lot smoother. 
* PF_ITEMHANG -> CR_GENERIC
* PF_CARRIED -> CR_PLAYER
* (mo->tracer == MT_TUBEWAYPOINT) -> CR_ZOOMTUBE
* PF_ROPEHANG -> CR_ROPEHANG
* PF_MACESPIN -> CR_MACESPIN
 2016-09-23 23:48:48 +01:00
toasterbabe
8ad72232be Helpful explanatory comments to assauge MI's fears. 2016-09-22 21:15:12 +01:00
toasterbabe
394ed30f44 Fixed the problem with the reverseplatform_clipping branch that caused springs to fall through platforms, as tested by Wolfs in TD. 2016-09-22 21:08:36 +01:00
toasterbabe
0568712a5e Prevent overflow when attempting to calculate the space between floor and ceiling. (I didn't notice any bugs as a result of the previous behvaiour, but you never know.) 2016-09-22 12:01:13 +01:00
toasterbabe
fa16abf7ae Fixed the thing where if you thok into a solid object you spin really fast in the air without moving OR losing your momentum. 2016-09-22 11:15:08 +01:00
toasterbabe
b8345aaf27 Solid objects are now no longer selectively intangible on slopes. 
HOWEVER, since these changes to PIT_CheckThing do raise questions about whether there may be unintended side effects here. As a result, I may remake this for internal only if necessary.
 2016-09-22 00:13:34 +01:00
toasterbabe
54f463ce81 Forgot dehacked.c description! 2016-09-16 17:15:16 +01:00
toasterbabe
db6e7fd985 Introducing MF2_LINKDRAW! I put it in this branch because it (ab)uses some structural changes I made for papersprites. 
* Sets the sortscale of the mobj to that of its tracer.
* Basically, Smiles' tails won't clip through shields thanks to this.
* http://gfycat.com/GraveGlassEwe
* Also has support for chains of MF2_LINKDRAW!
 2016-09-16 17:09:33 +01:00
toasterbabe
dcb82c292a Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements 2016-09-12 19:23:44 +01:00
ilag11111
3b503f1336 Use function va to avoid having to delcare a new variable. Thanks MonsterIestyn. 2016-09-11 14:59:24 -07:00
ilag11111
4abfe1e8f3 Fix MinGW/AppVeyor build. 2016-09-11 10:57:14 -07:00
ilag11111
2798bd5c16 Ensure demo files will save to srb2home, where SRB2 already looks for them. 2016-09-11 10:40:49 -07:00
ilag11111
c977d17416 Prevent truncation when resampling sounds with non-multiples of 11250. 2016-09-11 09:41:18 -07:00
toasterbabe
ba78dda276 Just noticed when poking around in dashmodecode that it didn't actually get stopped from running when you were playing in CTF! 2016-09-10 22:44:28 +01:00
toasterbabe
cd0c2347df Ditto with regards to glideandclimb. 2016-09-10 21:13:51 +01:00
toasterbabe
f844fb3460 More strenous checking of ability for these animations in preparation for something I wanna try... 2016-09-10 21:00:57 +01:00
Alam Ed Arias
c9aebc6f81 libz pkgconfig 2016-09-09 17:41:30 -04:00
Monster Iestyn
9f87841936 Fix bottom of FOF with a pusher special not accounting for slopes 2016-09-08 22:55:11 +01:00
toasterbabe
fb377ad44f Minor tweaks to animations and endsigns. 2016-09-08 17:48:54 +01:00
toasterbabe
941bf8eb03 Corrected multiple oversights with swimming players dropping their friends when they shouldn't. 2016-09-08 14:38:57 +01:00
toasterbabe
df7b375f05 Corrected an oversight for horizontal springs the introduction of PA_JUMP caused. 2016-09-08 13:57:43 +01:00
Alam Ed Arias
ad32803370 appveyor: disable FTP upload and RDP 2016-09-06 21:32:01 -04:00
Alam Ed Arias
ae4f680888 appveyor: add both Mingw folders into the PATH 2016-09-06 21:23:28 -04:00
Alam Ed Arias
e38329e965 appveyor: reenable RDP 2016-09-06 21:04:16 -04:00
Alam Ed Arias
ad9956294c appveyor: revert MINGW_SDK 2016-09-06 20:54:15 -04:00
Alam Ed Arias
1afe83250d appveyor: let use CCACHE_PATH 2016-09-06 20:40:00 -04:00
Alam Ed Arias
d79804c119 appveyor: call up Mingw GCC directly 2016-09-06 20:14:32 -04:00
Alam Ed Arias
f5ae094e5b appveyor: fixup PATH 2016-09-06 20:09:45 -04:00
Alam Ed Arias
ab322179f5 appveyor: compile with GCC 4.9 warning flags 2016-09-06 19:59:15 -04:00
Alam Ed Arias
df6d3de8ca appveyor: use mingw32-gcc as compiler 2016-09-06 19:57:28 -04:00
Alam Ed Arias
038a9f19cb appveyor: let use GCC 4.9.3 from Mingw32 2016-09-06 19:49:07 -04:00
Alam Ed Arias
7be8c0017e appveyor: let see what version of GCC are here 2016-09-06 19:20:51 -04:00
Alam Ed Arias
e62c0794dc Merge branch 'next' 2016-09-05 22:17:37 -04:00