toasterbabe
f34a28e80e
Removed a hack that caused the groundpound spinfire to hurt you if you lost your shield.
2016-08-21 13:55:16 +01:00
toasterbabe
436dfbb24f
Crashed in THZ1 when testing going down the long section at the end, EIP blames this line, wasn't really necessary in the first place... fair enough.
2016-07-23 21:37:32 +01:00
toasterbabe
d0bb7293bd
Maximum Drop Dash speed of 75*FRACUNIT.
2016-07-23 21:01:40 +01:00
toasterbabe
ad03bb5278
Force Shield's air ability is now the Drop Dash (thanks, Sonic Mania, for making me like the momentum redirection idea by recontextualising it to collision with the ground only!)
...
* Press spin in midair to make the shield flash solid repeatedly and make a number of ding noises.
* When the player with a flashing, dinging shield hits the ground, they are sent off in spinning form at the maximum of 2*abs(momz) VS the 3D hypotenuse of momx, momy, and momz.
2016-07-23 18:25:51 +01:00
toasterbabe
0fefd86d1e
More generic name for P_ElementalFireTrail upon MI's request
2016-07-08 22:56:17 +01:00
toasterbabe
940a58b5ca
Shouldn't be true by default, WOOPS
2016-07-08 22:52:49 +01:00
toasterbabe
ec85357643
Didn't properly use the #defined numangles constant.
2016-07-08 22:05:13 +01:00
toasterbabe
f8dd9b64ab
Elemental shield ability now coded. REQUIRES NEW PATCH.DTA FROM THE FTP.
...
- Press spin in midair to stomp directly downwards (losing horizontal momentum), creating a flickering fireball around you.
- No bouncing on enemies, item boxes, etc - just go straight through.
- Hurts other players on touch whilst you're stomping.
- Spawns a bunch of flames around you when you hit the ground.
Also:
- Electric shield's ability now uses different sounds, because I'm picky.
2016-07-08 21:55:17 +01:00
toasterbabe
95ac0fa9a0
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into shield-actions
2016-07-08 13:20:24 +01:00
Alam Ed Arias
214cd404bd
Merge branch 'public_next' into master
2016-06-08 15:29:25 -04:00
Alam Ed Arias
5d263da9b4
Merge branch 'next' into public_next
2016-06-08 15:07:08 -04:00
Alam Ed Arias
742353d0ab
Merge branch 'master' into next
2016-06-08 15:06:17 -04:00
Alam Ed Arias
6d2d48f152
Merge branch 'skybox-sprites-fix' into 'master'
...
Fix for rendering sprites in skyboxes
This branch fixes the visual glitches one sees with sprites for objects within skyboxes, typically with parts of or all of some sprites disappearing from view even though they shouldn't be.
See merge request !84
2016-06-08 14:05:06 -04:00
Monster Iestyn
29ea733ae5
Fix sprites in skyboxes not having clipping arrays actually set properly
2016-06-08 17:53:34 +01:00
Alam Ed Arias
b9a39f3043
Merge branch 'public_next' into master
2016-06-04 22:36:55 -04:00
Alam Ed Arias
f4b90792fb
Merge branch 'next' into public_next
2016-06-04 22:35:42 -04:00
Monster Iestyn
2e9607938d
Merge branch 'master' into next
2016-06-04 20:23:46 +01:00
Nipples the Enchilada
6bf40b8f40
Merge branch 'gl-slope-doors' into 'master'
...
OpenGL slope fixes again
This branch just adds the relevant code for OpenGL to properly check slopes regarding "closed door" segs (those between two sectors that cannot be crossed normally) and "window" segs (those between two sectors of differing plane heights that you CAN cross, which would probably display top or bottom textures), so you don't get HOMs when the the slopes create a closed door even though the normal sector heights wouldn't or something.
(if you couldn't understand that, my slopes test map shows what I mean to the right of the player start: https://dl.dropboxusercontent.com/u/25409000/2.1/mi-slopetest.wad )
See merge request !81
2016-06-04 14:28:07 -04:00
Monster Iestyn
4c422f6605
OpenGL: closed door/window detection code now accounts for slopes, just like in software
2016-06-04 18:31:21 +01:00
Alam Ed Arias
c23b40fa9c
Merge branch 'public_next' into master
2016-06-02 18:39:08 -04:00
Alam Ed Arias
5cc2502b1a
Merge branch 'next' into public_next
2016-06-02 18:37:16 -04:00
Monster Iestyn
83c4dba4ce
Fix crash reported by FuriousFox at http://mb.srb2.org/showthread.php?t=41536
...
Basically this makes sure numwadfiles is updated before loading the SOC/Lua scripts, so if a Lua script calls COM_BufInsertText with the contents "addfile scr_mysticrealm.wad" it can't overwrite the last written wadfile slot! Not that COM_BufInsertText really should be used like that to begin with
2016-06-02 20:16:25 +01:00
wolfy852
919e3ed0e2
Make token available to Lua as a global variable
...
Reviewed by @RedEnchilada
2016-06-01 21:06:24 -05:00
Alam Ed Arias
5c24efac21
Merge branch 'master' into next
2016-06-01 15:35:03 -04:00
Alam Ed Arias
a7640e4d6c
travis: compress the build cache
2016-06-01 14:32:03 -04:00
Monster Iestyn
43b6b2a53f
Merge branch 'master' into next
2016-06-01 19:31:57 +01:00
Monster Iestyn
7fc1c7466d
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2.git
2016-06-01 19:24:00 +01:00
Monster Iestyn
c863e311fe
OpenGL: Fix upper texture Effect 1 only skewing
2016-06-01 19:22:54 +01:00
Alam Ed Arias
dfe5246636
appveyor: only for taggeed master builds
2016-06-01 14:01:12 -04:00
Monster Iestyn
bf85cc25bd
OpenGL: Fix lower unpegged texture offset, fix lower unpegged + effect 1 so the texture actually skews
2016-06-01 18:51:38 +01:00
Alam Ed Arias
0444e8a14c
Merge branch 'master' into next
2016-06-01 11:45:57 -04:00
Alam Ed Arias
d86dc67218
travis-ci: add back xcode6.2
2016-06-01 11:23:30 -04:00
Alam Ed Arias
f21c72b889
debug: always load exchndl.dll
2016-05-31 21:30:18 -04:00
Alam Ed Arias
ef290723c2
Merge branch 'master' into next
2016-05-31 17:57:12 -04:00
Alam Ed Arias
5401257c74
travis-ci: llvm's APT repos are offline for now
2016-05-31 17:56:05 -04:00
Monster Iestyn
d24cc49443
Fix FOF height checks all over p_spec.c to account for slopes
...
This fixes certain sector specials and linedef executor specials etc not accounting for players/mobjs touching sloped FOFs
2016-05-31 21:31:29 +01:00
Alam Ed Arias
7dd3a4ba7b
Merge branch 'master' into next
2016-05-31 11:26:51 -04:00
Alam Ed Arias
2262e4aeb9
travis-ci: allow clang-3.8 to fail
2016-05-31 11:26:29 -04:00
Alam Ed Arias
bd588ad0f4
travis-ci: note down what version of clang we are compiling with
2016-05-31 11:06:47 -04:00
Alam Ed Arias
9122c3e5ea
Merge branch 'travis-ci' into 'master'
...
Travis ci
Ok, now SRB2 on travis-ci is tested to be compiled against 17 buildsets
Now, what am I doing wrong?
See merge request !74
2016-05-31 11:02:51 -04:00
Alam Ed Arias
61faee12bc
travis-ci: add back clang 3.6 to 3.8, but also have toolchain test repos into the mix
2016-05-30 17:52:30 -04:00
Alam Ed Arias
9a703bbeda
travis-ci: drop clang 3.6, 3.7 and 3.8
2016-05-30 17:41:23 -04:00
Alam Ed Arias
5e154ce3fd
travis: use the correct binary name for clang
2016-05-30 17:21:24 -04:00
Alam Ed Arias
9f5ecdcd9c
travis: add mssing addons: section
2016-05-30 17:19:32 -04:00
Alam Ed Arias
5c5b85f369
travis-ci: add builds for clang 3.4 to 3.8
2016-05-30 17:16:58 -04:00
Monster Iestyn
2c73e2a2cd
Fix flung emeralds not disappearing in death pits
...
(assuming it wasn't an intentional behaviour thing of course)
2016-05-29 16:47:38 +01:00
Alam Ed Arias
6fb70f8d02
travis-ci: let only display, not error on autological warnings
2016-05-29 09:47:30 -04:00
Alam Ed Arias
febaabd80b
travis: label up each compiler build, and remove the allow_failures
2016-05-29 09:40:56 -04:00
Alam Ed Arias
6832962489
travis-ci: env vars need to be quoted
2016-05-28 22:45:47 -04:00
Alam Ed Arias
2dfdc99cb5
travis-ci: let add pre build files, gcc-6 get disable warning flags
2016-05-28 22:30:28 -04:00
