MascaraSnake
|
d9f761b619
|
Adapt setup of rising FOFs
|
2020-04-27 11:52:31 +02:00 |
|
MascaraSnake
|
0877427168
|
Merge branch 'raisethinker' into udmf-fofs-mkii
# Conflicts:
# src/p_spec.c
|
2020-04-27 11:32:51 +02:00 |
|
MascaraSnake
|
2f9cccf287
|
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
|
2020-04-27 11:19:07 +02:00 |
|
MascaraSnake
|
7198cc46fd
|
Adapt setup of water bobbing FOF
|
2020-04-27 11:05:27 +02:00 |
|
MascaraSnake
|
f6b67d8253
|
Some additions/fixes for air bobbing FOFs
|
2020-04-27 10:58:38 +02:00 |
|
MascaraSnake
|
607aeb3a52
|
Adapt setup of air bobbing FOFs
|
2020-04-27 10:29:29 +02:00 |
|
Steel Titanium
|
e0f9b82544
|
Fix window icon being reset when switching renderers on non-Windows platforms
|
2020-04-26 18:46:43 -04:00 |
|
Louis-Antoine
|
380e246be3
|
Lower the download progress bar
|
2020-04-26 21:57:17 +02:00 |
|
Louis-Antoine
|
7c9ce1faee
|
Prevent edge warping in Snake minigame
|
2020-04-26 21:17:15 +02:00 |
|
Monster Iestyn
|
d47c64cc11
|
Merge branch 'planethinker-followup' into 'next'
Clean up the plane thinker cleanup
See merge request STJr/SRB2!897
|
2020-04-26 13:22:49 -04:00 |
|
MascaraSnake
|
c026b707ce
|
Make new thinker loading functions set floordata/ceilingdata where necessary
|
2020-04-26 18:54:03 +02:00 |
|
MascaraSnake
|
fb1746e95b
|
Deprecate the camera scanner effect and print a warning when it's used
|
2020-04-26 18:42:31 +02:00 |
|
MascaraSnake
|
82bf72f5e1
|
Remove obsolete stuff from elevator_t
|
2020-04-26 18:38:45 +02:00 |
|
MascaraSnake
|
f4282718dc
|
Accidentally changed the wrong SaveElevatorThinker call to SaveCrumbleThinker
|
2020-04-26 18:31:39 +02:00 |
|
MascaraSnake
|
554de0e0f5
|
T_StartCrumble refactoring, part 1
|
2020-04-26 16:51:14 +02:00 |
|
MascaraSnake
|
295ed303af
|
Make T_StartCrumble use its own thinker data structure
|
2020-04-26 11:55:10 +02:00 |
|
MascaraSnake
|
e00531ed9c
|
Merge branch 'udmf-next' into udmf-fofs-mkii
# Conflicts:
# src/p_floor.c
# src/p_spec.c
# src/p_spec.h
|
2020-04-26 11:13:09 +02:00 |
|
MascaraSnake
|
b439fa2b99
|
Uh-oh! Forgot to stash a file
|
2020-04-26 10:37:31 +02:00 |
|
MascaraSnake
|
abcc47ac61
|
Bring signature of P_AddAirbob in line with next
|
2020-04-26 10:35:08 +02:00 |
|
MascaraSnake
|
1aa90754db
|
Port over raise thinker changes from next (preparation for merge)
|
2020-04-26 10:33:13 +02:00 |
|
Louis-Antoine
|
2e27f32d3e
|
Replace a few instance of strncpy with strlcpy
|
2020-04-26 00:42:17 +02:00 |
|
Louis-Antoine
|
212358dbba
|
Restore old entry searching functions and add alternate versions for long names
|
2020-04-26 00:39:52 +02:00 |
|
Monster Iestyn
|
7034e2537a
|
whoops the sequel
|
2020-04-25 16:53:52 +01:00 |
|
Monster Iestyn
|
049a7db877
|
whoops
|
2020-04-25 16:52:11 +01:00 |
|
Hannu Hanhi
|
78c2928b8b
|
Optimization: also don't reset shader on models
|
2020-04-25 16:32:44 +03:00 |
|
Hannu Hanhi
|
c0c095e1d1
|
Optimization: only call pglUseProgram if shader actually needs changing
|
2020-04-25 16:32:32 +03:00 |
|
Hannu Hanhi
|
0758a8caec
|
Optimization: Don't reset shader program at end of DrawPolygon, instead reset it in UnSetShader
|
2020-04-25 16:32:21 +03:00 |
|
Nev3r
|
200fbc04ef
|
Merge branch 'shaders-merge-again' into 'sal-oglshaderport'
Funny shaders master merge
See merge request STJr/SRB2!892
|
2020-04-25 07:41:59 -04:00 |
|
Nev3r
|
9ebb4071ee
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
# Conflicts:
# src/p_floor.c
# src/p_mobj.c
# src/p_spec.c
# src/r_segs.c
|
2020-04-25 10:47:45 +02:00 |
|
MascaraSnake
|
0ab01cd4b2
|
Port over thwomp thinker changes manually, to avoid merge conflicts
|
2020-04-25 09:20:53 +02:00 |
|
MascaraSnake
|
04c10ed41b
|
Merge branch 'next' into udmf-next
|
2020-04-25 08:19:26 +02:00 |
|
MascaraSnake
|
3cd8f62ae9
|
Remove a line I overlooked in the thinker cleanup branch
|
2020-04-25 08:18:48 +02:00 |
|
James R
|
fe9b933b97
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2020-04-24 22:10:59 -07:00 |
|
James R
|
9f7a0a117c
|
Merge branch 'shaders-222' into 'sal-oglshaderport'
shaders master merge and mipmap fix
See merge request STJr/SRB2!848
|
2020-04-25 00:06:06 -04:00 |
|
Monster Iestyn
|
49cceda15b
|
Do the same with writing ARCH_FFLOOR values in Lua archiving code (reading was already dealt with years ago)
|
2020-04-24 22:43:23 +01:00 |
|
Monster Iestyn
|
7dda5f6b94
|
created P_GetFFloorID to get an "ID" of an FOF in its target sector (an opposite to P_GetFFloorByID you could say!), rewrote floor/ceiling rover archiving code to use both P_GetFFloorID and P_GetFFloorByID
|
2020-04-24 22:29:41 +01:00 |
|
Louis-Antoine
|
10fbaaf781
|
Fix compiler warnings
|
2020-04-24 22:19:05 +02:00 |
|
Monster Iestyn
|
e406a7bef5
|
no diff3 needed for line archiving
|
2020-04-24 20:58:38 +01:00 |
|
Monster Iestyn
|
1e61229cb7
|
we don't actually need put/get pointers at all (plus with everything put into functions they wouldn't work properly anyway)
|
2020-04-24 20:57:48 +01:00 |
|
Monster Iestyn
|
c1d2b8301b
|
split sector/lines archiving-related code into their own functions too
|
2020-04-24 20:40:50 +01:00 |
|
Monster Iestyn
|
2d45decbb0
|
remove statsec and statline as they appear to be entirely unused
|
2020-04-24 20:28:01 +01:00 |
|
Monster Iestyn
|
08a7fcbe8d
|
Split off FOF archiving-related code into their own functions
|
2020-04-24 20:26:57 +01:00 |
|
MascaraSnake
|
3170f2b8c3
|
Merge branch 'next' into udmf-next
# Conflicts:
# src/p_mobj.c
# src/r_segs.c
|
2020-04-24 21:15:53 +02:00 |
|
Monster Iestyn
|
d1d006a1a7
|
Merge branch 'thinker-cleanup' into 'next'
Plane movement thinker cleanup
See merge request STJr/SRB2!880
|
2020-04-24 14:30:52 -04:00 |
|
Louis-Antoine
|
d235d401bc
|
Improve controls handling in connection screen minigame
|
2020-04-24 19:27:42 +02:00 |
|
Louis-Antoine
|
9ac3fd202f
|
Add a Snake minigame to the downloading screen
|
2020-04-24 19:27:29 +02:00 |
|
Monster Iestyn
|
eaeb9358a3
|
Merge branch 'crumbling-sink' into 'next'
Sync crumblestate in netgames
See merge request STJr/SRB2!890
|
2020-04-24 12:53:14 -04:00 |
|
Louis-Antoine
|
e4f2c1dc70
|
Fix mouse being grabbed in intermission and cutscenes
|
2020-04-24 18:33:35 +02:00 |
|
Monster Iestyn
|
9df5d6e1e0
|
These are flags! Serves me right for just rushing this out
|
2020-04-24 16:53:54 +01:00 |
|
Monster Iestyn
|
2419b65f79
|
Sync crumblestate in netgames
|
2020-04-24 16:40:09 +01:00 |
|