Louis-Antoine
|
2e3c110534
|
Optimise string archiving and allow for longer strings
|
2020-04-28 22:19:44 +02:00 |
|
LJ Sonic
|
5c16e33432
|
Merge branch 'fix-intermission-mouse' into 'next'
Fix mouse being grabbed in intermission and cutscenes
See merge request STJr/SRB2!891
|
2020-04-28 04:25:32 -04:00 |
|
Louis-Antoine
|
752b48de3a
|
Update sound and closed captions in connection screen
|
2020-04-28 00:37:58 +02:00 |
|
Louis-Antoine
|
231a835bf6
|
Minor adjustements in Snake minigame
|
2020-04-27 23:15:18 +02:00 |
|
Louis-Antoine
|
dfdace22bb
|
Add bonuses and maluses to Snake minigame
|
2020-04-27 23:10:13 +02:00 |
|
Louis-Antoine
|
a3dcc100c0
|
Add pause and retry to Snake minigame
|
2020-04-27 22:06:32 +02:00 |
|
SteelT
|
7c583b4c16
|
Merge branch 'shaders-optimizations' into 'sal-oglshaderport'
Shader optimizations
See merge request STJr/SRB2!893
|
2020-04-27 15:19:09 -04:00 |
|
MascaraSnake
|
df692645c4
|
Merge branch 'raisethinker' into 'next'
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
See merge request STJr/SRB2!899
|
2020-04-27 15:04:37 -04:00 |
|
Louis-Antoine
|
647d74bad5
|
Add a background to Snake minigame
|
2020-04-27 15:31:38 +02:00 |
|
MascaraSnake
|
4cec927bbb
|
Replace P_FindLineFromLineTag with P_FindLineFromTag
|
2020-04-27 14:34:42 +02:00 |
|
MascaraSnake
|
0a0812bc57
|
Remove P_FindSectorFromLineTag
|
2020-04-27 14:31:37 +02:00 |
|
Louis-Antoine
|
c7cd53d5b2
|
Call rand() a few times after calling srand()
|
2020-04-27 14:22:45 +02:00 |
|
MascaraSnake
|
4f3d837835
|
Store "no bosses" setting for lasers in thinker instead of checking sourceline.
|
2020-04-27 13:09:57 +02:00 |
|
MascaraSnake
|
630af5d225
|
Pass thwomp settings to P_AddThwompThinker
|
2020-04-27 13:01:31 +02:00 |
|
Louis-Antoine
|
58c0383e88
|
Use sprites for snake and apple
|
2020-04-27 13:01:14 +02:00 |
|
MascaraSnake
|
556c2a8c18
|
Store tag instead of sourceline in raise thinker
|
2020-04-27 12:54:08 +02:00 |
|
MascaraSnake
|
2f9cccf287
|
Make P_AddRaiseThinker more configurable via function parameters (needed for UDMF)
|
2020-04-27 11:19:07 +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 |
|
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
|
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 |
|