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 |
|
Louis-Antoine
|
c90cc3b58f
|
Add a menu option for the minimum join delay
|
2020-04-24 15:38:07 +02:00 |
|
Louis-Antoine
|
9ec4ba3824
|
Add a minimum delay between connections
|
2020-04-24 14:05:15 +02:00 |
|
Zachary McAlpin
|
187efb4df2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
|
2020-04-23 18:39:31 -05:00 |
|
Zachary McAlpin
|
f6120410fb
|
Execute LUAh_GameQuit earlier in M_QuitResponse
It just feels a bit funny to execute LUAh_GameQuit if you are playing a session after the quit screen appears instead of before.
|
2020-04-23 17:38:08 -05:00 |
|
Monster Iestyn
|
bfb2467796
|
Merge branch 'uh-oh-spriteinfo' into 'next'
Fix minor issue with lua spriteinfo
See merge request STJr/SRB2!872
|
2020-04-23 16:12:55 -04:00 |
|
Monster Iestyn
|
4ef8093e92
|
Merge branch 'emeraldspawnfix' into 'next'
Fix emerald hunt not working properly, part 2
See merge request STJr/SRB2!887
|
2020-04-23 15:41:27 -04:00 |
|
Monster Iestyn
|
a71fe6445a
|
Merge branch 'master' into next
|
2020-04-23 18:49:53 +01:00 |
|
LJ Sonic
|
5e440e79cc
|
Merge branch 'long-names' into 'next'
Enable entry searching functions to retrieve entry names longer than 8 characters
See merge request STJr/SRB2!885
|
2020-04-23 04:40:33 -04:00 |
|
sphere
|
67f511a55e
|
Restore carelessly removed const keywords.
|
2020-04-22 23:38:10 +02:00 |
|
sphere
|
f85bfc87f5
|
Move variable declarations outside of for loops.
|
2020-04-22 23:17:18 +02:00 |
|
sphere
|
e26788d014
|
Fix variable-length array definition, just in case.
|
2020-04-22 23:10:43 +02:00 |
|
sphere
|
01a1297631
|
Make P_SpawnEmeraldHunt even more concise, using Fisher-Yates shuffle.
|
2020-04-22 22:46:12 +02:00 |
|
sphere
|
b254cb186b
|
Fix a mistake with P_SpawnEmeraldHunt and make it more concise.
|
2020-04-22 20:38:58 +02:00 |
|
sphere
|
25affe6948
|
Make emerald hunt shards spawn at correct heights, and add Float option.
|
2020-04-22 18:58:40 +02:00 |
|
Zipper
|
657ee8287e
|
Update p_user.c
|
2020-04-22 07:59:08 -04:00 |
|
Nev3r
|
ab7690346d
|
Merge branch 'udmf-thingargs' into udmf-multitag
# Conflicts:
# src/doomdata.h
# src/lua_mobjlib.c
# src/p_setup.c
|
2020-04-22 10:54:27 +02:00 |
|
Nev3r
|
de3ad9bc43
|
Merge branch 'udmf-next' into udmf-multitag
# Conflicts:
# src/doomdata.h
# src/p_setup.c
|
2020-04-22 09:11:17 +02:00 |
|
Nev3r
|
a3c9009389
|
Merge branch 'udmf-thingargs' into 'udmf-next'
Add mapthing arg support.
See merge request STJr/SRB2!874
|
2020-04-22 03:07:34 -04:00 |
|
Nev3r
|
1afb0eb79f
|
Initialize pitch and roll on textmap mapthings too.
|
2020-04-22 09:00:29 +02:00 |
|
Nev3r
|
188ad67c58
|
Merge branch 'udmf-next' into udmf-thingargs
# Conflicts:
# src/p_setup.c
|
2020-04-22 08:58:40 +02:00 |
|
ZipperQR
|
64edd91dbd
|
Dust devil support
|
2020-04-22 00:59:12 +03:00 |
|
Nev3r
|
3d9d9d74f6
|
Merge branch 'udmf-pitch-and-roll' into 'udmf-next'
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
See merge request STJr/SRB2!882
|
2020-04-21 12:27:26 -04:00 |
|
Nev3r
|
f4c2d70c7e
|
Merge branch 'udmf-mthingscale' into 'udmf-next'
Add mapthing scale support
See merge request STJr/SRB2!883
|
2020-04-21 12:26:46 -04:00 |
|
Louis-Antoine
|
0ddd2fea21
|
Let W_CheckNumForName(Pwad) find entries with long names
|
2020-04-21 11:08:18 +02:00 |
|