stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 18:30:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
14222 commits 172 branches 41 tags 280 MiB
Commit graph

14222 commits

This branch
This branch
All branches
Author SHA1 Message Date
GoldenTails
776ce2a750 bruh i messed up 2021-04-05 04:20:09 -05:00
GoldenTails
5b2abfa18d Replace some decimal constants with more descriptive hex constants. 2021-04-05 04:19:35 -05:00
James R
84191252d2 Remove code that converts uppercase letters to lower, when coming from dedicated console 2021-04-04 17:01:54 -07:00
Hannu Hanhi
e9213b2b41 Fix a OpenGL backend DeleteTexture crash 2021-04-04 21:29:15 +03:00
katsy
57c7a18a20 don't say we launched if we didn't actually launch 2021-04-02 20:50:56 -04:00
SwitchKaze
3895c02330 Revert "Remove key stuff" 
This reverts commit a439e569
 2021-04-02 15:46:08 -05:00
SwitchKaze
0db07cef0e Adjust joystick axis enum 2021-04-02 15:46:08 -05:00
SwitchKaze
5a247bf375 Fix typo in comment of I_GetMouseGrab 2021-04-02 15:46:08 -05:00
SwitchKaze
cb3a8f7a58 Remove key stuff 2021-04-02 15:46:08 -05:00
SwitchKaze
eb2dc9e99b Mouse improvements 2021-04-02 15:46:08 -05:00
SwitchKaze
3faa98cf4a Expose inputs to Lua 2021-04-02 15:45:59 -05:00
SwitchKaze
6bf76602ed Refactor mouse 2021-04-02 15:22:22 -05:00
LJ Sonic
99c773f39e Merge branch 'dontdothisinsoftwarelol' into 'next' 
don't HWR_ClearAllTextures() in software (fixes #389)

Closes #389

See merge request STJr/SRB2!1440
 2021-03-31 16:19:18 -04:00
LJ Sonic
4ef3477054 Merge branch 'smoother-freelook' into 'next' 
Smoother freelook in Software

See merge request STJr/SRB2!1444
 2021-03-31 16:17:40 -04:00
