LJ Sonic
1e394a80bf
Merge branch 'possible-netgame-quit-crash-hotfix' into 'next'
...
Possible netgame quit crash hotfix
Closes #487
See merge request STJr/SRB2!1477
2021-04-25 16:33:49 -04:00
Sally Coolatta
382c0aa7de
Fix overshadowed declaration
2021-04-25 16:27:15 -04:00
Monster Iestyn
70939a7a3d
Set "allocated" flag to off if setting a string from PossibleValue afterwards, or if not setting a new value at all.
2021-04-25 21:08:12 +01:00
LJ Sonic
02ee480abe
Merge branch 'gl-colormapped-epolyflag' into 'next'
...
Fix uninitialized reads in PreparePolygon
See merge request STJr/SRB2!1392
2021-04-25 14:19:24 -04:00
sphere
a90642bfa9
Merge branch 'ogl-midtexture-zfighting-fix' into 'next'
...
Render midtextures on two-sided lines with a z-buffer offset
See merge request STJr/SRB2!1376
2021-04-25 14:02:02 -04:00
Monster Iestyn
65624bf6c0
Change numadded counter to UINT16 instead of UINT8, to allow for more sprites properly
2021-04-25 19:01:51 +01:00
Tatsuru
376d6cd6a2
Don't try to free patches in dedicated
2021-04-25 14:26:43 -03:00
Sally Coolatta
8278e621fb
Removed skin->availability
...
Locked skins now are a specific unlockable type, instead of being tied to the skin's properties.
This has plagued custom gamedata since 2.2 launch. It's extremely obnoxious having to set aside random numbers as dummy unlockables just to ensure that Amy Fang & Metal are unlocked from the start in a custom map pack.
Other changes made to accommodate this:
- R_GetSkinAvailabilities is now created from the list of unlockables set to skin type. (1st skin unlockable defined is (1), 2nd skin unlockable defined is (1 << 1), etc...)
- The "Added skin x" print shows up when loading addons but not at all for the base game, because the previous behavior of hiding based on if the skin was locked would now require iterating unlockables, which felt wrong to do during that stage of the loading process
- I noticed in my test wad that Sonic&Tails would give you Sonic&Sonic out if Tails was locked. I fixed that by making both skins required to show the character select option.
Mods that reserved empty dummy unlockables for Amy Fang and Metal won't have to do anything. Mods that wanted to re-lock them behind different requirements will have to update, but in the future they will not have to be in specific slots. Additionally, now Sonic Tails and Knuckles can also be locked for mods.
2021-04-25 07:18:32 -04:00
Radicalicious
e510e71617
Remove fire shield flash
2021-04-23 15:50:48 -04:00
Tatsuru
4f2f94d02d
Compatibility with the current identifier
2021-04-21 22:22:37 -03:00
Tatsuru
da56e84d2c
Change TOL_ERZ3 identifier
2021-04-21 22:17:16 -03:00
Sally Coolatta
57d81ddb21
Kart cmd->latency port
...
Nev3r was talking about something that would've been drastically improved with this, and it is really simple, so I ported it :)
2021-04-21 19:58:14 -04:00
GoldenTails
e7156db79d
Allow Lua to draw level title strings, and get the width and height of what would be drawn
2021-04-20 23:52:25 -05:00
GoldenTails
43c21edcbd
Send IntermissionThinker and intermission hud hooks stagefailed
.
2021-04-20 23:52:25 -05:00
GoldenTails
aa54a04c9e
Allow Lua to stop the intermission level title strings from drawing
2021-04-20 23:52:25 -05:00
GoldenTails
6c4e7e13e0
Allow Lua to disable the emeralds that appear in the Special Stage intermission.
2021-04-20 23:52:25 -05:00
Sally Coolatta
ce3c5e081e
Missed a few lines in the prev commit
2021-04-20 22:19:56 -04:00
Sally Coolatta
8f01e85ade
Allow spaces in captions defined in SOC
2021-04-20 22:10:11 -04:00
Jaime Ita Passos
77b8578d04
Add ease Lua library
2021-04-19 21:42:00 -03:00
Sally Coolatta
41f492f2f9
Don't award any potentially cheesable bonuses if the stage was failed.
...
Time Bonus is 0'd out if the stage was failed, since you can defeat the whole point of it if the stage lets you fail it immediately. Same with Guard Bonus -- it's not really a no-hit run if you didn't interact with anything.
Kept others that are more effort-based like Ring Bonus to give the player a little bit of partial credit, especially since Special Stages do this too.
2021-04-19 17:59:55 -04:00
Sally Coolatta
30e7455178
Failing a stage just displays the level title
2021-04-19 17:50:49 -04:00
Sally Coolatta
d8d3dee46f
Add linedef executor for toggling stagefailed
...
By default, the executor will fail the stage. If Not Climbable is checked, the stage can be completed normally again.
2021-04-19 17:20:34 -04:00
Jaime Ita Passos
b026a6991c
Easing functions
2021-04-19 15:52:07 -03:00
sphere
d71b99a56b
Merge branch 'comparepolygons-fix' into 'next'
...
Remove bad pointer arithmetic in polygon comparators (fixes #295 )
Closes #295
See merge request STJr/SRB2!1462
2021-04-19 14:33:41 -04:00
sphere
164fbeff91
Merge branch 'fix-perfstats-3' into 'next'
...
Fix incorrect values caused by outdated use of timing functions in perfstats 3
See merge request STJr/SRB2!1460
2021-04-19 14:33:31 -04:00
sphere
194d0b8201
Merge branch 'interfission' into 'next'
...
Cache teamflags/icons before drawing if they don't exist yet (closes #511 )
Closes #511
See merge request STJr/SRB2!1459
2021-04-19 14:33:23 -04:00
sphere
315582bd6c
Merge branch 'fix-blendtables' into 'next'
...
Fix blend tables generation
See merge request STJr/SRB2!1458
2021-04-19 14:33:12 -04:00
sphere
d871612a72
Merge branch 'openglol' into 'next'
...
Fix HWR_DrawSprite sigsegv
See merge request STJr/SRB2!1454
2021-04-19 14:33:03 -04:00
Sally Coolatta
d59f25a6cd
stagefailed is more useful
...
- Can now apply to normal stages, simply defaults to "false" in normal stages.
- Post-level cutscenes are now always skipped when the stage was failed.
- Exposed the boolean as a Lua read+write global.
Desired for SUGOI, as it allows for visited flags not be updated, and level completion emblems to not be awarded. Which means a lot less crappy non-ideal workarounds.
Normal stage intermission currently does not reflect failure state at all. Maybe it could always skip, never award score bonuses, have different text... etc. Probably would leave that up to vanilla dev opinion.
2021-04-18 12:59:49 -04:00
Hannu Hanhi
ee578b68f4
Remove bad pointer arithmetic in polygon comparators, that was causing glitches
2021-04-17 03:11:29 +03:00
Hannu Hanhi
3670af5a31
Fix incorrect values caused by outdated use of timing functions in perfstats 3
2021-04-16 00:38:34 +03:00
katsy
7b83345c75
need to create the patches here if they don't already exist
2021-04-14 19:29:53 -05:00
Jaime Ita Passos
d5e9005dd0
Fix NPOT flats, other minor changes.
2021-04-14 11:34:36 -03:00
Jaime Ita Passos
b3d7df74c0
This is my attempted fix for texture rotation on slopes, in Software.
2021-04-14 10:55:52 -03:00
Jaime Ita Passos
0d4d2ed6d8
Fix blend tables generation
2021-04-13 12:11:31 -03:00
katsy
23759c67aa
move HWR_GetMappedPatch earlier
2021-04-12 21:26:29 -05:00
X.organic
6f0b4a4f6d
Remove some dead code from DEH_LoadDehackedFile
...
Also fixes a buffer overflow, but said overflow generally got caught by
the stack smashing protector. Still, it's better for SOC files not to be
able to crash the game that easily.
2021-04-12 19:09:21 +02:00
X.organic
f0f3b33d71
Edit note_size alias to get rid of warnings
2021-04-12 19:09:21 +02:00
X.organic
701c6c8968
Fix myhashfgets-related buffer overflows in deh_soc.c
2021-04-12 19:09:12 +02:00
GoldenTails
8f322fd86f
name kinda sucked
2021-04-11 18:33:11 -05:00
GoldenTails
4f3802a2cc
acos Lua exposure
2021-04-11 18:32:49 -05:00
sphere
bcd3245b76
Merge branch 'blendmode-revision' into 'next'
...
Blending changes
See merge request STJr/SRB2!1446
2021-04-11 08:18:12 -04:00
sphere
00e81cac8e
Merge branch 'badflags' into 'next'
...
Fix CTF flag patch garbage (resolves #506 )
Closes #506
See merge request STJr/SRB2!1453
2021-04-10 11:34:07 -04:00
sphere
1d863408c7
Merge branch 'dedicated-scoretally-crash-fix' into 'next'
...
Fix dedicated server crashing when exiting special stage (Fixes #453 )
Closes #453
See merge request STJr/SRB2!1451
2021-04-10 11:34:00 -04:00
sphere
d18ef87465
Merge branch 'gl-deletetexture-fix' into 'next'
...
Fix a OpenGL backend DeleteTexture crash (Fixes #499 )
Closes #499
See merge request STJr/SRB2!1448
2021-04-10 11:33:53 -04:00
katsy
876daa7d6e
fix ctf flag garbage
2021-04-07 04:57:18 -05:00
Steel Titanium
77f2b1f682
Prevent redudant result patch caching on competition
2021-04-07 01:11:39 -04:00
Steel Titanium
a501b7b00d
Reorganize the switch block, add missing int_comp case
2021-04-07 00:55:08 -04:00
James R
1db163f942
Merge branch 'master' into next
2021-04-06 16:19:15 -07:00
SwitchKaze
c3d5740e98
Fix console text bleeding edge case
...
A single character could prematurely read if there were enough special characters to push 'c' past 'con_width'.
2021-04-06 15:06:44 -05:00
James R
e39bf7503f
Makefile: fix object file not depending on headers
...
BRUH MOMENT
2021-04-06 03:55:57 -07:00
Steel Titanium
101b6e46d4
Even more bruhs
2021-04-05 22:56:03 -04:00
Steel Titanium
33b7075d46
bruh
2021-04-05 22:50:22 -04:00
Steel Titanium
35c0f8b5cc
Correct function name comment
2021-04-05 22:44:16 -04:00
Steel Titanium
397fdef034
Load intermission patches in Y_LoadIntermisionData
2021-04-05 22:34:52 -04:00
Lach
c99e53d735
Merge branch 'dashmode-crash' into 'next'
...
Fix jet fume crash when dashmode is above DASHMODE_MAX
See merge request STJr/SRB2!1450
2021-04-05 21:30:16 -04:00
James R
a01a420aa0
Brackets
2021-04-05 18:10:34 -07:00
Sally Coolatta
3dd04b90c6
Fix jet fume crash when dashmode is above DASHMODE_MAX
...
I would like to use higher dashmode values for extra leniency, the jet fume kicks and screams when this happens.
2021-04-05 16:59:02 -04:00
LJ Sonic
2c1b383c4a
Merge branch 'uppercase-tty' into 'next'
...
Let uppercase letters thru dedicated console
See merge request STJr/SRB2!1449
2021-04-05 07:33:42 -04:00
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
4b15b52dfc
Our menu system sucks. That's all I have to say.
2021-03-31 19:49:37 +02: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
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
Monster Iestyn
ee8acccd3c
RETURN OF THE PORTS CHOPPING BLOCK: Destroy DOS!
...
Remove all remaining traces of the following macros for the obsolete DOS port, which were missed previously:
* `DJGPP`
* `__DJGPP__`
* `DJGPPDOS`
* `PC_DOS`
* `WATTCP`
May get rid of `MSDOS` later once I get word on whether I should kill it or not
2021-03-22 14:43:26 +00:00
Monster Iestyn
2aaaddae7c
Fix mistake I made with my previous commit for r_skins.c
2021-03-22 14:17:22 +00:00
Monster Iestyn
571d6c5438
Merge branch 'next' into monster-cleaning-up-again
2021-03-22 13:53:53 +00:00
katsy
42cfcbf7be
fix sigsegv in A_Custom3DRotate
2021-03-21 16:09:11 -05:00
Monster Iestyn
b882aea2e4
Fix clobbering error in hw_md2.c by adding "volatile" to png_FILE.
...
(Apparently Kart made this exact fix 2 years ago and it was never backported?)
2021-03-21 19:49:32 +00:00
sphere
0c22fecafa
Make horizontal springs above floors put the player in spring state.
2021-03-17 12:42:18 +01:00
sphere
95eff8cbc5
Avoid savemoddata being set in W_InitFile to fix addons with gamedata.
2021-03-15 18:11:02 +01:00
lachablock
36c2be283c
Disallow write_backtrace on Windows entirely
2021-03-15 15:17:55 +11:00
Lach
91c9d667e1
Merge branch 'final-tweaks' into 'next'
...
More final tweaks for 2.2.9 I guess
See merge request STJr/SRB2!1417
2021-03-14 20:52:47 -04:00
Lach
cf42a62b7e
Merge branch 'dropdropSHAdow' into 'next'
...
Papersprite dropshadows no longer askance
Closes #409
See merge request STJr/SRB2!1408
2021-03-14 20:52:25 -04:00
Lach
6ab5432713
Merge branch 'opengl-renderflags-fix' into 'next'
...
Fix a few renderflags oversights in OpenGL
See merge request STJr/SRB2!1422
2021-03-14 20:51:57 -04:00
Hannu Hanhi
746c84e0b5
Fix wrong color on player models' first frame by updating variable after loading blend texture
2021-03-13 23:07:51 +02:00
LJ Sonic
efdfa55328
Remove misleading comment
2021-03-12 19:54:01 +01:00
Lachlan Wright
c589fe85e4
Merge branch 'ogl-compileshaders-bug' into 'next'
...
Remove misplaced SetShader call in CompileShaders (Fixes #402 )
Closes #402
See merge request STJr/SRB2!1423
2021-03-09 00:14:17 -05:00
Lachlan Wright
d97de6d3bd
Merge branch 'sw-culling-inaccuracy' into 'next'
...
Use double precision in R_StoreWallRange sloped seg culling calculations (Fixes #434 )
Closes #434
See merge request STJr/SRB2!1424
2021-03-09 00:13:53 -05:00
LJ Sonic
0765004188
Merge branch 'print-backtrace' into 'next'
...
Print a backtrace when SRB2 crashes in a Unix-like environment.
See merge request STJr/SRB2!1288
2021-03-07 08:26:44 -05:00
Hannu Hanhi
8cc49a0f2e
Use double precision in R_StoreWallRange sloped seg culling calculations
...
Fixes culling issues in CEZ2 skybox
2021-03-06 19:56:25 +02:00
Hannu Hanhi
caab4e96cd
Remove misplaced SetShader call in CompileShaders
2021-03-06 19:38:17 +02:00
Jaime Ita Passos
f6cb1798cc
Fix a few renderflags oversights in OpenGL
2021-03-02 02:27:14 -03:00
Lachlan Wright
e03700fc2a
Merge branch 'nogmever' into 'next'
...
Check if GME_VERSION is defined.
See merge request STJr/SRB2!1372
2021-03-01 17:50:48 -05:00
Lachlan Wright
fc1bc94d9a
Merge branch 'fix-flipped-bounce' into 'next'
...
Fix CA_BOUNCE height when flipped (Fixes #428 )
Closes #428
See merge request STJr/SRB2!1373
2021-03-01 17:49:54 -05:00
Steel Titanium
d59de95262
Merge branch 'master' into next
2021-03-01 16:55:48 -05:00
Lachlan Wright
49c68d279d
Merge branch 'marathon-pause-fix' into 'next'
...
Disable pausing during score screens in marathon mode
See merge request STJr/SRB2!1416
2021-03-01 16:51:28 -05:00
Lachlan Wright
b8873e8182
Merge branch 'skincolor-modif-fix' into 'next'
...
Fix translation colormap cache rebuilding using the old translation enumerations (fixes #443 , #449 , #459 )
Closes #443 , #449 , and #459
See merge request STJr/SRB2!1421
2021-03-01 16:49:20 -05:00
Lachlan Wright
588a40453b
Merge branch 'linkdraw-scale-fix' into 'next'
...
Fix thing scale mismatch in R_DrawVisSprite. (Fixes #458 )
Closes #458
See merge request STJr/SRB2!1420
2021-03-01 16:49:10 -05:00
Lachlan Wright
94c7124904
Merge branch 'revert-9649a9fb' into 'next'
...
Revert "Merge branch 'player-speed' into 'next'"
Closes #466 and #471
See merge request STJr/SRB2!1418
2021-03-01 16:49:00 -05:00
James R
5f4e21ed3a
Fix dependency file trying to be made for SRB2.res and not for interface/blua/hardware files
2021-02-28 17:02:08 -08:00
Jaime Ita Passos
94fe7a3d8c
Change I_Error message
2021-02-28 17:47:12 -03:00
Jaime Ita Passos
401271feb7
Fix translation colormap cache rebuilding using the old translation enumerations
...
This was causing a buffer underwrite too. Lovely.
2021-02-28 17:05:25 -03:00
Jaime Ita Passos
07ffe2599c
Fix thing scale mismatch in R_DrawVisSprite
2021-02-28 16:23:40 -03:00
GoldenTails
a0396d5e43
Make it more async-signal-safe
2021-02-27 18:07:47 -06:00
GoldenTails
bdb28a06f4
Print the backtrace before showing the signal handler popup.
2021-02-27 18:07:47 -06:00
GoldenTails
5108f1f57b
Use file descriptors and ditch file streams, for now.
2021-02-27 18:07:47 -06:00
GoldenTails
4016a2e062
Crash backtrace logging for NEWSIGNALHANDLER.
2021-02-27 18:07:47 -06:00
Jaime Ita Passos
a1e0aa1812
Fix "implicit declaration of function 'DEH_TableCheck'" warning
2021-02-27 12:04:48 -03:00
Lachlan Wright
77feee73c3
Revert "Merge branch 'player-speed' into 'next'"
...
This reverts merge request !1309
2021-02-27 03:38:13 +00:00
Riku Salminen
8bcc71c629
Disable pausing during score screens in marathon mode
2021-02-26 15:43:53 +02:00
LJ Sonic
75d0e70236
Fix sector tags being signed in Lua
2021-02-25 23:41:43 +01:00
GoldenTails
12205314bc
Check against null tmpusher source before attempting to push a thing.
2021-02-21 19:32:00 -06:00
Zwip-Zwap Zapony
308ab0e079
Fix OpenGL V_DrawCroppedPatch
2021-02-21 22:16:38 +01:00
toaster
73758f50ff
Fix dropshadows of papersprites drifting depending on angle relative to camera. Discovered in Kart internal for the paper item drops and ported back, hence the branch name.
2021-02-19 06:45:28 -05:00
James R
747c278bc2
Makefile: add a SILENT flag
...
This makes it print nothing to stdout.
Also fixed some irregularities.
2021-02-18 07:24:20 -08:00
James R
3d32f3145c
Generate individual dependency files
...
This removes Makefile.depends. Instead, '.d' files are included from the 'dep'
directory. This speeds up building because dependencies for every file don't
need to be regenerated if only one changes.
As a bonus, dependencies also won't be generated if only clean type targets
are going to be run. Also added a 'distclean' target, which cleans both
objects and dependency files.
2021-02-18 06:23:18 -08:00
James R
3003c252d1
Makfile: don't print some messages twice
2021-02-18 06:23:12 -08:00
sphere
998d065698
Add more actions for slope copying & update the ZB config.
2021-02-17 16:06:02 +01:00
X.organic
0cbf9a791b
Fix indentation in MOBJCONSISTANCY conditional
2021-02-16 23:27:44 +01:00
X.organic
90611ed547
Fix MOBJCONSISTANCY and make it optional in DEBUGMODE
...
MOBJCONSISTANCY checks confined to gamestate GS_LEVEL. DEBUGMODE
no longer implicitly enables them, making it netgame-compatible.
2021-02-16 21:36:28 +01:00
X.organic
205ccc2727
Move Dehacked table sanity check to deh_tables.c
2021-02-16 19:46:31 +01:00
LJ Sonic
7133c703b4
Show an alternate ping icon when the player is disconnected
2021-02-15 22:19:48 +01:00
LJ Sonic
97daba68d0
Enable rejointimeout by default
2021-02-15 16:24:30 +01:00
LJ Sonic
aa33d90215
Add rejointimeout to the server options
2021-02-15 16:23:57 +01:00
LJ Sonic
0b012d5db0
Make the names of disconnected players flicker in tab HUD
2021-02-15 16:21:26 +01:00
LJ Sonic
b369243beb
Use standard Lua naming scheme for polyobject list
2021-02-15 13:37:25 +01:00
Nev3r
66d858fbcb
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into remove-iterdeclarations
...
# Conflicts:
# src/p_spec.c
2021-02-15 09:20:40 +01:00
SMS Alfredo
4430835a71
This might be dumb, but whatever
2021-02-14 20:49:03 -06:00
lachwright
cf389179e8
Rollout rock improvements:
...
- No longer struggles to start to accelerating at certain angles
- Carrying a player onto a rollout rock no longer leaves them in their ride state
- Changed dispoffset might alleviate some sorting issues
- Changes the player's camera angle when sprung horizontally
- Works better in reverse gravity
2021-02-15 01:11:03 +11:00
LJ Sonic
70850b0836
Deprecate P_AproxDistance for Lua scripts
2021-02-13 18:04:27 +01:00
LJ Sonic
758de501da
Use R_PointToDist2 for the Lua versions of P_AproxDistance and FixedHypot
2021-02-13 18:04:12 +01:00
LJ Sonic
a58df577fe
Revert "Use FixedHypot over P_AproxDistance"
...
This reverts commit c5474436af
.
2021-02-13 17:46:29 +01:00
LJ Sonic
d2d1f83b62
Revert "Use R_PointToDist2 instead"
...
This reverts commit e19196a86e
.
2021-02-13 17:45:54 +01:00
LJ Sonic
09d911a5b6
Revert "Replace all instances of P_AproxDistance with FixedHypot"
...
This reverts commit 75633bde50
.
2021-02-13 17:45:20 +01:00
Nev3r
a57c695f79
Update example comment.
2021-02-11 14:22:49 +01:00
Nev3r
fbe2a19c60
Fix __LINE__ macro expansion via recursive macro expansion; C macros sure are something sometimes...
2021-02-11 14:12:50 +01:00
Nev3r
eda6b0ad8e
Remove TAG_ITER_DECLARECOUNTER and the level field on the iterator macros.
...
Declare the position counters inside the for loops instead; RIP C90.
2021-02-11 13:24:20 +01:00
namishere
326be01276
Expose P_ButteredSlope to lua
2021-02-11 04:06:40 -08:00
LJ Sonic
dfc1767794
Only call PlayerCmd hooks if added to game
2021-02-11 00:24:42 +01:00
LJ Sonic
3dff1eb1b7
Fix consoleplayer returning the server player during joining phase
2021-02-11 00:10:15 +01:00
SteelT
6089550972
Merge branch 'gl-texture-management' into 'next'
...
Manage uploaded OpenGL textures with an internal list
Closes #411
See merge request STJr/SRB2!1391
2021-02-07 13:37:33 -05:00
James R
5b287f9cce
Merge branch 'fix-doublejump-divby0' into 'next'
...
Fix a divby0 when you have specific character stats.
See merge request STJr/SRB2!1374
2021-01-31 01:17:41 -05:00
Jaime Ita Passos
8318935811
Remove GLMipmap_t.nextmipmap
2021-01-27 21:23:20 -03:00
Jaime Ita Passos
4891611ab7
tRNS chunk fix
...
Fixes a faulty check not properly detecting the presence of a tRNS chunk.
2021-01-27 19:23:04 -03:00
Jaime Ita Passos
d4044a4f82
Add PF_ColorMapped
...
Not all surfaces have tint and fade colors. Checking for a specific surface flag, that tells the backend those colors are present, avoids uninitialized reads.
2021-01-27 18:54:33 -03:00
Jaime Ita Passos
5501d495c7
OpenGL backend: Manage uploaded GPU textures with an internal list
...
Indirectly fixes the game doing whatever after freeing a patch.
This commit implements a FTextureInfo struct type, instead of it being a typedef to the GLMipmap_s struct type.
2021-01-27 17:48:57 -03:00
James R
29b6bd5df9
Merge branch 'fix-mobj-slidemove' into 'next'
...
Make sliding against objects actually work (Fixes #400 )
Closes #400
See merge request STJr/SRB2!1348
2021-01-26 20:43:17 -05:00
LJ Sonic
36c193f317
Merge branch 'fix-boss2pogotarget' into 'next'
...
Make several actions actually check for a player smh (Fixes #387 )
Closes #387
See merge request STJr/SRB2!1340
2021-01-25 18:11:38 -05:00
LJ Sonic
83947d4428
Merge branch 'redundant-hypot' into 'next'
...
Replace P_AproxDistance with FixedHypot, and replace FixedHypot's algorithm with R_PointToDist2's
See merge request STJr/SRB2!1320
2021-01-25 18:08:25 -05:00
LJ Sonic
2d3e302929
Merge branch 'mode0-centering' into 'next'
...
Fix video mode 0 not getting centered
See merge request STJr/SRB2!1344
2021-01-25 17:59:26 -05:00
LJ Sonic
14ee92ef67
Merge branch 'gl-levelflat-fix' into 'next'
...
Fix a misuse of levelflat_t.picture in OpenGL
See merge request STJr/SRB2!1327
2021-01-25 16:40:02 -05:00
LJ Sonic
41f1b3cfa3
Merge branch 'jimita-why-you-done-this!!!' into 'next'
...
Fix mobj unarchiving code
See merge request STJr/SRB2!1384
2021-01-22 18:26:26 -05:00
Lachlan Wright
ea55a614d1
Merge branch 'flipped-waterrun' into 'next'
...
Allow water running in reverse gravity
See merge request STJr/SRB2!1369
2021-01-19 23:20:57 -05:00
Jaime Ita Passos
f3ad648874
Revert "Move a few mobj spawn defaults to its own function"
...
This reverts commit 6f9c48a305
.
# Conflicts:
# src/p_mobj.c
2021-01-17 23:17:46 +01:00
lachwright
a117ec9859
oops that doesn't work in reverse gravity
2021-01-14 04:34:43 +11:00
lachwright
149535634e
Keep Metal's jet fume at a consistent height during dashmode
2021-01-14 04:24:48 +11:00
lachwright
d2be3110bd
Have Metal Sonic use spinheight while dashing
2021-01-13 22:28:38 +11:00
Tatsuru
90b0242802
Put his name at the right order
2021-01-11 21:49:31 -03:00
Tatsuru
fbcc0c25b3
Add Logan to the art credits
2021-01-10 23:17:40 -03:00
Zippy_Zolton
8aac7454b8
Make Armageddon Shield instantly kill Egg Guards
2021-01-10 17:20:07 -06:00
Hannu Hanhi
d252f074b7
Render midtextures on two-sided lines with a z-buffer offset
...
This will fix z-fighting issues when they overlap with FOFs.
2021-01-10 21:33:54 +02:00
Hannu Hanhi
eb1e7eff8f
Take slopes into account even more in FOF wall cutoff in HWR_ProcessSeg
2021-01-10 20:52:03 +02:00
GoldenTails
59bc197f32
Fix a divby0 when you have SF_MULTIABILITY, CA_DOUBLEJUMP, and actionspd -FRACUNIT.
2021-01-10 10:01:31 -06:00
Zwip-Zwap Zapony
679bf5f999
Fix CA_BOUNCE when flipped
...
Fix P_DoAbilityBounce() always using "max",
instead of "min" while upside-down and "max" while not
2021-01-08 16:25:10 +01:00
SteelT
52c96239ba
Merge branch 'fix-lua-consvars-with-functions' into 'next'
...
Fix CV_RegisterVar returning LUA_GetErrorMessage to Lua when CV_CALL is involved. (Resolves #403 )
Closes #403
See merge request STJr/SRB2!1346
2021-01-07 16:33:39 -05:00
SteelT
4041e69fad
Merge branch 'pressing-two-keys-in-the-console-crashes-srb2' into 'next'
...
Pressing Ctrl+Backspace In An Empty Console Crashes SRB2
See merge request STJr/SRB2!1370
2021-01-07 16:32:51 -05:00
SteelT
da37d3c168
Merge branch 'fix-ticcmd-received' into 'next'
...
Fix TICCMD_RECEIVED being overridden by gamelogic
See merge request STJr/SRB2!1337
2021-01-07 16:31:45 -05:00
SteelT
d9bdced3df
Merge branch 'revert-8a30576d' into 'next'
...
Revert plane sorting changes
See merge request STJr/SRB2!1353
2021-01-07 16:20:30 -05:00
Steel Titanium
c8627464c9
Check if GME_VERSION is defined.
...
I made the assumption it would always be defined, which won't always be the case.
2021-01-06 19:40:30 -05:00
GoldenTails
70eb3228f8
Pressing A Key Combination In The Console Crashes SRB2
...
get stryder7x in on this
2021-01-05 13:20:02 -06:00
Tatsuru
1752f6efc1
Allow water running in reverse gravity
2021-01-04 18:10:41 -03:00
GoldenTails
3b4a52b8b8
Allows Lua to transport you to a different map in place of a Special Stage.
2021-01-04 00:03:18 -06:00
katsy
c19539248a
add sprung flag to steam
2020-12-31 04:38:26 -06:00
Hannu Hanhi
ed82b94e64
Take slopes into account in FOF wall cutoff in HWR_ProcessSeg
2020-12-29 23:29:00 +02:00
LJ Sonic
0de3a64b59
Let Lua toggle the crosshair
2020-12-29 21:36:15 +01:00
GoldenTails
50d46e1fa6
Set the target of a spawned ghost to where it came from.
2020-12-27 00:21:09 -06:00
James R
4d6b677765
Revert "Merge branch 'plane-sorting-fix-part-3' into 'next'"
...
This reverts merge request !1235
2020-12-23 03:02:31 +00:00
James R
0d1050f360
Merge branch 'next' into 'next'
...
Return nil on skincolor invalid field access
See merge request STJr/SRB2!1351
2020-12-22 20:13:45 -05:00
SwitchKaze
ad8abcef09
Return nil on skincolor invalid field access
2020-12-21 15:48:49 -06:00
Jaime Ita Passos
abf0ca6690
Fix "missing initializer" warnings/errors in CVAR_INIT macros
2020-12-21 17:19:07 -03:00
GoldenTails
147c38c5ce
Make sliding against objects actually work
2020-12-21 02:03:44 -06:00
GoldenTails
971518d22e
Have Lua_OnChange restore the stack to what it was before it was called.
...
So we don't get Luas with access to LUA_GetErrorMessage.
2020-12-20 21:43:14 -06:00
Hannu Hanhi
6c330bbf16
Fix video mode 0 not getting centered
2020-12-21 00:03:20 +02:00
GoldenTails
08146c9cad
Have A_ThrownRing check for a player too
2020-12-19 21:30:13 -06:00
GoldenTails
60564197af
Have A_DetonChase check for a player too
2020-12-19 21:12:09 -06:00
GoldenTails
f9e5681a6b
Actually check for a player smh
2020-12-19 20:33:29 -06:00
Jaime Ita Passos
1254f691ee
Fix unused variable warning when USE_APNG is not defined
2020-12-19 17:40:18 -03:00
Jaime Ita Passos
4717261459
Optimize Picture_GetPatchPixel
2020-12-19 17:32:45 -03:00
James R
4713b25837
Bit array conflicts
2020-12-16 08:44:03 -08:00
James R
353692fa79
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-16 08:43:49 -08:00
LJ Sonic
b82cee780a
Fix TICCMD_RECEIVED being overridden by gamelogic
2020-12-16 17:35:39 +01:00
Nev3r
b642682dde
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-tag-iterator
...
# Conflicts:
# src/doomtype.h
2020-12-16 17:27:44 +01:00
Nev3r
98e67871f5
Merge branch 'fix-vibing-slopes' into 'next'
...
Fix vibing slope planes
See merge request STJr/SRB2!1335
2020-12-16 11:15:41 -05:00
Nev3r
ce89eb64ba
Merge branch 'plane-viewangle-fix' into 'next'
...
Restore the viewpoint's angle in R_DrawPlanes instead (related to #404 )
See merge request STJr/SRB2!1326
2020-12-16 11:15:27 -05:00
Nev3r
5b1732baa3
Merge branch 'binarymap-slopevertices-fix' into 'next'
...
Replace the first entry in slope vertex thing taglists, instead of adding into them (related to #404 )
See merge request STJr/SRB2!1333
2020-12-16 10:55:21 -05:00
Nev3r
c97056f9ce
Merge branch 'spritestuff2-archiving-fix' into 'next'
...
Fix archived mobjs having no default blend mode and sprite scales
See merge request STJr/SRB2!1300
2020-12-16 08:57:36 -05:00
Nev3r
60b3465002
Merge branch 'text-color' into 'next'
...
Improved text colormaps (Closes #222 and #359 )
Closes #222 and #359
See merge request STJr/SRB2!1202
2020-12-16 08:50:30 -05:00
Zippy_Zolton
45976d2304
magenta and green sonicx
2020-12-15 22:19:57 -06:00
Jaime Ita Passos
fa9db2d644
Fix vibing slope planes
...
I messed up the multiplication order for texture scaling: it multiplied a floating point number with a fixed point number, instead of multiplying two floats and then converting the result into a fixed point number.
2020-12-16 00:26:08 -03:00
James R
84e9020eed
Merge branch 'shieldless' into 'next'
...
Add new skin flag SF_NOSHIELDABILITY
See merge request STJr/SRB2!1331
2020-12-15 21:00:53 -05:00
James R
a36908a5ce
Merge branch 'amys' into 'next'
...
fix amy meeting herself in mario mode
See merge request STJr/SRB2!1330
2020-12-15 20:57:16 -05:00
James R
f9ce70a6b3
Merge branch 'picfmt-fixes' into 'next'
...
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats
See merge request STJr/SRB2!1324
2020-12-15 20:55:52 -05:00
James R
019082cf7a
Merge branch 'dusty' into 'next'
...
Make fiery spindust fullbright
See merge request STJr/SRB2!1317
2020-12-15 20:53:29 -05:00
Zippy_Zolton
29495ad436
Merge branch 'next' of https://github.com/STJr/SRB2 into text-color
2020-12-15 19:51:40 -06:00
James R
00c5d70bfc
Merge branch 'drain-antiri' into 'next'
...
Make Ring Drain sectors play the depletion sound instead of the ring sound
See merge request STJr/SRB2!1315
2020-12-15 20:51:39 -05:00
James R
cab089c5b1
Merge branch 'gl-colormap-update' into 'next'
...
Fix animated skincolors in OpenGL (resolves #187 , #247 , #301 , #370 )
Closes #187 , #247 , #301 , and #370
See merge request STJr/SRB2!1301
2020-12-15 20:50:45 -05:00
James R
14c6d93c0c
Merge branch 'team-elementalfire' into 'next'
...
Player-Colored Elemental Fire for competitive gametypes
See merge request STJr/SRB2!1312
2020-12-15 20:47:45 -05:00
James R
804e049579
Merge branch 'intermission-double-free-fix' into 'next'
...
Fix double free occuring when unloading the intermission patches
See merge request STJr/SRB2!1304
2020-12-15 20:44:57 -05:00
James R
73a7365798
Merge branch 'circuit-finallap' into 'next'
...
Final lap text for circuit
See merge request STJr/SRB2!1303
2020-12-15 20:42:59 -05:00
James R
503364f5f8
Merge branch 'gme-spc-fix' into 'next'
...
Fix SPC looping on libgme versions >= 0.6.3
See merge request STJr/SRB2!1302
2020-12-15 20:40:10 -05:00
katsy
d999e436f1
GETFLAG
2020-12-14 20:23:24 -05:00
Zippy_Zolton
07034cf441
fixes spaces
2020-12-14 16:14:20 -06:00
Zippy_Zolton
9b8bacd088
Redone colormaps by SonicX8000
2020-12-14 12:52:24 -06:00
Jaime Ita Passos
3b36005ceb
Replace the first entry in the taglist, instead of adding into it
2020-12-14 14:13:24 -03:00
James R
d0f3a6d737
Better check for tag list userdata
2020-12-14 08:08:01 -08:00
James R
00dff6d283
Push "valid" only once
2020-12-14 05:53:57 -08:00
katsy
f09198788d
Merge remote-tracking branch 'stjr/next' into dusty
2020-12-14 05:39:35 -06:00
katsy
721170f5a0
lol
2020-12-14 05:32:51 -06:00
katsy
da7cdd92ff
Merge remote-tracking branch 'stjr/next' into dashaction
2020-12-14 05:10:01 -06:00