5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
f66979ba1a
P_NullPrecipThinker no longer should have FUNCMATH (though I'm not sure if it should have had it in the first place anyway)
2018-11-07 21:00:38 +00:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
b1e02467bf
Weather is already run client-side. What if we ran it render-side, for major performance gains? This commit will answer all your questions - and more!
2018-10-07 15:00:58 +01:00
ab59504be0
Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit
2018-09-29 20:28:27 +01:00
500b71c0b3
More control over what stuff get Encore mapping applied to it, with sensible defaults so you don't have to do much to your map to get it to be supported!
...
* Objects!
* Gone is the arcane, difficult-to-remember list of random flags. Say hello to MF_DONTENCOREMAP!
* Alternatively, if the object has a skincolour applied to it, it isn't encoremapped either. (Useful for ghosts, for example.)
* Sectors!
* The autodetecting of sneaker and spring panels is now much more intelligent, and only avoids remapping the plane(s) the effect is availible upon.
* Sector special group 2 no. 15 is now "Invert Encore Remap". It inverts the above detection.
* Linedefs!
* The "Transfer Line" linedef flag can now also be used to deny Encore remappings on linedef textures.
* Right now it applies to every pixel drawn specifically belonging to that linedef, but if people decide it needs changing, we CAN make it apply to midtextures only (like linedef types 900-910).
2018-08-10 19:31:30 +01:00
ec0c358755
Merge branch 'master' into sonicitems
2018-07-08 17:51:44 -04:00
97348beb66
Fix all compilation errors (tested using DEBUGMODE=1 and ERRORMODE=1) that remain outstanding. Notably:
...
* Remove FUNCMATH from all void-returning functions, given GCC80 specifically complains about this case.
* Extend the length of all extant buffers to the safety threshold recommended by the compiler.
* Add void casts to WS_getaddrinfo's setting to prevent complaints about incompatible typecasts.
* Extend the charsel, face, and superface buffer sizes and writes to include the null terminator. (I didn't really want to do this because it's not even particularily NEEDED, but there was literally zero way to get around the request that I could find with multiple online searches. I tried.)
2018-07-07 16:52:01 +01:00
d1929d3a37
Linked list bananas, hnext/hprev fixes
2018-06-16 19:57:08 -04:00
da83809d44
Trailling items
...
Needs redone with a linked list and remove mobjtable; it doesn't like netgames atm
2018-06-16 17:54:12 -04:00
9b3751b30c
Merge branch 'master' into sonicitems
2018-06-07 19:39:45 -04:00
babc8be5da
Flags for only drawing an object on one person's screen, for juicy Boo splitscreen support
...
(also more item changes from last night that I just forgot to commit earlier)
2018-06-06 18:36:39 -04:00
14caf66567
MFE_JUSTBOUNCEDWALL
...
Hopefully, this should prevent instances where shells/Oni get caught on walls.
2018-06-04 23:23:52 -04:00
4b06594dd0
Star colormap is decided to be used per mobj with mobj->colorize
...
Star creates afterimages that are colorized and fullbright
Star makes the player fullbright
2018-02-05 00:00:36 +00:00
2a74ea07ee
Chee wanted paper sprites' code, so here it is for the public to see.
...
Note: Won't compile. Need to merge in the NAMEcLcR stuff first, let me do that.
2016-08-22 22:54:30 +01:00
4d6a3e3398
FUNCMATH fun
2016-06-12 16:08:48 -04:00
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
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
4625118ee8
MFE_DUMMY now exists to fill the slot where MFE_PUSHED was, bleh
2016-03-09 14:03:20 +00:00
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
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
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
2016-03-08 21:30:12 -08:00
1bdd4cf641
backport state-animations from internal master to public next
...
most other code in the branch did not come along for the ride.
2016-02-09 02:39:16 -08:00
2fb03a7cff
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles
...
Conflicts:
src/p_map.c - Automatically resolved by mergetool
2015-08-22 09:52:11 -04:00
fc649ce195
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into hotfix-pltz
...
Conflicts:
src/dehacked.c
src/p_mobj.h
2015-06-09 07:38:21 -04:00
a1c67e7e67
Add MFE_APPLYPMOMZ to fix camera movement.
...
Here's how it works: When a player walks off the
moving platform, it applies their pmomz once, and
then _keeps pmomz set_ so that the camera still
adds pmomz to its movements until they hit another
floor. This way, the camera doesn't jerk around.
2015-05-29 13:53:06 -04:00
3f8e7b1739
Revert/remove unused/broken junk from original slopes port
...
m_vector removal to come later. The little thing commented out in it
is so I could revert the weird tables.c change.
2015-05-22 20:57:58 -05:00
1f0f6b64c1
Store the slope an object is resting on (if applicable)
2015-04-29 00:33:04 -05:00
923fae476e
Merge branch 'fury-gh/slopes' into angles
...
Conflicts:
src/p_maputl.c
2015-04-19 15:56:55 -05:00
34c396825f
tmsprung is dead, long live MFE_SPRUNG a bunch of other painful tweaks to springs to fix this long-standing "AAA IM STUCK FOREVER UNDER A SPRING" thing when you touch a vertical spring from below (or above for reverse)
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9037 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
c8c7878005
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!
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9009 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
54f0d0c110
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-18 18:45:57 -06:00
15bd266cac
SRB2 2.1.5 release
2014-03-23 12:00:29 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
TehRealSalt