LJ Sonic
a584d7edea Merge branch 'playercanenterspingaps' into 'next' 
Do not let SF_NOJUMPSPIN characters enter sectors they could not enter if standing at full height (Closes #457)

Closes #457

See merge request STJr/SRB2!1432
 2021-03-31 16:15:35 -04:00
LJ Sonic
933fad7702 Merge branch 'fix-luafile-transfer' into 'next' 
Prevent a single client from blocking Lua file transfers

See merge request STJr/SRB2!1435
 2021-03-31 14:28:22 -04:00
LJ Sonic
95b333a6d4 Merge branch 'our-menu-system-sucks' into 'next' 
Our menu system sucks. That's all I have to say.

See merge request STJr/SRB2!1445
 2021-03-31 13:51:04 -04:00
LJ Sonic
4b15b52dfc Our menu system sucks. That's all I have to say. 2021-03-31 19:49:37 +02:00
LJ Sonic
7ab1a82d09 Merge branch 'floorsprite-fixes' into 'next' 
Floorsprite fixes

See merge request STJr/SRB2!1443
 2021-03-31 12:36:39 -04:00
katsy
d1700bbf18 Merge remote-tracking branch 'stjr/next' into dontdothisinsoftwarelol 2021-03-31 03:15:31 -05:00
Jaime Ita Passos
7e6bc97240 Smoother freelook in Software 
Mhm hmm...
 2021-03-30 22:52:50 -03:00
Jaime Ita Passos
59be35e533 Rename functions, make more efficient, fix subtractive in Software 2021-03-30 22:12:31 -03:00
Jaime Ita Passos
eece82c481 Blend modes revision 
This changes how blend modes render, and includes fixes.
 2021-03-30 17:03:05 -03:00
Monster Iestyn
0d5284c36c Murder MSDOS, another of the remaining DOS port related macros 
I also put in a missing `defined (__APPLE__)` in d_netcmd.h related to cv_mouse2opt

Also removed a redundant `!defined (__APPLE__)` in d_main.c
 2021-03-30 19:27:10 +01:00
Jaime Ita Passos
4025a1d517 [Software] A few floorsprite fixes 
This fixes the texture of the floorsprite sometimes facing the wrong way, since plane rendering can change the view angle.
 2021-03-29 23:04:13 -03:00
namishere
32a4b270df Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into buttered-lua 2021-03-29 16:15:50 -07:00
Mari0shi06
29704e141b Change Raspberry's chat colormap to V_ROSYMAP 2021-03-28 17:29:24 -04:00
Mari0shi06
715a3661b5 Revert "Change Raspberry's chat color to V_ROSYMAP" 
This reverts commit 192fa5cb4b
 2021-03-28 21:27:46 +00:00
Mari0shi06
192fa5cb4b Change Raspberry's chat color to V_ROSYMAP 2021-03-28 17:26:41 -04:00
Mari0shi06
424f67a74b Revert "Change Raspberry's chat colormap to V_ROSYMAP" 
This reverts commit 428ae3127e
 2021-03-28 21:19:26 +00:00
Mari0shi06
428ae3127e Change Raspberry's chat colormap to V_ROSYMAP 2021-03-28 17:12:58 -04:00
katsy
d6eaf7e0ff clear before switching, not after 2021-03-28 12:22:04 -05:00
katsy
55d63000f4 don't HWR_ClearAllTextures() in software 2021-03-27 18:30:59 -05:00
Monster Iestyn
df9b5c4312 Merge branch 'avoid-savemoddata' into 'next' 
Fix addons with custom gamedata not loading

Closes #473

See merge request STJr/SRB2!1427
 2021-03-26 13:06:49 -04:00
lachablock
8162d90c94 Fix LUAh_PlayerHeight returning wrong default value 2021-03-26 18:01:55 +11:00
LJ Sonic
854e43ea7c Kick clients if they take too long to download a Lua file 2021-03-25 22:43:06 +01:00
LJ Sonic
b6e5837161 Use a separate transfer status for disconnected nodes 2021-03-25 22:28:35 +01:00
SteelT
fa8947ad8f Merge branch 'no-apng-compile-fix' into 'next' 
Fix unused variable warning when USE_APNG is not defined

See merge request STJr/SRB2!1343
 2021-03-25 14:02:23 -04:00
SwitchKaze
6267abac8a Fix console text bleeding 2021-03-25 12:43:30 -05:00
lachablock
000e865f80 Revise spinheight/gap entry conditions (again), let's keep things WAY simpler: 
- PF_NOJUMPDAMAGE no longer affects height at all (you're welcome katsy).
- Characters with SF_NOJUMPSPIN will only use spinheight when panim is PA_ROLL. They cannot enter gaps when jumping with spinheight, unless also spinning or gliding.
- All other characters use spinheight when panim is PA_JUMP or PA_ROLL. They can enter gaps when jumping with spinheight.
 2021-03-25 21:42:25 +11:00
lachablock
6ea9653681 Add PlayerHeight and PlayerCanEnterSpinGaps Lua hooks 2021-03-25 21:41:09 +11:00
lachablock
b1a9262889 Fix P_PlayerCanEnterGaps issues with polyobject collision 2021-03-25 15:58:52 +11:00
lachablock
f99d89742a Revise conditions under which players use spinheight and enter gaps: 
- players with SF_NOJUMPDAMAGE but *not* SF_NOJUMPSPIN now always use spinheight while jumping (i.e. even with PF_NOJUMPDAMAGE), as long as their panim is PA_JUMP or PA_ROLL
- players with SF_NOJUMPSPIN no longer use spinheight while jumping (but,)
- PA_ROLL is now an acceptable condition for using spinheight (but not for entering gaps, e.g. S3K shields will shrink the hitbox but not allow gap entry on their own)
- flying players now only use spinheight if they do not have SF_NOJUMPSPIN (you're welcome, EggpackRE)
- players with neither SF_NOJUMPSPIN nor SF_NOJUMPDAMAGE use the same conditions as in 2.2.9 prerelease, i.e. use spinheight and can enter gaps unless they have PF_NOJUMPDAMAGE
 2021-03-25 15:57:35 +11:00
Monster Iestyn
7511911846 Merge branch 'custom3dcrash' into 'next' 
Fix sigsegv caused by bad target check in A_Custom3DRotate

See merge request STJr/SRB2!1430
 2021-03-24 14:24:21 -04:00
Monster Iestyn
4a898bace6 Merge branch 'next' into monster-cleaning-up-again 2021-03-24 15:39:38 +00:00
Monster Iestyn
91187f91be Merge branch 'fix-opengl-drawcroppedpatch' into 'next' 
Fix OpenGL V_DrawCroppedPatch (Fixes #452)

Closes #452

See merge request STJr/SRB2!1412
 2021-03-24 11:34:58 -04:00
Jaime Ita Passos
08937f892a Allocate a buffer for non-RGBA to RGBA texture conversions. 
UpdateTexture will I_Error (from AllocTextureBuffer) if the allocation fails.
 2021-03-23 01:18:28 -03:00
lachablock
0405b3922c Do not let nonspin characters enter sectors they could not enter if standing at full height 2021-03-23 15:09:04 +11:00
lachablock
5ed5984cc5 Make more player abilities and all shieldabilities remove PF_SPINNING on use 2021-03-23 15:03:12 +11:00
lachablock
04c0217774 Revert "Remove PF_SPINNING upon use of any jump ability, so that directionchar works properly" 
This reverts commit 4f18f6d3cf.
 2021-03-23 14:50:05 +11:00