katsy
c19539248a
add sprung flag to steam
2020-12-31 04:38:26 -06:00
katsy
54d79415d5
add carry type to fans
2020-12-31 02:21:14 -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
GoldenTails
9327e96e4d
Pause the console refresh while startup wads are loading.
2020-12-26 17:19:14 -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
GoldenTails
81ee4a75e3
Copy colormaps so Lua cannot modify cached colormaps! (And Z_Free them on garbage collection.)
2020-12-18 02:24:20 -06:00
GoldenTails
f91489bcb6
Make the colormap returned by v.getColormap() writable.
...
I mean it was already readable anyway...
2020-12-18 02:24:20 -06: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
katsy
4521827e2c
you too
2020-12-14 04:06:28 -05:00
katsy
200e444016
go away whitespace
2020-12-14 04:05:14 -05:00
katsy
2bebaf12d0
add checks for new flag, make emergency jump call shieldspecial
2020-12-14 04:03:14 -05:00
katsy
dfbb1825f4
ditto
2020-12-14 04:02:17 -05:00
katsy
0ce9d9127a
add SF_NOSHIELDABILITY
2020-12-14 04:01:50 -05:00
katsy
2b23468359
remove amy
2020-12-14 02:36:00 -05:00
Zippy_Zolton
c247b94be7
Merge branch 'next' of https://github.com/STJr/SRB2 into text-color
2020-12-14 00:16:38 -06:00
Roberto Ierusalimschy
69e0240978
tables and strings respect __len metamethod
2020-12-13 21:25:11 -08:00
Jaime Ita Passos
6160a2d0fe
Fix a misuse of levelflat_t.picture in OpenGL (Kitchen Sink SRB2 port)
2020-12-14 02:07:12 -03:00
Jaime Ita Passos
ca78fc69ca
Restore the viewpoint's angle in R_DrawPlanes instead
2020-12-14 01:14:55 -03:00
Jaime Ita Passos
7e0a1709de
Fix a crash in Picture_GetPatchPixel with PICFMT_DOOMPATCH formats
2020-12-14 00:53:42 -03:00
James R
760e083c30
Merge branch 'fix-playintro-crash' into 'next'
...
Fix intro crash
See merge request STJr/SRB2!1310
2020-12-13 22:17:25 -05:00
Steel Titanium
83e80eef9b
Add deprecation warning when using the level header parameter
2020-12-12 18:54:47 -05:00
James R
5bb221b3bf
Yeah Fuck You SEENAMES
2020-12-12 15:39:13 -08:00
James R
a86a7822d1
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-12 15:38:46 -08:00
James R
75633bde50
Replace all instances of P_AproxDistance with FixedHypot
2020-12-12 14:53:54 -08:00
Sally Coolatta
e19196a86e
Use R_PointToDist2 instead
...
Apparently overflows less often
Actually, lets just fix FixedHypot instead.
Now FixedHypot uses the code from R_PointToDist2, and R_PointToDist2 just calls FixedHypot.
Ultimately, this branch was intended to get rid of a redundant way to retrieve distance and replace it with the one that was actually good at its job. So consolidating FixedHypot and R_PointToDist2 together is just an extension of that.
2020-12-12 14:49:26 -08:00
Sally Coolatta
c5474436af
Use FixedHypot over P_AproxDistance
...
Not convinced that the small speed benefit from P_AproxDistance is worth the "aproximate"[sic] results it gives. Let's instead try a define to replace it with FixedHypot. In Lua, the function gives a deprecated warning.
Inspired by the hyperwall fix for vanilla, except for everything. From little testing, actively improves waypoint checks, bumping, speed checks, wall collisions, Jawz targetting, Lightning Shield attacks, so on.
The only way I see this as a potential downgrade is A_Look (and related functions) getting slower, which are barely used in Kart.
2020-12-12 14:49:25 -08:00
James R
e94bccc503
Merge branch 'apng-downscale' into 'next'
...
Add aPNG downscaling
See merge request STJr/SRB2!1197
2020-12-12 17:39:56 -05:00
James R
9649a9fbae
Merge branch 'player-speed' into 'next'
...
Make player->speed and other things use R_PointToDist2
See merge request STJr/SRB2!1309
2020-12-12 17:38:02 -05:00
James R
69ea84db80
Merge branch 'credits-229' into 'next'
...
Add Zolton and Ors to the credits
See merge request STJr/SRB2!1308
2020-12-12 17:35:29 -05:00
James R
7b6675178e
Merge branch 'oldguards' into 'next'
...
Kill remaining HAVE_BLUA and SEENAMES
See merge request STJr/SRB2!1319
2020-12-12 17:34:04 -05:00
James R
93e4f43e4b
Hooklib macros names -> uppercase + documentation
2020-12-12 03:16:30 -08:00
James R
c8cc9c7a6f
Remove trailing whitespace
2020-12-12 02:40:46 -08:00
James R
143ec3e40b
Merge branch 'master' into next
2020-12-12 02:38:51 -08:00
James R
b31c4db89d
Remove trailing whitespace
2020-12-12 02:37:03 -08:00
James R
e55d842d7f
Kill SEENAMES
2020-12-12 02:11:23 -08:00
James R
9ddeb5f589
Resolve GameQuit hook conflicts
2020-12-12 02:05:21 -08:00
James R
2778cc3ce9
Merge remote-tracking branch 'origin/next' into hooklib-refactor
2020-12-12 02:02:38 -08:00
katsy
2971156ba7
Update info.c
2020-12-11 23:39:42 -05:00
Steel Titanium
ab156e1709
Remove music slot compatibility
2020-12-11 23:11:15 -05:00
katsy
ddf743d521
make fire spindust dust fullbright
2020-12-11 20:59:14 -05:00
Zwip-Zwap Zapony
029e79024b
V_DrawCroppedPatch Lua exposure and improvements
...
Separated X and Y scale, and added colormap argument
Added V_*SCALEPATCH and V_PERPLAYER flags support
Made sx,sy,w,h into fixed-point values
Exposed to Lua as "v.drawCropped(...)"
(Also fix HWR_DrawStretchyFixedPatch ignoring vscale without pscale)
2020-12-11 23:43:38 +01:00
Zippy_Zolton
68de9f4bbe
Make Ring Drain sectors play the depletion sound instead of the ring sound
2020-12-11 12:34:30 -06:00
Zippy_Zolton
f2095b57fd
Player-Colored Elemental Fire for competitive gametypes
2020-12-10 20:37:50 -06:00
katsy
f79ded7c0b
scale minimum dashmode thok on actionspd, not normalspeed
2020-12-10 20:52:06 -05:00
Jaime Ita Passos
440f46144a
Fix intro crash
2020-12-10 22:01:53 -03:00
Zippy_Zolton
916cacb38f
snailer
2020-12-10 19:01:09 -06:00
Jaime Ita Passos
3472b3ece3
Fix ERZ3 mode
2020-12-10 21:55:22 -03:00
Zippy_Zolton
317c107064
Make player->speed use R_PointToDist2
2020-12-10 16:09:43 -06:00
James R
69d98b22ad
Credits: add Zolton and Ors to the programming section
2020-12-10 13:40:47 -08:00
James R
29745f80dc
Merge branch 'lua-skinsprites' into 'next'
...
Lua: Allow access to skin.sprites[]
See merge request STJr/SRB2!1238
2020-12-10 15:49:48 -05:00
James R
e05433f282
Merge branch 'fix-gl-draw-cropped' into 'next'
...
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.
See merge request STJr/SRB2!1297
2020-12-10 15:44:51 -05:00
James R
6d3442a5d7
Merge branch 'saloondoor-revengeance' into 'next'
...
Saloon door fixes (closes #394 )
Closes #394
See merge request STJr/SRB2!1296
2020-12-10 15:43:31 -05:00
James R
d8bf015467
Merge branch 'caret-color-letter' into 'next'
...
Make caret coloring support letters.
See merge request STJr/SRB2!1295
2020-12-10 15:41:02 -05:00
James R
7e8fc66654
Merge branch 'brak' into 'next'
...
Fix brak barrier size (Closes #139 )
Closes #139
See merge request STJr/SRB2!1294
2020-12-10 15:39:42 -05:00
James R
fc5708b2f2
Merge branch 'firemelt' into 'next'
...
Fix objects with MF_FIRE disappearing in lava (Closes #366 )
Closes #366
See merge request STJr/SRB2!1287
2020-12-10 15:37:57 -05:00
James R
c6dd218e2b
Merge branch 'dehacked-hell-bruh' into 'next'
...
Fix some stuff I missed when rebasing `spritestuff2` to `dehacked-hell`... oops
See merge request STJr/SRB2!1286
2020-12-10 15:36:01 -05:00
James R
8c74dd26a9
Merge branch 'ffloorclip-fixes' into 'next'
...
ffloorclip fixes (resolves #385 and #391 )
Closes #385 and #391
See merge request STJr/SRB2!1284
2020-12-10 15:35:39 -05:00
James R
e46c6e75f3
Merge branch 'metal-sigfpe' into 'next'
...
Fix a division by zero in BCZ2 Metal Sonic's routine
See merge request STJr/SRB2!1283
2020-12-10 15:35:03 -05:00
James R
413fa89555
Merge branch 'fixargstr' into 'next'
...
Fixargstr
See merge request STJr/SRB2!1280
2020-12-10 15:31:05 -05:00
James R
0b2e60ba1d
Merge branch 'my-junk' into 'next'
...
Initialize dummy linedef tag lists
See merge request STJr/SRB2!1279
2020-12-10 15:29:10 -05:00
James R
5a0d3981f1
Merge branch 'super-giverings' into 'next'
...
Make P_DoSuperTransformation (with giverings) only set 50 rings if you have less than 50
See merge request STJr/SRB2!1278
2020-12-10 15:27:01 -05:00
James R
9ea969b62d
Merge branch 'gamequit-argument' into 'next'
...
Send a `quitting` argument to the GameQuit Lua hook.
See merge request STJr/SRB2!1276
2020-12-10 15:25:52 -05:00
James R
f180a1fc3c
Merge branch 'holy-zip' into 'next'
...
Disallow pk3s with extra bytes
See merge request STJr/SRB2!1275
2020-12-10 15:21:20 -05:00
James R
ef6f69ee22
Merge branch 'CR_BRUH' into 'next'
...
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
See merge request STJr/SRB2!1274
2020-12-10 15:20:11 -05:00
James R
703631956b
Merge branch 'dumb-stuff' into 'next'
...
Fix TC_DASHMODE not accessible to v.getColormap; add missing skin flags
See merge request STJr/SRB2!1273
2020-12-10 15:17:28 -05:00
James R
ee48fa2de3
Merge branch 'mario1up' into 'next'
...
Fix normal one-up sound playing in Mario mode
See merge request STJr/SRB2!1272
2020-12-10 15:15:08 -05:00
James R
9a77cf6306
Merge branch 'lastlineshit' into 'next'
...
Allow player.lastlinehit and player.lastsidehit to be usable outside of Knuckles' climbing ability
See merge request STJr/SRB2!1271
2020-12-10 15:14:16 -05:00
James R
1d31fe3759
Merge branch 'exposed!!!' into 'next'
...
Expose player.skin and player.availabilities to Lua as Read-only
See merge request STJr/SRB2!1269
2020-12-10 15:09:55 -05:00
James R
77c51c62c2
Merge branch 'expose-selectheading' into 'next'
...
Expose mapheader_t's selectheading option to Lua
See merge request STJr/SRB2!1268
2020-12-10 15:07:23 -05:00
James R
857113b60e
Merge branch 'crunchyroll' into 'next'
...
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
See merge request STJr/SRB2!1267
2020-12-10 15:07:01 -05:00
James R
8701caa110
Merge branch 'blua-urite' into 'next'
...
Fix crash when trying to use bitwise NOT on true/false/nil
See merge request STJr/SRB2!1262
2020-12-10 15:03:39 -05:00
James R
c841750868
Merge branch 'no-spin-jump' into 'next'
...
Fix a Few Spin Related Bugs (Closes #286 and #360 )
Closes #286 and #360
See merge request STJr/SRB2!1256
2020-12-10 15:02:29 -05:00
James R
4275d52267
Merge branch 'marathon-mode-tokens' into 'next'
...
Fix emeralds, tokens, etc not resetting when restarting marathon mode in first level
See merge request STJr/SRB2!1252
2020-12-10 14:57:23 -05:00
Louis-Antoine
3aecc22764
Add a shorthand alias for FRACUNIT
2020-12-10 11:49:29 -08:00
Louis-Antoine
39a320734d
Add shorthand aliases for fixed-point functions
2020-12-10 11:48:40 -08:00
James R
a5d228773d
Merge branch 'reload-bans' into 'next'
...
Fix reloadbans clearing ban.txt and clearbans not actually saving the changes
See merge request STJr/SRB2!1215
2020-12-10 14:28:13 -05:00
James R
e4cf8ebcf5
Merge branch 'what-is-a-standard'
2020-12-10 11:23:53 -08:00
James R
dbd8903a53
Use ref for pushing error handler
2020-12-10 08:50:23 -08:00
James R
3f7c2ae0b0
Avoid using multiple tables to fetch hook
...
String hooks still use a table to fetch the id, but the id indexes a C array.
Also I fixed a missing call in the MusicChange hook.
2020-12-10 05:42:53 -08:00
James R
e0a307da15
Merge branch 'next' into hooklib-refactor
2020-12-10 03:09:24 -08:00
James R
0df5d8ff58
Oops!
2020-12-10 03:06:41 -08:00
James R
2ab71571aa
Merge branch 'high-resolution-timer-2' into next
2020-12-10 02:55:02 -08:00
James R
8d382e49fb
Big Large Lua Hooklib Refactor
...
* Hooks are no longer a mess of lua boiler plate. Helper functions reduce hooks
to, at the most basic level, only two calls.
* Lua tables (the array part) are used to index hooks. Such tables contain only
hooks of the same type.
* Hook types are defined in one place so you no longer need to sync up the enum
and name array.
2020-12-10 00:36:41 -08:00
James R
e7883f3f8e
That moment when you see HAVE_BLUA crawl back from the grave
...
This would mean MapChange hasn't been firing for demos ...since 2.2.5.
2020-12-10 00:36:14 -08:00
Zippy_Zolton
7082db485b
CTF text 2, branch is finished
2020-12-08 16:09:51 -06:00
Zippy_Zolton
1b888c689c
CTF text 1
2020-12-08 15:56:45 -06:00
Zippy_Zolton
45a4b728b3
zwip suggestion
2020-12-08 12:05:06 -06:00
Steel Titanium
c2de684150
Fix double free occuring when unloading the intermission patches due to the same patch being cached twice
2020-12-07 17:54:08 -05:00
Zippy_Zolton
2721725962
Final lap text for circuit
2020-12-07 16:46:05 -06:00
Steel Titanium
11bbad9be8
Tab fix
2020-12-06 22:58:17 -05:00
Steel Titanium
c3a560f51d
Let's check for looping first
2020-12-06 22:30:50 -05:00
Steel Titanium
284205baac
Fix SPC looping on libgme versions >= 0.6.3
2020-12-06 22:20:06 -05:00
Jaime Ita Passos
18ee97c583
Fix animated skincolors in OpenGL
2020-12-06 20:17:14 -03:00
Jaime Ita Passos
6f9c48a305
Move a few mobj spawn defaults to its own function
2020-12-06 17:46:35 -03:00
Jaime Ita Passos
24ba782144
Fix archived mobjs having no default blend mode and sprite scales
2020-12-06 17:29:20 -03:00
GoldenTails
6546fc8ce7
Fix HWR_DrawCroppedPatch scaling a patch when cropping the top and left sides.
2020-12-06 12:01:31 -06:00
Tatsuru
3b85abdee7
Kill saloon doors without a tracer, add height check for non-blocking doors
2020-12-06 14:11:08 -03:00
GoldenTails
233990099d
Make caret coloring support letters.
2020-12-06 04:28:12 -06:00
katsy
8f4d23197c
space
2020-12-06 04:32:30 -05:00
katsy
5853a0b4d8
Revert "add noclipheight on chaingrab"
...
This reverts commit 8541409329
2020-12-06 07:44:59 +00:00
katsy
ffd20ee753
Revert "ensure the new flag is cleared properly"
...
This reverts commit 3dbb44e7b1
2020-12-06 07:44:49 +00:00
katsy
2fcf613a31
brak barrier is scaled up by 2x in gameplay, the actual object's parameters should be halved
2020-12-06 00:13:10 -05:00
katsy
fd4674971a
Replace p_inter.c
2020-12-06 00:10:45 -05:00
katsy
768ee57057
Replace p_user.c
2020-12-06 00:10:28 -05:00
katsy
3dbb44e7b1
ensure the new flag is cleared properly
2020-12-05 23:17:01 -05:00
katsy
8541409329
add noclipheight on chaingrab
2020-12-05 23:13:47 -05:00
GoldenTails
f6af04ecbb
Fix weird spelling mistake
2020-12-05 05:00:59 -06:00
James R
0b0f2e1e35
Invalidate taglist userdata
2020-12-05 02:26:00 -08:00
James R
5d1040c924
Reset taggroup iterator on successive calls
2020-12-05 02:08:00 -08:00
James R
8dd964e3a7
Lua: taglist.add and taglist.remove for sector tag lists
2020-12-05 02:02:06 -08:00
James R
e5a3e6a845
Fix removing a tag unsetting the bit array even if more elements with that tag exist
2020-12-05 01:14:52 -08:00
James R
ae663e7247
Don't realloc twice when adding to the taggroup
2020-12-05 00:46:51 -08:00
James R
828d7e71ce
Fix uninitialized last element when using Taggroup_Remove
2020-12-05 00:36:54 -08:00
James R
314fd2783a
Lua tag lists
...
Index and take length of tag lists like a table, 1-indexed. There are three
methods which may be used on tag lists:
list:iterate() - returns an iterator over the tags in the list
list:has(tag) - returns a boolean whether the tag is in the list
list.shares(list2) - returns whether two lists share a tag
"find" is also an alias to "has". Each method may be accessed from the global
taglist library too, e.g. taglist.iterate(list)
Tag lists may be compared with an equality operator too. This will tell you if
the two lists are composed of identical tags.
Accessible from sector.taglist, line.taglist and mapthing.taglist.
2020-12-04 13:53:27 -08:00
James R
c2217bb426
Mkae Lua taggroups indexable
...
They are 1-indexed.
2020-12-04 04:54:12 -08:00
James R
96851e52a1
hehehehehe what if I forgot to git add?
2020-12-04 02:27:46 -08:00
James R
621efbfa15
Lua taglib for accessing taggroups
...
The global "tags" can be iterated upon for every unique tag which is set in the
level. If a tag is set on a sector/line/thing, it will be included. Taking the
length of "tags" will give you the number of these unique tags. (If a tag is
set on multiple sectors/lines/things, it will only be counted once though.)
For sectors, lines and mapthings, call the field "tagged". This function takes
one argument, which is the tag. The return value can be iterated over for all
the sectors/lines/things with that tag. The length can also be taken for the
number of such objects. If no argument is given, the global tag is default.
2020-12-04 00:30:08 -08:00
Jaime Ita Passos
2017eb4d9e
Fix polyobject segs messing with 3D floors they shouldn't be
2020-12-04 00:03:54 -03:00
Steel Titanium
4c53eabc59
Reword the error to be more consistent with other errors
2020-12-03 21:14:27 -05:00
Steel Titanium
7d45a7c91a
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-skinsprites
2020-12-03 17:29:08 -05:00
Tatsuru
fae845f935
Initialize in p_spec.c too + magic number replacement
2020-12-03 17:50:10 -03:00
Zippy_Zolton
29f56fb2d8
g
2020-12-03 02:05:10 -06:00
Zippy_Zolton
c28bd8005e
Fix fire objects disappearing in lava
2020-12-03 01:28:54 -06:00
GoldenTails
b5526312e7
Fix missing stuff
2020-12-02 19:47:00 -06:00
Radicalicious
c98108df27
Revert "Update hw_light.c"
...
This reverts commit b254439592
2020-12-03 00:46:28 +00:00
Jaime Ita Passos
47b8c0648b
Don't clip if the 3D floor is fog
2020-12-02 15:34:11 -03:00
Jaime Ita Passos
0ffb241c0a
Fix 3D floor culling with polyobject segs
2020-12-02 15:31:11 -03:00
Tatsuru
a67862665a
Don't spawn the projectile if you're just gonna delete it
2020-12-02 12:05:40 -03:00
Radicalicious
b254439592
Update hw_light.c
2020-12-02 00:17:57 -05:00
Nev3r
4d716cb170
Move the numerical arg check below so that the string gets checked first (who decided to give them such similar names anyway).
2020-12-01 19:44:58 +01:00
Nev3r
30ab512c3c
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
...
# Conflicts:
# src/dehacked.c
2020-12-01 18:56:42 +01:00
Nev3r
c8ae28bbaf
Follow GZDoom's convention for stringargs.
2020-12-01 18:35:24 +01:00
Zachary McAlpin
7fde15d066
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-30 23:48:49 -06:00
James R
d004515d6a
Fix double define
2020-11-30 19:04:23 -08:00
Zippy_Zolton
69248cc684
thanks zap
2020-11-30 16:39:24 -06:00
Tatsuru
9770368ee9
Initialize junk line tag lists
2020-11-30 18:21:06 -03:00
Zippy_Zolton
20d1811983
oops
2020-11-30 12:05:45 -06:00
Zippy_Zolton
da1a3029a9
overhaul
2020-11-30 12:04:35 -06:00
Zippy_Zolton
412f3fc42b
P_GivePlayerRings
2020-11-29 17:39:54 -06:00
Zippy_Zolton
f913d60a9f
Make P_DoSuperTransformation (with giverings) add 50 rings instead of setting it
2020-11-29 17:16:57 -06:00
GoldenTails
119d2e9e37
Remove the rest of the Playing() checks for GameQuit hook
2020-11-29 16:53:29 -06:00
LJ Sonic
eef3028110
Merge branch 'fix-stacktrace' of https://git.do.srb2.org/STJr/SRB2.git into next
...
# Conflicts:
# src/dehacked.c
# src/dehacked.h
2020-11-29 21:54:15 +01:00
Zachary McAlpin
51d52f7327
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-29 13:59:10 -06:00
GoldenTails
b389700de3
Always call GameQuit when quitting via the Quit menu option on the title screen.
2020-11-29 08:32:04 -06:00
GoldenTails
59d2646593
Send a quitting argument to the GameQuit Lua hook
2020-11-29 08:30:50 -06:00
Nev3r
ecb333511b
Merge branch 'fix-playercmd' into 'next'
...
Fix PlayerCmd not handling angle and aiming correctly
See merge request STJr/SRB2!1265
2020-11-29 05:30:01 -05:00
Nev3r
bcf6823cbf
Merge branch 'dehacked-hell' into 'next'
...
Split dehacked.c into multiple files.
See merge request STJr/SRB2!1222
2020-11-29 05:18:45 -05:00
James R
445d040795
Don't print W_VerifyFile errors more than once
2020-11-28 20:51:21 -08:00
SMS Alfredo
95dfb93a11
Allow non-player objects to apply the CR_PLAYER carry type without crashing the game
2020-11-28 22:03:02 -06:00
James R
6b4d422664
Don't add pk3 if there are holes
...
ZIP tools often read the final central directory, but SRB2 may not if there are
multiple central directories. It's just easier to not allow "holes", or
unaccounted for bytes in the file.
2020-11-28 20:00:01 -08:00
James R
75c5c8ba6a
Add missing *individual* skin flags
2020-11-28 02:22:08 -08:00
James R
b9f6069cd0
Replace TC macros with an enum that automatically counts up
...
Also fixes TC_DASHMODE not being accessible to Lua.
2020-11-28 02:19:52 -08:00
Zachary McAlpin
0280721f08
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-26 10:39:41 -06:00
Zippy_Zolton
db6b0c6aa0
Fix normal one-up sound playing in Mario mode
2020-11-25 21:46:45 -06:00
James R
4ab667c6a0
Merge branch 'spritestuff2-fixes' into 'next'
...
Some fixes for spritestuff2
See merge request STJr/SRB2!1264
2020-11-25 19:26:49 -05:00
SMS Alfredo
5c71fe0710
Allow player.lastlinehit and player.lastsidehit to be used outside of Knuckles' climbing ability
2020-11-25 14:31:24 -06:00
SMS Alfredo
b2d6d4f83f
Expose player.skin and player.availabilities to Lua as Read-only
2020-11-25 12:35:36 -06:00
Zachary McAlpin
d095517999
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into expose-selectheading
2020-11-24 20:42:08 -06:00
Zachary McAlpin
76822cef2b
Expose the selectheading option from mapheader_t in Lua
2020-11-24 20:41:11 -06:00
lachwright
87968c946b
Prevent non-CA2_SPINDASH characters from getting crushed by roll-jumping into a crevice
2020-11-24 14:56:22 +11:00
GoldenTails
930b5ea442
Replace credits with original authors
2020-11-23 21:42:33 -06:00
GoldenTails
8fef61aa29
Split dehacked.c into multiple files.
2020-11-23 21:42:26 -06:00
GoldenTails
d806655769
Fix a dumb typo of luaL_checklstring i made whoops
2020-11-23 21:20:17 -06:00
Jaime Ita Passos
5bdee63117
Fix a crash
2020-11-23 12:53:59 -03:00
SMS Alfredo
fe066b3ef2
...snickerdoodles
2020-11-23 09:23:02 -06:00
SMS Alfredo
ea7e06a616
Remove PF_SPINNING when jumping if you have SF_NOJUMPDAMAGE
2020-11-23 09:21:00 -06:00
SMS Alfredo
7b05ffd92d
Revert "Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING"
...
This reverts commit ad9bf6085f
2020-11-23 09:18:05 -06:00
SMS Alfredo
7bbd563b73
Remove unneeded S_PLAY_ROLL check
2020-11-22 23:23:35 -06:00
LJ Sonic
7ff6443659
Fix PlayerCmd not handling angle and aiming correctly
2020-11-23 01:23:34 +01:00
James R
8d71559afe
Merge branch 'make-some-lua-globals-rw' into 'next'
...
Make several Lua global variables writable.
See merge request STJr/SRB2!1233
2020-11-22 18:47:53 -05:00
James R
8a30576d81
Merge branch 'plane-sorting-fix-part-3' into 'next'
...
Improved sprite sorting against 3d floors
See merge request STJr/SRB2!1235
2020-11-22 18:31:23 -05:00
James R
f39300ac74
Merge branch 'master' into no-dd-make
2020-11-22 15:29:37 -08:00
James R
6d9e036c7f
Merge branch 'master' into next
2020-11-22 15:23:12 -08:00
James R
b059ed40c6
Merge remote-tracking branch 'origin/what-is-a-standard-2'
2020-11-22 15:19:39 -08:00
James R
40e954779e
Resolve one last conflict in splat sorting
...
Can't use gz/gzt because there is no transformation to make those work
differently for splats.
2020-11-22 15:12:34 -08:00
Jaime Ita Passos
5293c52bca
Remove SHORT macros for referencing patch width/height/offsets
2020-11-22 20:02:47 -03:00
James R
54da9552de
Merge remote-tracking branch 'origin/next' into plane-sorting-fix-part-3
2020-11-22 14:41:42 -08:00
James R
30792e7820
Merge branch 'flame-orb' into 'next'
...
Flame Shield & Thunder Shield Adjustment (Closes #363 )
Closes #363
See merge request STJr/SRB2!1220
2020-11-22 17:31:23 -05:00
James R
92625483a4
Merge branch 'replay-height-fix' into 'next'
...
Made height/spinheight and height change values in replays more accurate
See merge request STJr/SRB2!1241
2020-11-22 17:25:41 -05:00
James R
bec85c033a
Merge branch 'replay-camera-update' into 'next'
...
Make the replay camera follow the player
See merge request STJr/SRB2!1243
2020-11-22 17:23:38 -05:00
James R
eb28532244
Merge branch 'remove-unused-music-types' into 'next'
...
Remove unused music type enums
See merge request STJr/SRB2!1253
2020-11-22 17:16:35 -05:00
James R
6d6eb79226
Merge branch 'uncap-palettes' into 'next'
...
Uncap palette lump palettes & allow flashpal palettes to display during pause
See merge request STJr/SRB2!1255
2020-11-22 17:16:21 -05:00
James R
b2a84a9376
Merge remote-tracking branch 'origin/master' into no-dd-make
2020-11-22 14:14:43 -08:00
Jaime Ita Passos
2e21168395
Free GPU textures when adding a file
2020-11-22 18:23:35 -03:00
Riku Salminen
b9fa50f7ef
No need to reset tokens twice
2020-11-22 23:23:32 +02:00
Riku Salminen
f51be77aa2
Now the fix actually does what the MR says... +lua banks
2020-11-22 23:19:24 +02:00
Jaime Ita Passos
0645c642d2
Improve GPU texture management.
2020-11-22 18:18:26 -03:00
Jaime Ita Passos
abe35fd008
Some interface fixes
2020-11-22 17:22:18 -03:00
Jaime Ita Passos
152c540c1e
Fix sprite textures in models
2020-11-22 17:10:10 -03:00
Jaime Ita Passos
9ab3acae2d
Change how texture deletion works in OpenGL
2020-11-22 17:03:04 -03:00
Jaime Ita Passos
071ec73389
Some fixes for spritestuff2
2020-11-22 03:47:15 -03:00
GoldenTails
e3c6d1cef3
Add NOECHOFILENAMES, if people don't want logspam.
2020-11-21 22:21:18 -06:00
James R
79bbb3fe46
Remove Direct Draw from the Makefiles
...
MINGW/MINGW64 implies SDL.
2020-11-21 15:19:54 -08:00
James R
5a8e653cd5
More concise
2020-11-21 13:43:32 -08:00
James R
377a9c10f0
Lua: disallow bitwise not on anything but number values
...
This fixes a crash.
2020-11-21 13:37:45 -08:00
GoldenTails
8cfa21fb20
Echo filenames when compiling without ECHO=1
2020-11-19 15:17:56 -06:00
GoldenTails
55f169f3c9
Move the GIF downscaling menu option up one to create some parity.
2020-11-19 13:45:04 -06:00
GoldenTails
12ac096a95
Add a menu option for aPNG downscaling.
2020-11-19 13:45:04 -06:00
GoldenTails
949c0c181d
Add aPNG downscaling, and its associated consvar.
2020-11-19 13:45:04 -06:00
Jaime Ita Passos
389763a550
Update R_DrawFloorSprite_NPO2_8 and R_DrawTranslucentFloorSprite_NPO2_8 to have the lastest NPO2 optimizations
2020-11-19 00:59:37 -03:00
Jaime Ita Passos
5e890ee6f8
Merge branch 'next' into spritestuff2
2020-11-19 00:52:43 -03:00
SMS Alfredo
9163e73092
Allow no spin characters to water skip while spinning
2020-11-18 12:35:40 -06:00
SMS Alfredo
7ad8aa1477
Allow the Forcespin sector type to be used with intangible fofs
...
Didn't think simply removing the P_IsObjectOnGround was gonna work, but apparently it does.
2020-11-18 12:27:09 -06:00
SMS Alfredo
01a03a4daa
lmao formatting
2020-11-18 12:03:48 -06:00
SMS Alfredo
09644d69c0
Don't force S_PLAY_SPIN when landing with PF_SPINNING if you have certain PA flags
2020-11-18 12:01:06 -06:00
SMS Alfredo
16fd754a39
Allow forcespin sectors to work on no spin characters
2020-11-18 11:49:17 -06:00
SMS Alfredo
ad9bf6085f
Fix no spin characters being able to damage enemies with their jump out of a spin without removing PF_SPINNING
2020-11-18 11:28:31 -06:00
James R
85c5fa9527
Merge branch 'unfuck-icon-mac' into 'next'
...
Use SDL version of executable icon at runtime on macOS
See merge request STJr/SRB2!1250
2020-11-17 20:24:42 -05:00
SMS Alfredo
fb40a28365
Do deh thing
2020-11-17 11:47:33 -06:00
lachwright
5454068843
Uncap palette lump palettes & allow flashpal palettes to display during pause
2020-11-16 17:37:12 +11:00
lachwright
26b6b33220
Add parentheses
2020-11-15 15:52:55 +11:00
Louis-Antoine
b03d2b16ed
Delete unneeded check
2020-11-15 01:24:12 +01:00
James R
50e15840fb
Merge branch 'udmf-multitag' into 'next'
...
UDMF: Multitag support
See merge request STJr/SRB2!1097
2020-11-14 19:18:14 -05:00
James R
d3199ac779
Fix one last instance of printing address diff
2020-11-14 16:18:54 -08:00
Louis-Antoine
13ba25f4fe
Only call the Lua API for overridden actions
2020-11-15 01:15:58 +01:00
James R
33193db146
Remove unused music type enums
2020-11-14 15:56:40 -08:00
Louis-Antoine
7e7de16e6b
Fix typo
2020-11-15 00:53:46 +01:00
Louis-Antoine
f0fdcfb92b
Delete outdated comment
2020-11-15 00:52:51 +01:00
James R
2a35e0d59f
Merge branch 'lua-musicfuncs' into 'next'
...
Expose more music functions to Lua
See merge request STJr/SRB2!1230
2020-11-14 18:51:22 -05:00
James R
dfeddafc03
Merge branch 'nolua2' into 'next'
...
Don't let Lua set cvars that have CV_NOLUA
See merge request STJr/SRB2!1245
2020-11-14 18:37:21 -05:00
James R
11bb835a45
Merge branch 'precip-bad-access' into 'next'
...
Fix potential crash with precipitation in OpenGL
See merge request STJr/SRB2!1249
2020-11-14 18:33:58 -05:00
Nev3r
3a8b2a6fb7
Better documentation.
2020-11-14 20:50:34 +01:00
Nev3r
cc98be4d23
Add documentation for the iterator macros.
2020-11-14 20:25:00 +01:00
Riku Salminen
0a1beab8c8
Reset a couple of other variables while we're at it
2020-11-14 20:17:35 +02:00
Riku Salminen
8814980a06
Emeralds and tokens now reset when restarting marathon mode in first level
2020-11-14 19:18:36 +02:00
lachwright
a65fc9f622
Reallow P_MobjSpawn to change the scale of objects spawned from mapthings
2020-11-15 02:53:10 +11:00
lachwright
8f570eaa97
Use SDL version of executable icon at runtime on macOS
2020-11-15 01:13:41 +11:00
Monster Iestyn
a38a6a9dc0
Split off actual skin-setting code from SetPlayerSkinByNum so that both SetPlayerSkin and SetPlayerSkinByNum can call it, rather than to each other
2020-11-13 20:49:18 +00:00
Louis-Antoine
01124f2076
Fix Lua stacktrace not showing in various situations
2020-11-13 19:12:25 +01:00
Louis-Antoine
de70934552
Add missing lua_pop call
2020-11-13 18:19:13 +01:00
Louis-Antoine
04826d2615
Replace lua_pop(-1) with lua_settop(0)
2020-11-13 15:31:11 +01:00
Nev3r
70512f11ff
Merge branch 'udmf-multitag' into udmf-fofs-mkii and pray
...
# Conflicts:
# src/p_floor.c
# src/p_spec.c
2020-11-13 13:23:14 +01:00
Nev3r
1a8ec39f6c
Remove direct definition for D__USE_MINGW_ANSI_STDIO, as the latest standards consider this to be deprecated.
2020-11-13 11:33:27 +01:00
James R
e3c8415627
OpenGL: don't access field that doesn't exist in precipmobj_t
2020-11-13 00:46:03 -08:00
Nev3r
7dd83285b8
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
2020-11-12 14:30:24 +01:00
Nev3r
072e1889e2
Fix size_t/INT32 compare.
2020-11-12 13:59:21 +01:00
Nev3r
2c8a99f25a
Add a level parameter to the iterators to account for nesting, and thus avoid variable shadowing.
2020-11-12 13:48:14 +01:00
Nev3r
a8f554075f
Extern the global tag groups properly.
2020-11-12 12:25:02 +01:00
Nev3r
a931d09e7d
Forgot to change %d to %s for sizeu1().
2020-11-10 13:11:42 +01:00
Nev3r
56c3e93d3a
Remove unused tag parameter.
2020-11-10 13:10:01 +01:00
Nev3r
a405f17d0b
Missing prototype.
2020-11-10 13:09:30 +01:00
Riku Salminen
91a34575a7
Declared the cvar in netcmd to get rid of warnings
2020-11-10 13:53:31 +02:00
Nev3r
676f7f5dbf
Use memmove()
2020-11-10 12:45:30 +01:00
Nev3r
b65211d148
Use sizeu1()
2020-11-10 12:34:08 +01:00
Nev3r
d5355a11b0
Indent
2020-11-10 12:23:30 +01:00
Nev3r
95a61a226b
rename TAG_ITER_C to TAG_ITER_DECLARECOUNTER and remove the semicolon from the macro.
2020-11-10 12:22:55 +01:00
Riku Salminen
3dff612f3c
Try to add cvars for old camera
2020-11-10 13:21:34 +02:00
Riku Salminen
33725a58b4
Update p_tick.c, Replacing mobj angle with cmd angleturn
2020-11-10 13:21:34 +02:00
Riku Salminen
aea35171c2
Update p_tick.c, got rid of an useless angle change function
2020-11-10 13:21:34 +02:00
Riku Salminen
2832586274
Make the replay camera follow the player
2020-11-10 13:21:33 +02:00
Nev3r
1d542d3676
Add copyright notices.
2020-11-10 12:12:16 +01:00
Nev3r
fb9432ae57
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
2020-11-10 11:46:53 +01:00
James R
b62a3b623a
Don't let Lua cvar setting functions work on CV_NOLUA vars
2020-11-09 18:54:00 -08:00
James R
4fcca22343
Merge branch 'step-up-goofs-2' into 'next'
...
Fix disabling step up/down not working
See merge request STJr/SRB2!1219
2020-11-09 17:52:41 -05:00
Riku Salminen
3daee0ebf8
Made height/spinheight and height change values in replays more accurate
2020-11-09 17:01:20 +02:00
GoldenTails
fae4709f4b
Fix stupid divide-by-zero error
2020-11-08 23:28:20 -06:00
GoldenTails
9e6c0c31be
Add skincolor vars to the NetSave
2020-11-08 20:43:16 -06:00
Steel Titanium
bcaed4b95b
Remove unused music types
2020-11-08 21:33:12 -05:00
Steel Titanium
050a22f1ce
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs
2020-11-08 21:20:07 -05:00
James R
876aeb6a31
Merge branch 'allowshaders' into 'next'
...
Let the server or an admin toggle clients' custom shaders
See merge request STJr/SRB2!1181
2020-11-08 21:09:56 -05:00
Jaime Passos
b8f668b2e0
rename
2020-11-08 23:02:05 -03:00
James R
16f08d28e2
Merge branch 'hyperwalls-fix' into 'next'
...
Fix hyperwalls
See merge request STJr/SRB2!1232
2020-11-08 20:59:28 -05:00
James R
9e6f64ea22
Merge branch 'x' into 'next'
...
Whitelist missing graphics
See merge request STJr/SRB2!1189
2020-11-08 20:48:25 -05:00
James R
b2dc35864e
Merge branch 'pngpal-compare' into 'next'
...
Compare PNG palettes with the game's palette, instead of assuming they are the same
See merge request STJr/SRB2!1185
2020-11-08 20:46:07 -05:00
James R
bbd003976b
Merge branch 'write-thingies' into 'next'
...
The lump is not needed for P_WriteThings
See merge request STJr/SRB2!1231
2020-11-08 20:35:51 -05:00
James R
049237e50f
Merge branch 'gif-dynamic-delay-v2' into 'next'
...
EMERGENCY: By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option.
See merge request STJr/SRB2!1236
2020-11-08 19:33:03 -05:00
James R
097f204ceb
Merge branch 'register-metatables' into 'next'
...
Improve support for metatables in netgames
See merge request STJr/SRB2!1224
2020-11-08 19:30:51 -05:00
Louis-Antoine
9f851dc285
Return explicitly when failing to register a metatable
2020-11-09 00:16:40 +01:00
Steel Titanium
d26172661d
Remove spritedef field
2020-11-08 13:31:59 -05:00
Steel Titanium
83a87042f1
Push skin->sprites as light userdata
2020-11-08 13:25:56 -05:00
Louis-Antoine
87206a8c21
Show a console error if the gamestate contains too many tables
2020-11-08 17:33:49 +01:00
Louis-Antoine
e52cb7f6fa
Throw an error if too many metatables are registered
2020-11-08 17:20:25 +01:00
Steel Titanium
1320f10839
Allow access to skin.sprites[]
...
Only numframes so far though, as there's already a function for what spriteframe provides.
2020-11-07 23:55:37 -05:00
James R
c0dbc562bb
Fix floating point math
2020-11-07 13:48:37 -08:00
LJ Sonic
9b151ca45c
Merge branch 'resend-gamestate' into 'next'
...
Resend gamestate when resynching
See merge request STJr/SRB2!829
2020-11-07 13:14:32 -05:00
James R
515d7eeb9e
Let's try an experiment: move the epoch forward as I_GetTime is called
...
This will make it even longer until time wraps around. Have you ever run a
srb2 server for 4 years straight?
2020-11-07 01:57:09 -08:00
GoldenTails
9d11d8eec9
Remove 3 wasteful bytes of guaranteed blank memory from some place where it's not gonna matter that much
2020-11-07 03:49:21 -06:00
GoldenTails
d031bb5357
fix dumb memcpy
2020-11-07 03:43:55 -06:00
James R
b72789b0c9
Huge perfstats refactor
...
I needed to update it to make it functional with the precise timer. But I also
got sick of looking at the mess of sprintf followed by draw call.
2020-11-07 01:32:59 -08:00
James R
e5f37523b8
Use precise time for gif timing
2020-11-07 01:32:25 -08:00
James R
84ce53db60
Use high precision timer, replace I_GetTimeMicros with I_GetPreciseTime and I_PreciseToMicros
2020-11-07 01:31:24 -08:00
GoldenTails
e473bfd4cd
By default use the old gif_dynamicdelay v1 behavior, but keep v2 as an option.
2020-11-07 03:02:21 -06:00
Hannu Hanhi
cc8bd7ef59
Clarify license file mention in libdivide.h
2020-11-07 00:19:43 +02:00
James R
425b56c288
Remove win32 specific timer
2020-11-06 14:14:12 -08:00
James R
4ca994a05b
Merge branch 'gif-dynamic-delay-v2' into 'next'
...
Give the GIF recorder some memory so frame delays are a little more accurate
See merge request STJr/SRB2!1198
2020-11-06 17:10:45 -05:00
James R
0d97903573
Do not factor height into sprite thickseg sorting
2020-11-05 18:45:52 -08:00
James R
8d63a994f0
Remove unused stuff
2020-11-05 18:45:51 -08:00
James R
81cbf35560
Check that top of sprite is above plane or bottom is below
...
This fixes slightly raised fofs drawing on top of sprites that should be in
front of them. Previously would check that the bottom of the object was above
the plane. Now also uses sprite offsets like the fof seg sorting does.
2020-11-05 18:45:43 -08:00
GoldenTails
c70d5a9773
Make mapmusflags and mapmusname writable.
2020-11-05 18:12:35 -06:00
GoldenTails
365e02bb32
Make skincolor_* CTF color variables writable.
2020-11-05 17:38:32 -06:00
GoldenTails
2b39a971ac
Make stoppedclock writable.
2020-11-05 15:22:45 -06:00
GoldenTails
f42dee1871
Make displayplayer writable.
2020-11-05 13:43:33 -06:00
GoldenTails
8a0f55e4ad
Make gravity writable.
2020-11-05 12:39:03 -06:00
GoldenTails
113e6b6585
Make token writable.
2020-11-05 12:38:47 -06:00
GoldenTails
a502b09929
Make emeralds writable.
2020-11-05 12:37:49 -06:00
Jaime Passos
a655257f4b
Remove RF_VOXELSPRITE
2020-11-05 00:44:10 -03:00
Jaime Passos
36550725f3
P_DeleteFloorSpriteSlope -> P_RemoveFloorSpriteSlope
2020-11-05 00:42:14 -03:00
Jaime Passos
8f65b98c24
Remove NOWATER define
2020-11-05 00:00:08 -03:00
Jaime Passos
c07c80fd9e
Plane optimization and cleanup
2020-11-04 23:46:34 -03:00
Jaime Passos
805818d48e
R_DrawSplatSprite -> R_DrawFloorSprite
2020-11-04 21:43:16 -03:00
GoldenTails
1f7df8a790
Fix hyperwalls
2020-11-03 20:11:39 -06:00
Steel Titanium
d9bc621d17
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into lua-musicfuncs
...
# Conflicts:
# src/dehacked.c
2020-11-01 23:22:03 -05:00
James R
998a10e8ad
Merge remote-tracking branch 'origin/master' into next
2020-11-01 20:01:22 -08:00
James R
a653406e7a
Merge branch 'lua_expose-gamestate' into 'next'
...
Expose gamestate to Lua
See merge request STJr/SRB2!1229
2020-11-01 22:57:52 -05:00
James R
56d2290778
Merge branch 'cmake-fullscreen-fix' into 'master'
...
Cmake: fullscreen fix
See merge request STJr/SRB2!1226
2020-11-01 22:57:27 -05:00
James R
f2e15fc4f1
Merge branch 'cmake-curl-internal-fix' into 'master'
...
Fix compiling using cmake if internal libs is used
See merge request STJr/SRB2!1225
2020-11-01 22:57:12 -05:00
James R
4fc0e44c23
Merge branch 'copyright-fixes' into 'next'
...
Fix some copyright statements in new files
See merge request STJr/SRB2!1223
2020-11-01 22:56:58 -05:00
James R
18365f3820
Merge branch 'udmf-seg-length-crash-fix' into 'next'
...
UDMF Seg length crash fix
See merge request STJr/SRB2!1221
2020-11-01 22:55:13 -05:00
James R
f4b82f27db
Merge branch 'fix-objectplace-silent' into 'next'
...
Fix objectplace -silent
See merge request STJr/SRB2!1214
2020-11-01 22:52:46 -05:00
James R
33cfd2c72a
Merge branch 'mobjghost-rollangle' into 'next'
...
Ghost mobj matches rollangle (Closes #362 )
Closes #362
See merge request STJr/SRB2!1211
2020-11-01 22:49:50 -05:00
James R
fdbeafca42
Merge branch 'tailsoverlay-dash' into 'next'
...
Dash state for Tails overlay (Closes #325 )
Closes #325
See merge request STJr/SRB2!1210
2020-11-01 22:49:12 -05:00
James R
37931fc253
The lump is not needed for P_WriteThings
2020-11-01 19:31:10 -08:00
Steel Titanium
ac7781a3b3
Expose more music functions to Lua
2020-10-31 21:15:41 -04:00
Steel Titanium
41d8210fd5
Expose gamestate to Lua
2020-10-31 16:36:15 -04:00
Hannu Hanhi
54cc9db7a5
Fix CMake SSE3 flag
2020-10-31 18:04:44 +02:00
Hannu Hanhi
724d126015
Clarify licensing-related text in libdivide.h
2020-10-31 16:39:05 +02:00
lachwright
bfbcc69108
Draw save files from outwards in
2020-10-31 18:21:14 +11:00
Steel Titanium
62b5b86ed4
CMake: Fix fullscreen toggle not working
...
All because of a typo
2020-10-31 00:59:51 -04:00
Steel Titanium
d406340b5d
Fix compiling using cmake if internal libs is used
2020-10-30 23:37:34 -04:00
Louis-Antoine
1155d875d5
Use the same names as userdataType() for userdataMetatable()
2020-10-30 15:00:13 +01:00
Louis-Antoine
f943f247af
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into register-metatables
2020-10-30 14:46:04 +01:00
Zippy_Zolton
6c00a96755
thunder shield :D
2020-10-29 12:32:42 -05:00
Hannu Hanhi
c44120eb87
Fix some copyright statements in new files
2020-10-29 16:04:25 +02:00
Monster Iestyn
5241b83f97
Fix seg->length and flength not being set at all for UDMF maps
2020-10-28 19:36:03 +00:00
Zippy_Zolton
4e56caa196
Flame Shield Changes
2020-10-28 01:23:05 -05:00
Jaime Passos
0f9d85694d
Implement an "ignore colormaps" sprite rendering flag
2020-10-27 19:54:50 -03:00
Nev3r
3d2d44bfff
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-fofs-mkii
...
# Conflicts:
# src/p_user.c
2020-10-27 22:23:30 +01:00
Nev3r
ad9e3411a1
Rename bustable type BT_SPIN to BT_SPINBUST to avoid conflicts with next.
2020-10-27 22:13:10 +01:00
Jaime Passos
b03d95c5c6
Bug fixes
2020-10-27 17:02:35 -03:00
Nev3r
c62ef355ef
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into udmf-multitag
...
# Conflicts:
# src/lua_baselib.c
# src/lua_maplib.c
2020-10-27 20:48:25 +01:00
Louis-Antoine
e178966367
Remove useless condition
2020-10-27 20:28:54 +01:00
Louis-Antoine
395d1f1b8f
Do not pause the client while redownloading the gamestate
2020-10-27 20:23:32 +01:00
Louis-Antoine
804ad44e89
Fix music resetting after reloading the gamestate
2020-10-27 20:22:15 +01:00
Louis-Antoine
5c48b92b2c
Fix camera going wild after reloading the gamestate
2020-10-27 20:21:56 +01:00
Jaime Passos
b872222b50
Implement blend modes
2020-10-27 00:03:41 -03:00
Louis-Antoine
499bb56436
Only resend the gamestate to one client at a time
2020-10-27 01:22:31 +01:00
Louis-Antoine
7ae53364f2
Add a 15 seconds cooldown between successive gamestate resends
2020-10-27 01:20:05 +01:00
Louis-Antoine
9f5686ef48
Fix underflow in consistancy checking code
2020-10-26 23:15:22 +01:00
James R
18a2e87093
Check maxstep is not disabled before stepping up
...
Fixes infinite step up when it should be no step up.
2020-10-26 14:00:54 -07:00
Hannu Hanhi
86ad187f05
NPO2 slope span optimization
2020-10-26 00:26:15 +02:00
James R
afb8e6e181
Whoops
2020-10-24 20:44:42 -07:00
James R
713b965a85
Merge branch 'playah' into 'next'
...
Credits Changes
See merge request STJr/SRB2!1200
2020-10-24 21:54:40 -04:00
Zolton Auburn
9a0d65a0f1
Update f_finale.c
2020-10-24 20:17:20 -04:00
Zolton Auburn
24596bd8d5
Update f_finale.c
2020-10-24 20:16:21 -04:00
James R
9278f04fbf
Delete ban.txt if no bans to save
2020-10-24 15:59:11 -07:00
James R
288ffebea7
Do not save cleared ban list when reloading bans
2020-10-24 15:52:02 -07:00
James R
305f58077d
Fix objectplace -silent
2020-10-24 15:29:31 -07:00
Hannu Hanhi
244c76250f
Use SSE3 in 32-bit x86 binaries
2020-10-25 00:08:24 +03:00
Zippy_Zolton
5d4032fd00
Ghost mobj matches rollangle
2020-10-24 12:38:30 -05:00
Louis-Antoine
50d2c95470
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2.git into resend-gamestate
2020-10-24 16:21:44 +02:00
James R
e9fce20071
Merge remote-tracking branch 'origin/master' into next
2020-10-23 14:57:13 -07:00
James R
86c38e6d9a
Merge branch 'reverse-offsetof-macro' into 'next'
...
Turn the lua sector lines hack into a macro
See merge request STJr/SRB2!1187
2020-10-23 16:44:29 -04:00
James R
687e2d89cc
Merge branch 'set-cvars' into 'next'
...
Set cvars directly from Lua
See merge request STJr/SRB2!1205
2020-10-23 16:42:42 -04:00
James R
503e83653e
Merge branch 'skip-unused-mobj-hooks' into 'next'
...
Only invoke the Lua API for mobj hooks that need it
See merge request STJr/SRB2!1209
2020-10-23 16:40:07 -04:00
James R
fd63b50f44
Merge branch 'insert-wait' into 'next'
...
Do not let previous wait commands affect COM_BufInsertText
See merge request STJr/SRB2!1207
2020-10-23 16:38:46 -04:00
James R
5f772c1850
Merge branch 'fix-ghost-netvar-crash' into 'next'
...
Fix G_GhostTicker crashing trying to read netvars as ghost data
See merge request STJr/SRB2!1203
2020-10-23 16:37:49 -04:00
James R
135d0f91b0
Merge branch 'sw-npo2-span-opt' into 'next'
...
NPO2 span function optimization
See merge request STJr/SRB2!1201
2020-10-23 16:36:18 -04:00
Zolton Auburn
85692ac409
Update info.c
2020-10-23 14:04:02 -04:00
Zippy_Zolton
c0571b5fbf
g
2020-10-23 01:09:12 -05:00
Zippy_Zolton
a4459b6693
Dash state for Tails overlay
2020-10-23 00:47:47 -05:00
Louis-Antoine
37c11e0f2e
Fix unfortunate typos
2020-10-22 00:08:06 +02:00
Louis-Antoine
d349e9bf83
Only invoke the Lua API for mobj hooks that need it
2020-10-21 22:48:00 +02:00
James R
ba4b6ec400
Reset wait period for COM_BufInsertText
2020-10-21 12:34:26 -07:00
Louis-Antoine
5091c19abf
Kick clients that fail to catch up with server gamelogic
2020-10-21 20:25:29 +02:00
Zippy_Zolton
88c882fa9c
81
2020-10-20 19:59:33 -05:00
James R
39ccd12f04
Add CV_Set, CV_SetValue, CV_StealthSet, CV_StealthSetValue and CV_AddValue to Lua
...
CV_SetValue merged with CV_Set (same with CV_StealthSetValue and CV_StealthSet).
2020-10-20 16:08:34 -07:00
GoldenTails
1e0beab254
Add i_threads.h too
2020-10-20 15:58:34 -05:00
GoldenTails
31c410656c
Add multithreading option for CMake
2020-10-20 15:44:01 -05:00
Zippy_Zolton
0f771edfd5
SonicX orange
2020-10-20 15:11:00 -05:00
Zippy_Zolton
03198ab31d
SonicX aqua
2020-10-20 14:59:30 -05:00
Zolton Auburn
d1f16e0f77
Continue
2020-10-20 15:56:41 -04:00
Zippy_Zolton
45dd26476a
SonicX8000 purple, peridot, rosy
2020-10-20 14:52:25 -05:00
Zippy_Zolton
b65ac1df30
sonicx azure
2020-10-20 14:40:10 -05:00
Zippy_Zolton
0b48f1052a
pencilvoid aqua
2020-10-20 14:03:27 -05:00
Zippy_Zolton
4e985d7145
blue & red really seem like a hassle don't they
2020-10-19 20:36:59 -05:00
Zippy_Zolton
04eae86d0a
t
2020-10-19 19:58:50 -05:00
Steel Titanium
d6c0e0cf30
Fix G_GhostTicker crashing trying to read netvars as ghost data
...
Also fixed possible issue with incorrectly reading the demo pointer due to the wrong type being passed to sizeof in G_ConsGhostTic
2020-10-19 20:20:08 -04:00
Zippy_Zolton
81c9d2eae9
forgot to send this like 3 hours ago
2020-10-19 18:41:23 -05:00
Jaime Passos
dfc85ec21a
Include p_local.h
2020-10-19 17:38:02 -03:00
Jaime Passos
a21685812f
Rename R_DrawVisSplat to R_DrawSplatSprite, move into r_splats.c
2020-10-19 17:36:29 -03:00
Jaime Passos
dbc149f85a
Remove FLOORSPLATS define
2020-10-19 17:33:16 -03:00
Zippy_Zolton
d633f2495a
red abd bkyue sikbucx
2020-10-19 14:12:28 -05:00
Zippy_Zolton
e5c891932a
improvement
2020-10-18 23:47:14 -05:00
Zippy_Zolton
fed2fffaa1
better colors
2020-10-18 22:52:40 -05:00
Zippy_Zolton
5dc90289dc
thanks goldie
2020-10-18 21:59:34 -05:00
Zippy_Zolton
e2d686ba42
update
2020-10-18 17:45:46 -05:00
Zippy_Zolton
2403cbd57b
possibly final
2020-10-18 17:01:31 -05:00
Zippy_Zolton
94cee68d41
Calloc
2020-10-18 16:41:14 -05:00
Zippy_Zolton
14aec09d13
possibly fixed
2020-10-18 16:21:06 -05:00
Zippy_Zolton
3b79ca4fae
Improved text colormaps
2020-10-18 16:00:01 -05:00
James R
1cd73315f1
Merge branch 'model-fallback' into 'next'
...
Model fallback
See merge request STJr/SRB2!1167
2020-10-18 16:52:42 -04:00
James R
7f65023891
Merge branch 'bustflags' into 'next'
...
Bustable Wall and Floor flags.
See merge request STJr/SRB2!1163
2020-10-18 16:42:15 -04:00
Hannu Hanhi
382ed1c31e
Remove leftover commented code from previous commit
2020-10-18 23:04:01 +03:00
James R
d279489753
Merge branch 'perfstats' into 'next'
...
Performance stats
See merge request STJr/SRB2!1186
2020-10-18 15:33:20 -04:00
Hannu Hanhi
23e02d17c0
NPO2 span function optimization
2020-10-18 21:27:22 +03:00
Jaime Passos
3ac175660c
Don't render sprites with negative xscale or yscale in OpenGL
2020-10-17 22:40:49 -03:00
Zippy_Zolton
e8419ea876
Credits Changes
2020-10-17 20:13:29 -05:00
Hannu Hanhi
7941a5fb63
R_FindPlane optimization
2020-10-18 01:27:01 +03:00
Zippy_Zolton
f602944efd
titlecard
2020-10-17 15:51:22 -05:00
GoldenTails
00f38d41e5
Give the GIF dynamic delay memory to base future delays off of, instead of calculating for the current frame and being jank
2020-10-17 07:10:24 -05:00
James R
4b0725f36f
Use FIELDFROM in lua polyobject code
2020-10-15 16:17:51 -07:00
James R
374c19f915
Merge remote-tracking branch 'origin/next' into reverse-offsetof-macro
2020-10-15 16:15:20 -07:00
James R
d6b314951e
Merge branch 'step-down-ceiling' into 'next'
...
Apply step up/down to opposite plane too
See merge request STJr/SRB2!1192
2020-10-15 19:11:13 -04:00
James R
bd9fda8ceb
Merge branch 'lua-polyobjects' into 'next'
...
Lua polyobjects
Closes #19
See merge request STJr/SRB2!1140
2020-10-15 19:08:54 -04:00
James R
31977878e1
Merge branch 'raretry-fix' into 'next'
...
Make record attack's quick retry more consistent.
Closes #80
See merge request STJr/SRB2!1193
2020-10-15 19:02:34 -04:00
Jaime Passos
70ada935ec
Don't free PU_HWRCACHE and PU_HWRCACHE_UNLOCKED memory tags in HWR_ClearAllTextures.
...
Probably fixes a random annoying crash around that function.
(I was also suspecting renderer switching was doing other slightly weird stuff.)
2020-10-15 14:31:16 -03:00
Jaime Passos
060c25c14d
[Software floor sprites] Set the colormap and translation outside of the loop
2020-10-15 14:12:19 -03:00
Jaime Passos
bf9ed39ec3
Change vis->transmap statement
2020-10-15 14:05:18 -03:00
Jaime Passos
bc3ac7615f
Remove unnecessarily duplicated code in R_GetSpriteTranslation
2020-10-15 11:32:21 -03:00
Jaime Passos
8294479a5f
Merge branch 'next' into allowshaders
2020-10-15 01:25:11 -03:00
Jaime Passos
4c59f8c615
Fix OpenGL GIF recording crashing with gif_localcolortable disabled
2020-10-15 01:14:16 -03:00
Jaime Passos
50bd8abc78
Fix precipitation
2020-10-15 00:03:32 -03:00
Jaime Passos
3bace37a25
Don't project if rot_y is less than a single fracunit
2020-10-14 21:26:23 -03:00
Jaime Passos
bf8bb383ab
Simplify the floor splat clipping code a bit
2020-10-14 21:20:37 -03:00
Steel Titanium
b19764dc8e
Merge branch 'master' into next
2020-10-14 14:58:07 -04:00
Jaime Passos
b4294220e5
Fix a crash in R_CalculateSlopeVectors called from R_RenderFloorSplat
2020-10-14 14:08:25 -03:00
Jaime Passos
e63efdac13
Only create floor sprite slopes when needed, instead of always allocating them.
...
Has to be done manually in Lua. Use P_CreateFloorSpriteSlope, and P_DeleteFloorSpriteSlope when done with it.
2020-10-14 13:07:02 -03:00
sphere
a2ff89f007
Make record attack's quick retry more consistent.
2020-10-14 17:39:23 +02:00
James R
b35633bb61
brug
2020-10-14 01:19:43 -07:00
James R
cce55ccf90
Merge branch 'ffloorclip-2' into 'next'
...
Software 3D floor rendering optimization (second attempt)
See merge request STJr/SRB2!1184
2020-10-14 03:10:44 -04:00
James R
f7e9772e10
Merge branch 'i-pity-you' into 'next'
...
Allow JumpSpin abilities to be used with non-ability shields
Closes #277
See merge request STJr/SRB2!1146
2020-10-14 03:08:20 -04:00
Jaime Passos
ab526e47cc
Implement object-defined floor sprite slopes.
2020-10-14 00:57:13 -03:00
Jaime Passos
a8a66f698a
[Software] Use the light at the bottom of the object for splats
2020-10-13 23:14:05 -03:00
James R
bc23f582fe
Don't need to set this actually
2020-10-13 19:11:18 -07:00
James R
5fca04c3dd
Apply step up/down to opposite plane too
2020-10-13 19:04:52 -07:00
Jaime Passos
4b7bfce95e
Implement sloped floor sprites
2020-10-13 22:42:07 -03:00
Jaime Passos
fccbc00cac
Fix the wrong freeing function call being used in Patch_FreeData
2020-10-13 19:18:01 -03:00
Jaime Passos
63e471d902
Correctly return the output patch's size in Picture_PatchConvert
2020-10-13 19:16:25 -03:00
Zippy_Zolton
6fd226eb29
Crosshair fix, no GAMEQUIT
2020-10-13 16:41:39 -05:00
Jaime Passos
0e62cb2ada
Fix infinitely long splat spans
2020-10-13 17:03:50 -03:00
Zippy_Zolton
5d699591c7
more!!!!! :3
2020-10-13 14:23:56 -05:00
Jaime Passos
4273896311
Implement relative and absolute sprite offsets for objects (mobjs)
...
Added RF_ABSOLUTEOFFSETS and RF_FLIPOFFSETS
2020-10-13 12:57:36 -03:00
Zippy_Zolton
45b52e3729
good night
2020-10-13 02:19:20 -05:00
Zippy_Zolton
2ba1017dab
More whitelists :D
2020-10-13 02:13:35 -05:00
Jaime Passos
87e5d63723
Improve sorting between sprites and floor sprites
2020-10-13 02:24:18 -03:00
Jaime Passos
95d0097df6
Improve splat sorting:
...
Adjust the sort scale of splats
Do splat sorting in R_CreateDrawNodes if either vissprite is a splat, instead of if both are
2020-10-13 01:45:18 -03:00
Jaime Passos
7dbd34345c
Fix splat sorting
2020-10-13 01:09:17 -03:00
Jaime Passos
f2aca01e2b
Fix other uninitialized variable warnings
2020-10-13 00:14:27 -03:00
Jaime Passos
1ea3bd8fff
Fix uninitialized variable warning
2020-10-12 22:08:45 -03:00
Jaime Passos
453f49cb77
Fix floorsprites not being rendered when viewed from the bottom
2020-10-12 22:07:11 -03:00
James R
cb8f6097cf
Merge branch 'save-netvars' into 'next'
...
Save netvars
See merge request STJr/SRB2!1179
2020-10-12 19:03:01 -04:00
Jaime Passos
831ccccdd6
OpenGL support for splats, fix some shadow draw bugs in Software
2020-10-12 19:53:21 -03:00
James R
58464771a8
Merge branch 'addfile-vararg' into 'next'
...
Give the addfile command variable argument support.
See merge request STJr/SRB2!1176
2020-10-12 18:32:20 -04:00
lachwright
6a73e81227
Merge remote-tracking branch 'origin/next' into i-pity-you
2020-10-13 09:24:09 +11:00
James R
d73fbd8616
Merge branch 'slight-shader-cleanup' into 'next'
...
Shader code cleanup
See merge request STJr/SRB2!1103
2020-10-12 18:22:08 -04:00
GoldenTails
87a5e1d30c
Futureproof against strict buildbots.
2020-10-12 17:14:32 -05:00
James R
d7b8d5d0f3
Merge branch 'penalty-of-death' into 'next'
...
I am going to die :D (closes #337 )
Closes #337
See merge request STJr/SRB2!1183
2020-10-12 18:11:09 -04:00
James R
5a5024faf4
Merge branch 'skip-credits-gone-wrong' into 'next'
...
Fix clients being able to skip credits AGAIN (closes #339 )
Closes #339
See merge request STJr/SRB2!1182
2020-10-12 18:09:48 -04:00
James R
d4bef36c19
Merge branch 'specialstagecheck' into 'next'
...
A special stage is a special stage, even outside of coop.
Closes #211
See merge request STJr/SRB2!1180
2020-10-12 18:08:02 -04:00
James R
d1c8d41f94
Merge branch 'no-demo-visit' into 'next'
...
Don't count demo playback as visiting a level.
Closes #327 and #340
See merge request STJr/SRB2!1177
2020-10-12 18:05:43 -04:00
GoldenTails
94f6d0b002
Fix gzip failing to compress SRB2's objdump on non-Windows.
2020-10-12 16:59:47 -05:00
James R
35c666514b
Merge branch 'splitscreen-parameter' into 'next'
...
Add `-splitscreen` commandline parameter
See merge request STJr/SRB2!1175
2020-10-12 17:46:55 -04:00
James R
9538ca696a
Merge branch 'ceilingz' into 'next'
...
Add P_CeilingzAtPos function
See merge request STJr/SRB2!1164
2020-10-12 17:44:51 -04:00
Jaime Passos
b620f4835a
Support spritexscale and spriteyscale in OpenGL
...
Fix papersprite scaling with spritexscale and spriteyscale in Software
2020-10-12 17:25:18 -03:00
Zippy_Zolton
da27f720da
Whitelist the "X" shown in the HUD
2020-10-11 23:22:16 -05:00
Jaime Passos
cc97e22e2f
Changes to sprite rendering:
...
- Added render flags (see r_defs.h)
- Implemented floor splats
- Drop shadow sprite rendering through render flags
2020-10-12 00:13:22 -03:00
Jaime Passos
b808b3ef41
Move calculation of rotated patch dimensions into its own function
...
Simplify rotation code when the pivot isn't in the center
2020-10-11 03:39:31 -03:00
James R
7f8ec74c27
Use the macro in sectorlines_num too
2020-10-10 17:40:01 -07:00
James R
8bc8946be8
Turn the lua sector lines hack into a macro
2020-10-10 16:43:09 -07:00
Jaime Passos
6145442a34
Fix rotated flipped patches
2020-10-10 19:06:29 -03:00
Jaime Passos
b2f45986ad
Add r_patchrotation.h
2020-10-10 18:53:05 -03:00
Jaime Passos
6e5f71dd45
Refactor patch rotation
2020-10-10 18:43:26 -03:00
Jaime Passos
b15bbd505c
Merge branch 'next' into patch-stuff-again-2
2020-10-10 17:01:10 -03:00
Hannu Hanhi
465693b242
Put newline to end of m_perfstats.h
2020-10-10 22:23:33 +03:00
Hannu Hanhi
4f20a20165
Performance stats
2020-10-10 22:12:34 +03:00
Jaime Passos
06c0932ab4
Only check the tRNS (trans) chunk if the image is still palettized
2020-10-10 14:17:53 -03:00
Jaime Passos
4d847f4223
Compare the PNG's palette with the game's palette instead of assuming they are the same
2020-10-10 14:17:42 -03:00
Jaime Passos
0021a9aeaf
Fix bug
2020-10-10 13:37:23 -03:00
Jaime Passos
c5a3a61b28
Make 3D floors cull areas below or above them to reduce overdraw (2)
2020-10-10 01:00:39 -03:00
James R
4b5cb8025b
Show revert value of cvar with help command
2020-10-09 16:28:03 -07:00
James R
b67807dd04
When save/loading config use revert value for netvars if you are not the server
2020-10-09 16:22:17 -07:00
James R
f5e4d076b9
Add CV_NETVAR to server affecting cvars
...
showjoinaddress
maxplayers
joindelay
rejointimeout
resynchattempts
blamecfail
maxsend
noticedownload
downloadspeed
jointimeout
maxping
pingtimeout
servername
2020-10-09 15:23:16 -07:00
James R
aa102dcea0
Add CV_SAVE to netvars
...
dumpconsistency
allowjoin
joinnextround
restrictskinchange
allowteamchange
startinglives
respawndelay
competitionboxes
allowseenames
matchboxes
specialrings
powerstones
countdowntime
touchtag
hidetime
autobalance
teamscramble
scrambleonchange
friendlyfire
overtime
pointlimit
timelimit
basenumlaps
allowexitlevel
inttime
coopstarposts
cooplives
advancemap
playersforexit
exitmove
pausepermission
respawnitemtime
respawnitem
flagtime
tv_recycler
tv_teleporter
tv_superring
tv_supersneaker
tv_invincibility
tv_jumpshield
tv_watershield
tv_ringshield
tv_forceshield
tv_bombshield
tv_1up
tv_eggmanbox
2020-10-09 15:06:09 -07:00
Zippy_Zolton
1c751fdf0f
I am going to die :D
2020-10-09 15:42:55 -05:00
James R
a17446f905
Oops, go straight to evaluation if not in a netgame
...
serverrunning means that you are actually the server.
2020-10-09 13:16:56 -07:00
sphere
76d16473b9
how did this even happen
2020-10-09 05:55:10 -04:00
Jaime Passos
0811f60b2a
Let the server or an admin toggle clients' custom shaders
2020-10-09 02:06:13 -03:00
James R
15008f31a7
Merge branch 'sanity-meter-empty' into 'next'
...
Replace cvar initializers with a macro
See merge request STJr/SRB2!1178
2020-10-08 22:02:25 -04:00
James R
7c72eab58b
Merge branch 'manifest-stuff' into 'next'
...
Provide a default exe manifest
See merge request STJr/SRB2!1174
2020-10-08 22:01:17 -04:00
James R
ddb6823fe5
Merge branch 'fix-theoretical-lua-exposure-crashes' into 'next'
...
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions in Lua.
See merge request STJr/SRB2!1173
2020-10-08 22:01:02 -04:00
James R
45b9e23895
Merge branch 'ogl-driver-error' into 'next'
...
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
See merge request STJr/SRB2!1172
2020-10-08 22:00:43 -04:00
James R
933381fb8f
Merge branch 'expose-modversion-to-lua' into 'next'
...
Expose MODVERSION to Lua (because for some reason it wasn't).
See merge request STJr/SRB2!1158
2020-10-08 21:57:38 -04:00
James R
d83a112fc5
Merge branch 'next' into 'next'
...
Updated 16 bit momentum values to 32 bit in demos, changed demo version
See merge request STJr/SRB2!1157
2020-10-08 21:56:30 -04:00
Jaime Passos
63d4c1dffc
Merge remote-tracking branch 'origin' into slight-shader-cleanup
2020-10-08 22:45:39 -03:00
James R
c3c34c489b
Merge branch 'lua-sectorsounds' into 'next'
...
Support sectors as sound origins in Lua
See merge request STJr/SRB2!1144
2020-10-08 21:05:01 -04:00
James R
355cc1a697
Merge branch 'autocomplete-aliases' into 'next'
...
Autocomplete aliases in console
See merge request STJr/SRB2!1113
2020-10-08 20:30:07 -04:00
James R
88b3a3cd2e
Merge branch 'v-string-colormap-lua-exposure' into 'next'
...
Expose V_GetStringColormap to Lua via v.getStringColormap().
See merge request STJr/SRB2!1111
2020-10-08 20:28:25 -04:00
James R
95a5bb888a
Merge branch 'chain-attraction-homing' into 'next'
...
Chain Homing with Attraction Shield
See merge request STJr/SRB2!1109
2020-10-08 20:19:21 -04:00
sphere
b71c75d2ec
A special stage is a special stage, even outside of coop.
2020-10-08 18:45:20 +02:00
James R
b3d8ed7d43
Revert netvars after leaving a netgame
2020-10-06 23:32:11 -07:00
James R
dbd79a29a4
Replace C90's junk with a modest macro
2020-10-06 23:04:23 -07:00
Zachary McAlpin
0f3c87a705
Made states unmodifable in CMD building code
2020-10-06 16:54:23 -05:00
Zachary McAlpin
e393093e73
Update comment
2020-10-06 16:43:14 -05:00
sphere
f210316d8a
Only set MV_MP in multiplayer or a netgame.
2020-10-06 19:06:06 +02:00
sphere
48ca58f580
Don't count demo playback as visiting a level.
2020-10-06 16:49:53 +02:00
GoldenTails
d5848e78fc
Update help message to mention supported file extensions, and change the description to "Load add-ons"
2020-10-06 03:37:23 -05:00
Zachary McAlpin
1681371fbd
Merge branch 'next' of https://git.do.srb2.org/STJr/SRB2 into playercmd-kart-port
2020-10-06 02:07:05 -05:00
GoldenTails
2d3a589167
Add warning when files are skipped due to being previously processed.
2020-10-04 21:03:29 -05:00
GoldenTails
0b74818771
Give the addfile command variable argument support.
2020-10-04 21:02:20 -05:00
gm3k4g
2cc8de2bdd
Added splitscreen command line parameter
2020-10-05 00:12:13 +03:00
Steel Titanium
0aa1b16fd1
Provide a default exe manifest
2020-10-03 19:53:59 -04:00
GoldenTails
2ae5c02050
Fix some theoretical crashes when using the P_*XYMovement, P_*ZMovement, and P_RailThinker functions.
2020-10-03 13:24:47 -05:00
Louis-Antoine
e49032eaf7
Let Lua scripts access userdata metatables
2020-10-03 18:40:37 +02:00
Hannu Hanhi
684b868524
Add error message when the GDI Generic OpenGL renderer is encountered in Windows
2020-10-03 18:45:56 +03:00
Louis-Antoine
121c7da809
Let Lua scripts relink tables to their metatables when unarchiving
...
This is done through the new "registermetatable" function,
in a somewhat similar fashion to "freeslot" but for metatables:
it must be called at script load to tell SRB2 your metatable
can be automatically relinked during the unarchiving process.
2020-10-03 16:31:04 +02:00
James R
17ce7d57c3
Merge branch 'update-228' into 'next'
...
2.2.8 prep
See merge request STJr/SRB2!1170
2020-10-03 01:45:06 -04:00
James R
b1d59c6641
Merge branch 'picfmt-pngfix' into 'next'
...
Fix uninitialized variable issue in patches with missing grAb chunks
See merge request STJr/SRB2!1171
2020-10-02 20:24:10 -04:00
James R
27d96bb21c
Merge branch 'fartification' into 'next'
...
Prevent Canarivore gas from teleporting up walls
See merge request STJr/SRB2!1154
2020-10-02 20:23:36 -04:00
James R
8beee3761e
Merge branch 'windows-console-go-brrr' into 'next'
...
Fix #178
Closes #178
See merge request STJr/SRB2!1112
2020-10-02 20:23:20 -04:00
James R
c35c5ad568
Merge branch 'remove-renderer-notice' into 'next'
...
Remove "The OpenGL renderer is incomplete" notice (closes #281 )
Closes #281
See merge request STJr/SRB2!1169
2020-10-02 20:22:38 -04:00
Jaime Passos
ebf50aad44
Use leftoffset and topoffset, not loffs and toffs
2020-10-02 20:40:42 -03:00
James R
401508e9d4
Update Srb2win.rc
2020-10-02 16:11:39 -07:00
James R
c51a4c8fb1
Update version to 2.2.8
2020-10-02 16:10:21 -07:00
James R
1c6c51744c
Update patch.pk3
2020-10-02 16:07:15 -07:00
Jaime Passos
aaa9cff6ac
Fix PNG issue in OpenGL + optimize PNG sprite loading
2020-10-02 19:48:13 -03:00
James R
be4c5751f8
Revert "Warn when going to OpenGL from the menu"
...
This reverts commit 569453ee93b6089ccdaf
2020-10-02 15:37:23 -07:00
Steel Titanium
386db4b7a1
Model fallback
2020-10-02 15:45:43 -04:00
James R
8a8e0ceda2
Move HU_LoadGraphics after startuppwads are loaded
...
This is needed for graphics replacements to take effect.
2020-10-02 11:54:58 -07:00
James R
61cae79bd4
Fix off by one
2020-10-01 16:55:17 -07:00
James R
1cfb1f673b
Add wads from the -file parameter after netvars are registered
...
This is so netvars registered by any lua scripts will load in the correct order.
2020-10-01 16:50:31 -07:00
sphere
a9a0137d22
Remove "RC3"
2020-09-30 20:25:55 +02:00
sphere
d45d5b4e20
Merge branch 'credits-changes' into 'next'
...
Credits changes
See merge request STJr/SRB2!1161
2020-09-30 13:25:39 -04:00
lachwright
e715b2f01a
Update ICNS icon for macOS
...
Replaced some of the lower resolution variants with some smoother downscales. The 16x16 one is even Sonic's 1-up icon from the game!
2020-10-01 02:47:24 +10:00
Snu
bfd8bd7564
comment typo
2020-09-30 08:44:43 +01:00
Snu
8a00b47b38
Make the function ACTUALLY work
2020-09-30 08:40:21 +01:00
Snu
82ceddb2be
god damnit
2020-09-30 08:10:28 +01:00
Snu
feb011ee52
Expose function to Lua
2020-09-30 07:58:41 +01:00
Snu
ca88db00cd
Create P_CeilingzAtPos function
2020-09-30 07:56:57 +01:00
Snu
afcadb3232
Remove all instances of PF_CANBUSTFLOORS
2020-09-29 20:16:06 +01:00
sphere
2642df4c98
Fix Arrietty's name being misspelled.
2020-09-29 18:06:50 +02:00
sphere
2ebe731bd4
Game design is a team effort.
2020-09-29 17:23:44 +02:00
Snu
cd4f755e53
Replace all instances of SF_CANBREAKWALLS and PF_CANBREAKFLOORS with SF_CANBUSTWALLS and PF_CANBUSTFLOORS, respectively.
2020-09-29 13:52:35 +01:00
Snu
75042d781f
Fix characters without SF_CANBREAKWALLS not being able to climb bustable walls.
2020-09-29 13:47:48 +01:00
Snu
90fbb752fa
Add functionality to PF_CANBREAKFLOORS
2020-09-29 12:58:36 +01:00
Snu
04b749f1f9
Remove SF_BUSTABLEBUSTER, change SF_CANBREAKFLOORS to a pflags; PF_CANBREAKFLOORS
2020-09-29 11:05:04 +01:00
Snu
d07422bda1
Change breaking walls requirement from CA_GLIDEANDCLIMB to SF_CANBREAKWALLS.
2020-09-29 10:32:45 +01:00
Snu
07a57d0419
Add SF_CANBREAKWALLS, SF_CANBREAKFLOORS and SF_BUSTABLEBUSTER
2020-09-29 09:45:34 +01:00
sphere
2e172de6eb
Merge Programming and Programming Assistance, and some other tweaks.
2020-09-28 15:54:10 +02:00
sphere
a3d09ca625
These people deserve to be in the credits proper, also formatting fixes.
2020-09-28 14:48:55 +02:00
Lachlan
becc42920b
Bump RC version
2020-09-28 11:39:57 +08:00
Lachlan
5946b54a92
Fix compiler warning
2020-09-28 11:38:56 +08:00
Lachlan
7697553498
Update patch.pk3 checksum
2020-09-28 11:12:15 +08:00
Lachlan Wright
09c83b43b1
Merge branch 'fix-shoop-da-koop' into 'next'
...
Fix Eggmobile spawning Bowsers after hitting Fang with pinch phase laser
Closes #288
See merge request STJr/SRB2!1160
2020-09-27 22:42:28 -04:00
Lachlan Wright
ca2eb78055
Merge branch 'special-stage-respects-nextmapoverride' into 'next'
...
Make Special Stage map transitions respect nextmapoverride.
See merge request STJr/SRB2!1129
2020-09-27 22:42:07 -04:00
Lachlan Wright
27b7b5efce
Merge branch 'fix-noscalepatch-with-string-drawers' into 'next'
...
Fix string drawing functions so they account for V_NOSCALEPATCH effectively…
See merge request STJr/SRB2!1107
2020-09-27 22:41:39 -04:00
Monster Iestyn
ddd59a6e9d
A_Boss1Laser (pinch phase): Reset var1 to locvar1 each time so we don't accidentally spawn koopas (or something else) as a result of hitting enemies with the laser
2020-09-26 17:31:49 +01:00
SteelT
060f46653d
Merge branch 'ogl-model-uv-adjust' into 'next'
...
Re-adjust model UVs when sprite texture dimensions change
See merge request STJr/SRB2!1068
2020-09-25 21:19:59 -04:00
Steel Titanium
9e036e6291
Fix quotes appearing in product version string
2020-09-25 18:55:37 -04:00
Steel Titanium
375d09c734
Update patch.pk3 hash
2020-09-25 18:15:52 -04:00
Steel Titanium
5d54c70bfa
Change prerelease version suffix to RC2
2020-09-25 17:58:02 -04:00
James R
057d765821
Add Jeck to the credits
2020-09-25 11:47:24 -07:00
Lachlan Wright
b4f9767b7b
Merge branch 'sound-origin' into 'next'
...
Apply volume to sounds with origin too
See merge request STJr/SRB2!1156
2020-09-25 10:04:46 -04:00
Lachlan Wright
92b61aacd8
Merge branch 'name-change-spam' into 'next'
...
Don't let players change their name more than five times per minute
See merge request STJr/SRB2!1155
2020-09-25 09:36:39 -04:00
Lachlan Wright
86b7957b61
Merge branch 'clarity' into 'next'
...
Add-on clarity from Kart
See merge request STJr/SRB2!1153
2020-09-25 09:33:04 -04:00
Lachlan Wright
1caf92f0ae
Merge branch 'fix-236' into 'next'
...
Only allow explicitly living players to trigger sector specials
Closes #236
See merge request STJr/SRB2!1152
2020-09-25 09:31:06 -04:00
Lachlan Wright
8f5f248c87
Merge branch 'turret-seeing-ghosts' into 'next'
...
Fix P_SupermanLook4Players assigning spectators as targets
Closes #209
See merge request STJr/SRB2!1151
2020-09-25 09:30:38 -04:00
Lachlan Wright
9208f0bc33
Merge branch 'no-skincolor-space-warning' into 'next'
...
Remove "skincolor name contains spaces" console warning
Closes #280
See merge request STJr/SRB2!1148
2020-09-25 09:30:24 -04:00
Lachlan Wright
3117dfaf2b
Merge branch 'botsavestuff' into 'next'
...
Save changes made to the bot's skin, and display it properly in save select
See merge request STJr/SRB2!1147
2020-09-25 09:30:03 -04:00
Lachlan Wright
256fa9fa10
Merge branch 'more-helpful-lua-error' into 'next'
...
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened
See merge request STJr/SRB2!1145
2020-09-25 09:28:49 -04:00
Lachlan Wright
c42f247ce5
Merge branch 'snake-fixes' into 'next'
...
Fix bonus items sometimes overriding apples in Snake minigame
See merge request STJr/SRB2!1134
2020-09-25 09:23:33 -04:00
Lachlan Wright
f1d2992f51
Merge branch 'dye-fix' into 'next'
...
Fix players not properly decolorizing via linedef action
See merge request STJr/SRB2!1127
2020-09-25 08:54:16 -04:00
Lachlan Wright
982435cf86
Merge branch 'more-stats' into 'next'
...
Add tic and UI times to render stats
See merge request STJr/SRB2!1125
2020-09-25 08:54:01 -04:00
Lachlan Wright
650635e780
Merge branch 'w-initfile-bruh' into 'next'
...
Fix a bug where adding the same mod multiple times counted towards the mod limit
See merge request STJr/SRB2!1124
2020-09-25 08:52:22 -04:00
Lachlan Wright
7fee293034
Merge branch 'gl-shearing-fix-2' into 'next'
...
Fix cv_glshearing 2 in first person
See merge request STJr/SRB2!1114
2020-09-25 08:51:57 -04:00
Lachlan Wright
dbc32ea9ea
Merge branch 'console-silly-characters' into 'next'
...
Get rid of some silly behavior with certain characters in console
See merge request STJr/SRB2!1110
2020-09-25 08:31:08 -04:00
Lachlan Wright
86252cbea7
Merge branch 'more-nodes' into 'next'
...
Increase MAXNETNODES, show more servers in the server browser
See merge request STJr/SRB2!1106
2020-09-25 08:24:16 -04:00
GoldenTails
021061d80b
Expose MODVERSION to Lua (because for some reason it wasn't).
...
The wiki even states its existence!
2020-09-23 22:28:29 -05:00
James R
30056157c2
Merge branch 'listserv' into 'next'
...
Percent decode listserv (closes #244 )
Closes #244
See merge request STJr/SRB2!1150
2020-09-23 18:43:41 -04:00
James R
aa4c1eeea8
Merge branch 'bird-pain' into 'next'
...
Fix playing back demos never working (closes #203 )
Closes #203
See merge request STJr/SRB2!1149
2020-09-23 18:37:56 -04:00
Riku Salminen
e947007920
Wrote 3 lines in 1, as Zwip-Zwap Zapony suggested
2020-09-23 22:37:06 +03:00
Riku Salminen
b261e17fdd
Update g_demo.c, Remove old comments of fractional loss of one byte
2020-09-23 15:29:03 -04:00
Riku Salminen
1447aba964
Updated 16 bit momentum values to 32 bit in demos, changed demo version
2020-09-23 21:26:51 +03:00
James R
de9d1d2b35
Forgot to commit s_sound.h
2020-09-22 20:51:01 -07:00
James R
b18d60c1d3
Apply volume to sounds with origin too
...
Previously sounds with an origin would always start at max volume. This is
because the distance calculation adjusts the volume, and that volume needs to
be updated every tic as distance changes. Storing the original volume works.
(cherry picked from commit 22177753d2f00d58d19d930f51dcd086097dfd0d)
2020-09-22 20:47:31 -07:00
James R
b655fa496e
Don't let players change their name more than five times per minute
...
(ported 17f75903b029bbf01217153dc98009d305137c8f and 11ddcfa9a1f2311ec67377b76ed1160ef14b7f60)
2020-09-22 12:04:28 -07:00
lachwright
9ae2010880
Allow Canarivore gas to interact with players again (oops)
2020-09-22 13:11:56 +09:30
lachwright
5d1a95b9c6
Prevent Canarivore gas from teleporting up walls
2020-09-21 17:23:53 +09:30
Zippy_Zolton
62f379ec41
Add-on clarity from Kart
2020-09-20 13:07:28 -05:00
lachwright
7eb760afca
Only allow explicitly living players to trigger sector specials
2020-09-20 11:49:53 +09:30
Tatsuru
a52afc2baf
Ignore spectators
2020-09-19 23:10:03 -03:00
James R
5edcc72839
Shitty decode listserv
2020-09-19 18:54:04 -07:00
James R
9e31adf22c
Merge branch 'objectplace' into 'next'
...
Fix & improve objectplace
Closes #232
See merge request STJr/SRB2!1139
2020-09-19 21:40:55 -04:00
James R
9684149ba6
Merge branch 'start-netid-at-1' into 'next'
...
Avoid CV_FindNetVar returning a normal cvar (closes #251 )
Closes #251
See merge request STJr/SRB2!1137
2020-09-19 21:40:45 -04:00
James R
bdb44e6ce1
Don't ifdef CV_LoadDemoVars out if OLD22DEMOCOMPAT defined
2020-09-19 18:34:52 -07:00
kaysrishaq
c3430951be
Update lua_infolib.c
2020-09-18 17:47:38 -04:00
lachwright
a78a0071f2
Save changes made to the bot's skin, and display it properly in save select
2020-09-17 19:00:49 +09:30
lachwright
2bb5b42960
Allow JumpSpin abilities to be used with non-ability shields
2020-09-16 16:50:10 +09:30
Steel Titanium
16569b4e9a
Make "divide by zero" or "modulo by zero" errors show the file and line of where it happened
...
Shouldn't break scripts as it stops execution as soon it happens, like it already does.
2020-09-14 22:54:07 -04:00
Tatsuru
013714a26f
Encapsulate userdata checks
2020-09-14 17:33:26 -03:00
Monster Iestyn
0f2e063de0
Added the ability to modify parent, flags, translucency in polyobj_t
...
(attempting to edit polyobj.angle just gives you an error message saying to use polyobj:rotate() instead)
2020-09-13 21:38:16 +01:00
Tatsuru
8d65ce81c7
Legacy moment
2020-09-13 14:30:02 -03:00
Tatsuru
454682df70
Use the sector's actual soundorg (how did it even work)
2020-09-13 13:54:43 -03:00
Tatsuru
782e559adf
Check for sector_t userdata as well
2020-09-13 12:33:18 -03:00
SteelT
90302330ed
Merge branch 'make-float-strings-great-again' into 'next'
...
Can we just do this please? Thanks.
See merge request STJr/SRB2!1142
2020-09-11 11:47:04 -04:00
SteelT
9f09e32520
Merge branch 'remove-bt_use-deprecation' into 'next'
...
Remove BT_USE and PF_USEDOWN warning
See merge request STJr/SRB2!1138
2020-09-10 16:06:20 -04:00
SteelT
a033f482be
Merge branch 'pictureformats' into 'next'
...
PNG conversion refactoring
See merge request STJr/SRB2!675
2020-09-10 15:58:18 -04:00
Jaime Passos
0750d273a6
Attempt to use the PNG image's palette, if it is present
2020-09-10 03:16:21 -03:00
Jaime Passos
4e437076c1
Use color look-up table for PNG conversion
2020-09-10 02:10:31 -03:00
Jaime Passos
f24647dc4d
Change method of color look-up table generation
2020-09-10 01:43:46 -03:00
GoldenTails
c61eeb9238
Can we just do this please? Thanks.
2020-09-09 22:19:14 -05:00
Monster Iestyn
097986b1d9
added polyobj_t to userdataType list
...
(also added slope_t, vector2_t and vector3_t since they were all missing from here)
2020-09-09 21:24:07 +01:00
Monster Iestyn
78f7998618
Added polyobj.vertices and polyobj.lines to Lua
2020-09-09 21:15:02 +01:00
Monster Iestyn
4ce161f9c3
Added the functions Polyobj_moveXY and Polyobj_rotate to Lua as polyobj.moveXY and polyobj.rotate
2020-09-09 19:38:56 +01:00
Monster Iestyn
f86dad2979
Added new functions as variables of polyobj_t:
...
* po.pointInside(po, x, y) as a wrapper for P_PointInsidePolyobj
* po.mobjTouching(po, mo) as a wrapper for P_MobjTouchingPolyobj
* po.mobjInside(po, mo) as a wrapper for P_MobjInsidePolyobj
I can confirm that ":" syntax works with all the above, e.g. po:mobjInside(mo)
2020-09-09 18:09:32 +01:00
Monster Iestyn
5f91833701
lua_maplib.c changes now that polyobj_t is supported:
...
* added line.polyobj for line_t
* added subsector.polyList iteration function, for iterating polyobjs in a subsector
* added seg.polyseg for seg_t, in case we ever reenable support for segs/nodes
2020-09-09 17:31:44 +01:00
Monster Iestyn
89e989d6b1
added "sector" as a Lua-exclusive shortcut to polyobj->lines[0]->backsector in polyobj_t
2020-09-09 17:06:36 +01:00
Monster Iestyn
e6136eb113
lua_blockmaplib.c: added "polyobjs" option to searchBlockmap function
...
also updated my copyright years in this file B)
2020-09-09 16:56:48 +01:00
Monster Iestyn
625aeb1560
lua_script.c fixes:
...
* make sure polyobj_t userdata is invalidated at level load
* add support for syncing polyobj_t Lua variables in netgames
2020-09-09 16:09:08 +01:00
Monster Iestyn
5fc58de94f
* added access to translucency and triggertag in polyobj_t
...
* added POF_ flags to INT_CONST in dehacked.c
2020-09-08 22:10:11 +01:00
Monster Iestyn
33c96ab1aa
* added access to id, parent, angle, damage, thrust, flags in polyobj_t
...
* #polyobj now returns the index id for the polyobj in PolyObjects
* Polyobj_GetForNum is implemented in Lua as PolyObjects.GetForNum()
2020-09-08 21:42:51 +01:00
Monster Iestyn
60b49b5ecd
Fix STJr copyright years, this file was obviously only created today, not 4 years ago!
2020-09-08 18:56:00 +01:00
Monster Iestyn
0bc7eb32e9
make sure to include fastcmp.h, whoops
2020-09-08 18:55:16 +01:00
Monster Iestyn
05fe86ffdc
* started functions for accessing/editing META_POLYOBJ (bare minimum atm)
...
* added the "PolyObjects" array as a global var, with index and len functions, as well as its own iterate function
2020-09-08 18:29:10 +01:00
Monster Iestyn
d5beae9738
Begin work on adding access to polyobjects in Lua:
...
* create new file lua_polyobjlib.c
* made a stub LUA_PolyObjLib function
* added META_POLYOBJ to lua_libs.h
* updated makefile, CMake and MSVC project files for lua_polyobjlib.c
2020-09-08 18:08:08 +01:00
Bartu İnce
7e9bc0d103
no message
2020-09-08 03:03:48 +03:00
Jaime Passos
dcaad758f4
Improved memory management for patches
2020-09-07 02:23:07 -03:00
lachwright
efc82ffa74
Set additional UDMF parameters on objectplaced mapthings to defaults
2020-09-07 13:08:22 +09:30
lachwright
b805e10058
Let analog control schemes control objectplace like standard control schemes
2020-09-06 19:03:17 +09:30
lachwright
d7ab41a90b
Objectplace improvements:
...
- movement speeds are scaled with player scale
- spawned objects are scaled with player scale
- command accepts argument for thing num to set
2020-09-06 17:28:34 +09:30
James R
ca9cf25423
Fix netid overflow check
2020-09-05 23:23:54 -07:00
GoldenTails
8ae5f3030f
Remove BT_USE and PF_USEDOWN warning
...
someone entertained the idea of maybe removing it, so might as well put this merge request up to see if people want it
2020-09-06 00:30:05 -05:00
James R
30057e9268
Start netid at 1 to avoid CV_FindNetVar returning a regular cvar for netid 0
2020-09-05 22:03:14 -07:00
James R
9a1099ec17
Update SuperPhanto's name with real name per request
2020-09-02 17:59:53 -07:00
James R
7bec06856f
Add SuperPhanto to the art credits
2020-09-01 18:51:47 -07:00
James R
c7c9ae3847
Disable update alert if this is a prerelease
2020-09-01 16:22:29 -07:00
James R
4b7d16283d
Update version to 2.2.7 RC1
2020-09-01 15:38:51 -07:00
James R
72437ae357
Define BETAVERSION as a suffix to the version string
2020-09-01 15:38:27 -07:00
James R
045a5d3dd1
Update patch.pk3 asset hash
2020-09-01 15:26:13 -07:00
Steel Titanium
db6bd42eb1
Allow the game to continue even if the STARTUP lump is somehow missing
2020-09-01 14:46:03 -04:00
Steel Titanium
4509cd3798
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into replace-purefat
2020-09-01 13:54:27 -04:00
GoldenTails
4173b15c8e
Expose V_GetStringColormap to Lua via v.getStringColormap().
2020-09-01 10:47:02 -05:00
James R
b2226e95d6
Merge branch 'master' into next
2020-08-31 16:10:05 -07:00
James R
e593610862
Fix NOHW compiling
2020-08-31 16:09:41 -07:00
James R
6c2370f894
Kill NOHS
...
(cherry picked from commit 3437b0690a3f4278e3ecc657102a126a3e2f3d13)
2020-08-31 16:06:40 -07:00
James R
2aab765b36
Fix NOGME compiling
...
(cherry picked from commit 0d57ba1d02c5bde2ab22a71d21a95849b21e9539)
2020-08-31 16:04:09 -07:00
James R
679bfa21ed
Fix stupid NONET
2020-08-29 17:51:59 -07:00
James R
a6e59cbb24
Do not do master server things when NOCURL
...
(cherry picked from commit 7a05a8acf73ac0f012135339447c9a935e3b7939)
2020-08-29 17:45:28 -07:00
James R
1f38db4629
C90?
2020-08-29 17:21:54 -07:00
Steel Titanium
b20352141e
Fix compile error
2020-08-29 20:04:11 -04:00
Steel Titanium
0bd71d9980
Attempts to make the intro a bit more shorter
...
Make the scene time be 5 seconds long max
Use the standard fade which is much shorter in length.
2020-08-29 19:28:16 -04:00
James R
37c647c00e
Merge remote-tracking branch 'origin/master' into next
2020-08-28 19:52:25 -07:00
James R
8d9b16df8c
Merge branch 'makefile-detect-system' into 'master'
...
Detect which system the Makefile is running on to compile for
See merge request STJr/SRB2!1123
2020-08-28 22:49:34 -04:00
Steel Titanium
3ef8024697
Make the intro shorter as I felt it was a bit too long
...
Change the code a bit so less magic numbers.
2020-08-28 20:08:46 -04:00
Steel Titanium
4eaa7e969f
Add new STARTUP lump, for the splash screen
2020-08-28 17:11:38 -04:00
Steel Titanium
a3039a781a
New STJR Intro, replaces the old PURE FAT intro
2020-08-28 17:10:54 -04:00
GoldenTails
ca4ed3b7dd
Make Special Stage map transitions respect nextmapoverride.
...
In other words: lets Luas set the next map of Special Stages via G_SetCustomExitVars.
It's otherwise impossible to do so via Lua.
2020-08-26 23:22:53 -05:00
Tatsuru
48d6ae8e53
Decolorize players as intended
2020-08-24 23:53:21 -03:00
Louis-Antoine
cb06d05692
Fix bonus items sometimes overriding apples in Snake minigame
2020-08-24 00:34:44 +02:00
Hannu Hanhi
dd7d1e40b1
Add tic and ui times to render stats
2020-08-23 20:09:55 +03:00
GoldenTails
d15be1696a
Forgot to check if the file was important, whoops!
2020-08-21 04:00:54 -05:00
GoldenTails
2c5f23bacb
Fix a bug where adding the same mod multiple times counted to the mod limit
...
A one line fix. Seriously.
2020-08-21 03:30:22 -05:00
James R
6f51c68c72
Makefile: add WINDOWSHELL=1 for the Windows detect
2020-08-20 20:19:50 -07:00
James R
e340d74e4d
Merge branch 'ringslinger-penalty-snap' into 'next'
...
Fix Ringslinger weapon ring penalty missnapment
See merge request STJr/SRB2!1120
2020-08-19 18:18:15 -04:00
James R
38d094d3f6
Merge branch 'fix-file-downloading' into 'next'
...
Fix bug where SRB2 would check size of disk from current directory instead of srb2home
See merge request STJr/SRB2!1121
2020-08-19 18:16:22 -04:00
James R
809ff5c467
Merge branch 'oops-http-mserv' into 'next'
...
Fix lingering issues with the http-mserv merge
See merge request STJr/SRB2!1117
2020-08-19 18:12:38 -04:00
James R
f92026f98b
Makefile: automatically detect system to compile for, if no system was specified
...
This should work for mingw and linux so far.
2020-08-18 18:01:59 -07:00
James R
9495e6354f
Makefile: Make WARNINGMODE the default, optionally disable with RELAXWARNINGS
2020-08-18 16:45:00 -07:00
James R
f0bf06aee2
Is it GCC is it gcc, is it????
...
(cherry picked from commit ef2bff6383b16385f9874e1c9c6b66c9df794f5b)
2020-08-18 16:37:19 -07:00
James R
9147474a30
Merge branch 'showjoinaddress-menu' into 'next'
...
Add a menu option for showjoinaddress; disable it by default
See merge request STJr/SRB2!1115
2020-08-18 19:15:23 -04:00
GoldenTails
0a9c061fea
Fix bug where SRB2 would check size of current directory instead of srb2home
...
Hopefully that fixes that one bug with weird filesize issues too
2020-08-18 17:34:32 -05:00
Hannu Hanhi
bda1d1e725
Convince the compiler that I know what I'm doing, I think
2020-08-18 23:21:26 +03:00
James R
300436825d
Cast UINT16 for unlockable_t.height -> alphaKey
2020-08-18 11:19:16 -07:00
Zwip-Zwap Zapony
d87c0eeaf1
Fix Ringslinger weapon ring penalty missnapment
2020-08-18 11:42:35 +02:00
Nev3r
77e438d4bd
Some commenting tweaks.
2020-08-16 11:33:00 +02:00
Jaime Passos
92c4993d67
Introduce Doom patch format into picture formats
...
Fixes sprite rotation
2020-08-15 21:52:01 -03:00
Jaime Passos
9b426b474c
Merge branch 'pictureformats' into patch-stuff-again-2
2020-08-15 20:48:28 -03:00
Jaime Passos
8863e13fde
Rename R_CheckIfPatch
2020-08-15 20:14:36 -03:00
Nev3r
b15c760dc2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
2020-08-15 13:44:59 +02:00
James R
bcb0854db8
.
2020-08-14 22:38:15 -07:00
James R
0944b5ad6f
Strip a few more instances of SONIC ROBO BLAST 2 KART
2020-08-14 22:18:51 -07:00
James R
58971259ef
Is this SRB2Kart server?
2020-08-14 22:13:28 -07:00
James R
beba43cffc
Add a menu option for showjoinaddress
...
I also had to make the "alphaKey" UINT16. Hopefully nothing breaks!
2020-08-14 21:13:15 -07:00
James R
405639bc78
Disable showjoinaddress by default
2020-08-14 21:05:23 -07:00
James R
5ccafe0314
REMOVE THE LAST OF CV_ALLCAPS
2020-08-14 21:01:41 -07:00
Jaime Passos
78cc4a78d0
Refactor renderer switching
2020-08-14 22:27:16 -03:00
Jaime Passos
1751d7afed
Cache the console patch only once in CON_DrawBackpic
2020-08-14 20:48:15 -03:00
Jaime Passos
1950f1c7f7
Fix cv_glshearing 2 in first person
2020-08-14 20:31:30 -03:00
James R
be14b8a564
dumbass doesn't test changes before pushing directly to next
2020-08-14 08:25:12 -07:00
James R
aa19bce4a9
Autocomplete aliases in console
2020-08-14 00:00:45 -07:00
James R
f0a79df2b8
Use AsciiChar to get the input from windows console window
2020-08-13 21:57:36 -07:00
James R
4734b9d728
Stop treating apostrophes, parenthesis and curly braces as separate arguments
2020-08-13 21:11:45 -07:00
Louis-Antoine
9dd5c11322
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
...
# Conflicts:
# src/d_clisrv.c
# src/d_clisrv.h
# src/d_net.c
# src/p_saveg.c
# src/p_saveg.h
2020-08-13 13:53:10 +02:00
James R
3e02f5d0cb
Add http-mserv to fuck
...
(cherry picked from commit 1a1c215a9110491a3c7324045dc96c18b604d9e7)
2020-08-09 23:34:16 -07:00
Steel Titanium
3d1110a0c2
Fix cmake using wrong libs if internal libs is turned on
...
Use '\0' instead, just in case
(cherry picked from commit 9293c6cb32109b5b003114ab441e312df76f263c)
2020-08-09 20:28:33 -07:00
James R
0af38bc5eb
Bump MAXNETNODES to 127
...
(cherry picked from commit 9d9f8fd8a337a1786efa0d348c89e05b26ce8571)
2020-08-09 18:32:05 -07:00
James R
e9748e5317
Merge branch 'clipboard-crash-fix-2' into 'next'
...
Fix buffer overrun in I_ClipboardPaste (resolves #205 )
Closes #205
See merge request STJr/SRB2!1105
2020-08-09 21:06:18 -04:00
James R
3e8cf5ab06
Merge branch 'bt_spin' into 'next'
...
Replace all occurances of BT_USE with BT_SPIN (2.2!)
See merge request STJr/SRB2!982
2020-08-09 21:03:17 -04:00
James R
85d0199661
Merge branch 'audio-cleanup' into 'next'
...
Audio cleanup
See merge request STJr/SRB2!1101
2020-08-09 20:49:28 -04:00
James R
a808294c0c
Merge branch 'kill-cd-support' into 'next'
...
Kill CD support
See merge request STJr/SRB2!1102
2020-08-09 20:48:25 -04:00
James R
8301e4f93c
Merge branch 'word-delet' into 'next'
...
Word delete and backspace in console
See merge request STJr/SRB2!1092
2020-08-09 20:46:37 -04:00
James R
8394bf6055
Merge branch 'opengl-skydome-fixes' into 'next'
...
Move the sky dome code out of r_opengl.c, fix issues with shaders
See merge request STJr/SRB2!1071
2020-08-09 20:45:01 -04:00
James R
23f218117c
Merge branch 'http-mserv' into 'next'
...
HTTP Based Master Server + Multithreading
See merge request STJr/SRB2!940
2020-08-09 20:24:26 -04:00
James R
46a4bd2d08
Merge branch 'lmaogalog' into 'next'
...
Make old analog functional again
See merge request STJr/SRB2!1098
2020-08-09 20:13:04 -04:00
GoldenTails
23edfd6d09
Fix string drawing functions so they account for V_NOSCALEPATCH effectively multiplying the width of the screen
2020-08-09 11:03:02 -05:00
James R
5153338bf5
Merge branch 'kill-dos' into 'next'
...
Remove support for DOS
See merge request STJr/SRB2!1090
2020-08-08 21:26:18 -04:00
James R
cd30f0e933
Match MAXSERVERLIST to MAXNETNODES, increase MAXNETNODES
...
Each server in the server list requires a node. It's also MAXNETNODES-1 because
the first node is yourself.
(cherry picked from commit 1484f0484f6c22382b2cae955a93c01f83d54655)
2020-08-08 15:13:21 -07:00
James R
54e446199d
Merge remote-tracking branch 'origin/next' into http-mserv
2020-08-08 15:05:03 -07:00
Jaime Passos
9772bbeda1
Fix buffer overrun in I_ClipboardPaste
2020-08-08 15:36:01 -03:00
Jaime Passos
2a0e47e28f
Remove LUA_PATCH_SAFETY
2020-08-08 14:56:04 -03:00
Jaime Passos
91ed56ef40
Refactor patch loading
2020-08-08 05:16:47 -03:00
Jaime Passos
74dfa9f700
Shader code cleanup
2020-08-07 18:17:05 -03:00
Steel Titanium
dff0e87e03
Kill CD support
2020-08-07 17:06:19 -04:00
Steel Titanium
2d39af8604
Remove all this unused playlist related code
2020-08-07 16:44:16 -04:00
Steel Titanium
5c53157192
Remove every musserv and sndserv def'd code
2020-08-07 16:40:46 -04:00
James R
cc677d2d50
Merge branch 'com-buf-insert-text-optional-player' into 'next'
...
Make the player optional for COM_BufInsertText and COM_BufAddText.
See merge request STJr/SRB2!1093
2020-08-05 19:53:28 -04:00
James R
cc508d0ba3
Merge branch 'ogl-model-lighting-shader' into 'next'
...
Add capability to use model lighting with shaders enabled
See merge request STJr/SRB2!1073
2020-08-05 19:50:31 -04:00
James R
1c9633504d
Merge branch 'hide-followmobj' into 'next'
...
Hide Metal Sonic's jet fume in first person
Closes #204
See merge request STJr/SRB2!1099
2020-08-05 19:47:13 -04:00
James R
a31c8d12b4
Merge branch 'udmf-fixmapthingheight' into 'next'
...
UDMF: Fix mapthing spawn height scaling improperly with the object scale; only special…
See merge request STJr/SRB2!1096
2020-08-05 19:46:48 -04:00
James R
d8834143cb
Merge branch 'ogl-sector-alignment-fix' into 'next'
...
Fix sector flat alignment issues in OpenGL
See merge request STJr/SRB2!1094
2020-08-03 12:47:29 -04:00
James R
f5d9029d2a
Merge branch 'ogl-big-room-fix' into 'next'
...
Big room fix for OpenGL
See merge request STJr/SRB2!1089
2020-08-03 12:44:09 -04:00
lachwright
3a96142c8b
Hide Metal Sonic's jet fume in first person
2020-08-03 20:09:35 +08:00
Nev3r
ba5d09eb2e
Fix smooth brain bruhments.
2020-07-31 22:38:37 +02:00
Nev3r
0520725069
Fix the OpenGL FOF issue with a different approach. Not fond of it either but at least it works.
2020-07-31 14:55:26 +02:00
Zachary McAlpin
e5b6d19f57
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port
2020-07-30 15:37:41 -05:00
Nev3r
586dc0b631
Merge branch 'next' into udmf-fofs-mkii
2020-07-30 12:39:25 +02:00
lachwright
837c9bbec3
Make old analog functional again
2020-07-30 18:22:15 +08:00
Nev3r
b99385e159
Fix mapthing spawn height scaling improperly with the object scale; only special offsets should scale now.
2020-07-30 09:45:58 +02:00
James R
40dc532ea2
Merge branch 'clarify-md5-mismatch' into 'next'
...
Include "is old" in the list of possible causes for a MD5 mismatch.
See merge request STJr/SRB2!1095
2020-07-29 21:19:23 -04:00
Nev3r
c914ac99b4
Bring back P_FindSpecialLineFromTag() for backwards compatibility reasons; emulate the old taglist behavior for this function.
2020-07-29 17:26:43 +02:00
Nev3r
729c8b2ec6
Fix FOF intersections with multitags for the OpenGL in a kind of hacky way.
2020-07-29 14:53:27 +02:00
Nev3r
3b55c9e940
Fix FOF intersections in multitagging for the software renderer.
2020-07-29 14:52:21 +02:00
Nev3r
c65ada7dd7
Merge branch 'next' into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
2020-07-29 13:55:14 +02:00
Nev3r
f791c1b4ec
Fix gl_linedef renaming which went off radars on the udmf branch
2020-07-28 20:39:11 +02:00
Nev3r
6dfe236602
Merge branch 'udmf-next' into 'next'
...
Merge udmf-next into next
See merge request STJr/SRB2!1075
2020-07-28 14:03:59 -04:00
GoldenTails
55d137215f
Include "is old" in the list of possible causes for a MD5 mismatch.
2020-07-28 03:53:25 -05:00
James R
fb6bac46ec
Merge branch 'extras-credits-unskippable' into 'next'
...
Fix Credits sequence from Extras being unskippable
See merge request STJr/SRB2!1091
2020-07-27 19:35:14 -04:00
Hannu Hanhi
85f5cb20e6
Fix sector flat alignment issues in OpenGL
2020-07-26 21:25:11 +03:00
GoldenTails
03b7a1c368
Make the player optional for COM_BufInsertText and COM_BufAddText.
...
When no player is supplied, the command will run for all players.
2020-07-26 12:08:33 -05:00
Zachary McAlpin
cbba71051d
Allow cmd to be modified using the PlayerCmd hook
2020-07-25 20:08:41 -05:00
Zachary McAlpin
117943012a
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playercmd-kart-port
2020-07-25 20:06:12 -05:00
James R
2aa2eaf939
Merge remote-tracking branch 'origin/master' into next
2020-07-25 17:45:20 -07:00
James R
1bdcb8d92f
Merge branch 'titlecard-clowning' into 'next'
...
Stretch the fallback titlecard to the screen
See merge request STJr/SRB2!1019
2020-07-25 20:21:08 -04:00
James R
63b15f784f
Merge branch 'musicpref-var' into 'next'
...
Console variable to select music preference
See merge request STJr/SRB2!939
2020-07-25 20:14:22 -04:00
James R
005e7ce793
Merge branch 'g_findmap-lua' into 'next'
...
G_FindMap and G_FindMapByNameOrCode for Lua
See merge request STJr/SRB2!693
2020-07-25 20:06:44 -04:00
Steel Titanium
492ca3cea3
Remove some more DOS related stuff
2020-07-25 19:15:54 -04:00
Steel Titanium
0d48d4c833
WIP: Remove support for DOS
...
WIP because I don't know if this wording is right for the error.
2020-07-25 18:55:51 -04:00
Hannu Hanhi
24b828b362
Use 64-bit R_PointToAngle in OpenGL culling to fix some big room issues
2020-07-25 21:50:24 +03:00
James R
a9a68474f7
Ctrl + Backspace/Delete in Console
2020-07-24 04:06:04 -07:00
James R
d90fe93982
Fix Credits sequence from Extras being unskippable
...
This is because a server is not started before going to the credits. I'm way
too stupid/lazy to try starting a server, so have a special case!
2020-07-24 03:58:38 -07:00
James R
e47fbe7dd9
Compiler error :V
2020-07-24 02:58:05 -07:00
James R
4059c6a654
Update LATEST_GCC_VERSION too
2020-07-24 02:33:39 -07:00
James R
00943e9e82
Add missing GCC version flags to the Makefile
2020-07-24 02:32:10 -07:00
James R
6fd9e25b11
Merge remote-tracking branch 'origin/next' into g_findmap-lua
2020-07-24 02:14:03 -07:00
James R
28931b90dc
Merge branch 'ogl-polyobject-tex-fix' into 'next'
...
Fix OpenGL polyobject texture distortion
See merge request STJr/SRB2!1086
2020-07-24 04:49:25 -04:00
James R
932bf9b20e
Merge branch 'ogl-shader-light-clamp' into 'next'
...
Clamp light level for shaders. Fixes #194 .
Closes #194
See merge request STJr/SRB2!1085
2020-07-24 04:47:57 -04:00
James R
b45bd6990e
Merge branch 'ogl-fog-block-fix' into 'next'
...
Don't discard zero alpha fog block fragments. Fixes #198 .
Closes #198
See merge request STJr/SRB2!1084
2020-07-24 04:45:50 -04:00
James R
47581607ef
Merge branch 'netticbuffer-port' into 'next'
...
Port netticbuffer from Kart
See merge request STJr/SRB2!1077
2020-07-24 04:45:08 -04:00
Hannu Hanhi
e331c9d18e
Fix OpenGL polyobject texture distortion
2020-07-23 20:51:05 +03:00
Hannu Hanhi
e4d6e92f37
Clamp light level for shaders. Fixes #194 .
2020-07-23 19:05:17 +03:00
Hannu Hanhi
80172ee932
Don't discard zero alpha fog block fragments. Fixes #198 .
2020-07-23 18:24:41 +03:00
James R
c944d3adf4
Merge branch 'fix-nights-fullbright' into 'next'
...
NiGHTS fullbright fixes
See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
James R
4d16f16dab
Merge branch 'fix-superfloat' into 'next'
...
Fix Super Sonic exploiting CA_FLOAT abilities
See merge request STJr/SRB2!1081
2020-07-22 22:13:51 -04:00
James R
8d60579e6c
Merge branch 'demo-quit-crash-fix' into 'next'
...
Fix crash if you start recording a replay and immediately close the game
See merge request STJr/SRB2!1082
2020-07-22 22:11:03 -04:00
Jaime Passos
ca060a4372
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-21 22:25:00 -03:00
James R
196beead7d
Parenthesis
2020-07-21 16:16:03 -07:00
James R
735942a437
Merge branch 'next-lc-uint16' into 'next'
...
Allow modification of built-in skincolors
See merge request STJr/SRB2!1078
2020-07-21 17:56:12 -04:00
Steel Titanium
76702d6712
Fix crash if you start recording a replay and immediately close the game
2020-07-20 22:19:44 -04:00
lachwright
242e128aa0
Fix Super Sonic exploiting CA_FLOAT abilities
2020-07-21 03:50:26 +08:00
SwitchKaze
5332fff540
Deny standard color accessibility changes
2020-07-20 12:06:57 -05:00
lachwright
cea3f64c88
Fix default NiGHTS skin brightness for non-super characters
2020-07-20 22:24:16 +08:00
SwitchKaze
ee9c146b5d
Re-enable built-in color modification
2020-07-19 17:23:08 -05:00
Steel Titanium
e9a03401cb
Port netticbuffer from Kart
2020-07-19 15:24:27 -04:00
Steel Titanium
05ac0fc7ea
Fix muspostbossname sometimes returning garbage.
2020-07-19 13:47:33 -04:00
Hannu Hanhi
b03e7f63c5
Fix shader comment
2020-07-19 16:07:53 +03:00
Hannu Hanhi
92ebbdfc10
Don't override custom shaders with model lighting shader
2020-07-18 15:48:37 +03:00
Hannu Hanhi
c1cf41fb0c
Add capability to use model lighting with shaders enabled
2020-07-18 15:08:59 +03:00
Jaime Passos
48a6652973
Move the sky dome code out of r_opengl.c, fix issues with shaders
2020-07-17 02:48:05 -03:00
Zachary McAlpin
c42e06221d
Bruh I screwed up
2020-07-17 00:33:07 -05:00
Zachary McAlpin
d26c7654ff
Ported Lat's PlayerCmd hook to vanilla SRB2
2020-07-17 00:08:38 -05:00
James R
7c2f81e4ed
Merge branch 'next-lc-uint16' into 'next'
...
Fix skincolor-related memory leak
See merge request STJr/SRB2!1066
2020-07-16 22:01:07 -04:00
James R
fa90ff6bae
Merge remote-tracking branch 'origin/master' into next
2020-07-16 19:00:21 -07:00
Hannu Hanhi
0e5631fe66
More work on sprite-texture model uv adjustment 2
2020-07-16 22:39:44 +03:00
Hannu Hanhi
afd0858b4d
More work on sprite-texture model uv adjustment
2020-07-16 22:11:36 +03:00
James R
d6b831053f
Merge branch 'fix-lib_freeslot' into 'next'
...
Fix lib_freeslot
See merge request STJr/SRB2!1064
2020-07-14 18:32:10 -04:00
SwitchKaze
734033250d
Fix skincolor-related memory leak
2020-07-14 17:09:31 -05:00
Hannu Hanhi
893ff0fa19
Merge remote-tracking branch 'upstream/next' into ogl-model-uv-adjust
2020-07-14 20:30:56 +03:00
kaysrishaq
7f9175033d
minor lua fixes
...
minor lua fixes
2020-07-14 01:34:57 -04:00
kaysrishaq
29a116ba81
Fix lib_freeslot
2020-07-13 18:56:07 -04:00
James R
34bd0d9fe7
Merge branch 'various-color-fixes' into 'next'
...
Various color fixes
See merge request STJr/SRB2!1060
2020-07-13 18:24:55 -04:00
kaysrishaq
f541c37ebc
Fix formatting
...
PREFAVAILABLE -> S_PrefAvailable
move declarations to top of blocks
2020-07-13 15:16:49 -04:00
James R
f5c5ec000d
Use SRB2VERSION here...
2020-07-13 08:59:41 -07:00
James R
93615b07be
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-13 08:58:43 -07:00
Nev3r
ac8590132b
Add a provisional GZDoom-esque 3D floor setup for the sake of immediate UDB usability.
2020-07-13 11:09:19 +02:00
Nev3r
d1db5ebf56
Merge branch 'udmf-next' into udmf-fofs-mkii
2020-07-13 09:34:32 +02:00
James R
00ceca8cc6
Merge remote-tracking branch 'origin/master' into next
2020-07-12 17:11:22 -07:00
James R
4985d94386
Merge remote-tracking branch 'origin/master' into cmake-adjustments
2020-07-12 16:24:24 -07:00
James R
42b0ab1851
Merge branch 'p-xymovement-lua-exposure' into 'next'
...
Expose several movement-related functions to Lua.
See merge request STJr/SRB2!884
2020-07-12 19:11:47 -04:00
James R
839f086216
A few more instances of "gr" to purge
2020-07-12 16:09:43 -07:00
Kays Ishaq
e849c9898e
move dupenum declaration to beginning of block
2020-07-12 19:05:27 -04:00
James R
b9a24001d8
Merge remote-tracking branch 'origin/next' into remove-glide-2
2020-07-12 16:05:15 -07:00
GoldenTails
ada06910dc
Expose P_MovePlayer to Lua.
2020-07-12 18:02:50 -05:00
GoldenTails
4b3d6f04f8
Expose P_PlayerZMovement to Lua.
...
Finishing off these changes; how a player moves vertically.
2020-07-12 18:02:50 -05:00
GoldenTails
df1fd0c456
Expose P_SceneryZMovement to Lua.
...
Still more complex than P_RingZMovement.
2020-07-12 18:02:50 -05:00
GoldenTails
4710e4f07c
Expose P_RingZMovement to Lua.
...
Ever wanted to move like a ring vertically?
2020-07-12 18:02:50 -05:00
GoldenTails
6d3a2919a2
Expose P_ZMovement to Lua.
...
Because P_XYMovement wasn't enough.
2020-07-12 18:02:50 -05:00
GoldenTails
27c25bfa1e
Expose P_SceneryXYMovement to Lua.
...
Ironically this seems slightly more advanced than P_RingXYMovement...
2020-07-12 18:02:50 -05:00
GoldenTails
6ac3d62321
Expose P_RingXYMovement to Lua.
...
Ever wanted to move like a ring horizontally?
2020-07-12 18:02:50 -05:00
GoldenTails
fe67781d68
Expose P_XYMovement to Lua.
...
It was so easy; it took a grand total of one compile to implement!
Why wasn't this done before...
2020-07-12 18:02:49 -05:00
James R
bc2f83ec05
Merge branch 'p-rail-thinker-lua-exposure' into 'next'
...
Expose P_RailThinker to Lua.
See merge request STJr/SRB2!1059
2020-07-12 18:54:28 -04:00
James R
6c875a8097
Merge branch 'marathoninfo2' into 'next'
...
Marathon Run fixes (Resolves #184 )
Closes #184
See merge request STJr/SRB2!1061
2020-07-12 18:47:38 -04:00
James R
6f8dfb6fca
Merge branch 'version-prep-is-a-stinky-butt-head' into 'master'
...
Automate some of the version numbers nonsense
See merge request STJr/SRB2!1054
2020-07-12 18:45:51 -04:00
James R
f1a5f5952b
Merge branch 'fix-required-flat' into 'next'
...
Comment out unused border patch variables.
See merge request STJr/SRB2!1055
2020-07-12 18:42:42 -04:00
Monster Iestyn
ed70675df3
added some helpful comments, remove duplicate code
2020-07-12 22:37:36 +01:00
Monster Iestyn
b8a794e37f
socklen_t isn't actually needed in either i_tcp.c or mserv.c if NONET is on!
...
(also added some more tabbing)
2020-07-12 22:29:15 +01:00
Monster Iestyn
0f4487eb68
* i_tcp.c: merge these three ifndef USE_WINSOCK blocks together
...
* mserv.c: added i_tcp.c's USE_WINSOCK macros so socklen_t isn't redundantly defined if Winsock 2 is used
2020-07-12 22:24:10 +01:00
Monster Iestyn
e133d8ec37
i_tcp.c: SCOUW2 and SCOUW7 haven't been defined since we got rid of Doom Legacy's makefiles for UnixWare 2/7 (which are ANCIENT), so get rid of them!
2020-07-12 22:08:35 +01:00
Monster Iestyn
43e53368b5
added tabbing to some of the preprocessor code in i_tcp.c and mserv.c to make it easier to read them (and to allow me to understand what I need to do for the next commit)
2020-07-12 21:31:25 +01:00
Monster Iestyn
8a032256bf
don't define __USE_MINGW_ANSI_STDIO in makefiles
...
(according to modern MinGW versions, defining this macro directly is deprecated)
2020-07-12 21:02:24 +01:00
Hannu Hanhi
3a488c243f
Fix translucency comparison from previous commit
2020-07-12 22:23:15 +03:00
Hannu Hanhi
9909746718
Fix crash by handling precip mobjs correctly in ogl sprite sorting
2020-07-12 21:50:00 +03:00
toaster
0a625d3e19
Fix live event backups being created at run start; there's no meaningful progress in GFZ1 to recover from.
2020-07-12 19:00:58 +01:00
kaysrishaq
a73f468ea4
Don't check empty string for duplicate name
2020-07-12 12:02:49 -04:00
Kays Ishaq
6e4b14588c
Update lua_infolib.c
2020-07-12 11:12:16 -04:00
Hannu Hanhi
ec13272d8c
Adjust model uvs when used sprite texture changes
2020-07-12 18:04:56 +03:00
kaysrishaq
a734129eae
lua_isboolean -> lua_toboolean
...
solves bugged set field accessible
2020-07-12 10:07:32 -04:00
Nev3r
2cdfb8ffc6
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-12 14:59:38 +02:00
toaster
e1a217dc10
Two minor fixes for Marathon Mode.
...
* Apply the RTA penalty to the live event backup rather than the current timer. (Resolves #184 )
* Snap the character name and timer mode text to the bottom of the screen, just above the bar.
2020-07-12 13:00:08 +01:00
kaysrishaq
74cfeaff30
A bit of cleaning
2020-07-12 07:56:25 -04:00
kaysrishaq
0f9e3554e2
various color fixes
2020-07-12 07:39:52 -04:00
GoldenTails
7015e656ce
Expose P_RailThinker to Lua.
2020-07-12 00:36:22 -05:00
GoldenTails
572bafa0f9
Use kinda counter-intuitive ternary operator to hack in a check for "use" for 2.2 compatibility
2020-07-11 21:59:54 -05:00
GoldenTails
da3ab1a14c
Ok fiiineee, I'll support 2.2
2020-07-11 21:59:54 -05:00
GoldenTails
a2635b2b86
The only "use" that I had to change to "spin" after a manual half hour search
2020-07-11 21:59:54 -05:00
GoldenTails
1f1589384a
Replace PF_USEDOWN with PF_SPINDOWN
2020-07-11 21:59:54 -05:00
GoldenTails
999d8018ca
Oops! Missed a couple...
2020-07-11 21:59:54 -05:00
GoldenTails
8b140b1831
Replace 'use' with 'spin' in game control constants
2020-07-11 21:59:54 -05:00
GoldenTails
8616823d7d
Remove another unneeded comment
2020-07-11 21:59:54 -05:00
GoldenTails
7b4dee87e6
Remove unneeded comment
2020-07-11 21:59:54 -05:00
GoldenTails
457714e480
Remove 2 characters of whitespace
...
This is what I get for using find+replace I guess lol
2020-07-11 21:59:54 -05:00
GoldenTails
465ad1a7bc
Replace all occurances of BT_USE with BT_SPIN (2.3?)
...
I'd use `next-major` but it doesn't exist lol
2020-07-11 21:59:54 -05:00
James R
84373b1726
Merge branch 'opengl-blending-fix' into 'next'
...
Fix ASTBlendPixel outputting empty pixels sometimes
See merge request STJr/SRB2!945
2020-07-11 20:57:30 -04:00
James R
6c3663812b
Merge branch 'ogl-linkdraw' into 'next'
...
MF2_LINKDRAW support for OpenGL
See merge request STJr/SRB2!1031
2020-07-11 20:52:11 -04:00
James R
479bbeacbe
Merge remote-tracking branch 'origin/next' into http-mserv
2020-07-11 17:41:46 -07:00
James R
2f30e81fdd
ADD to the buffer size
...
(cherry picked from commit bae37aea2c1b1ffab22f79e27415914f7e25fc89)
2020-07-11 17:41:09 -07:00
James R
ab3878e282
masterserver_token is back
...
(cherry picked from commit e7d949aeb2b9ef2297287ba35f9296684078f184)
2020-07-11 17:41:09 -07:00
James R
0b5062d31c
Set timeout on HMS connections
...
(cherry picked from commit fcbe4e668f1ac79811d1ab2fb9cfd44729e56e93)
2020-07-11 17:41:09 -07:00
James R
f32d91cc57
Resize response body buffer as needed
...
(cherry picked from commit 85fef2655cc78c9453aed423f5a1df6011ce3262)
2020-07-11 17:41:09 -07:00
James R
4e1d54c332
It's not always GCC, but it probably is gcc (I hope)
2020-07-11 12:45:35 -07:00
sphere
e95265a7fa
Comment out unused border patch variables, so GFZFLR01 isn't required anymore.
2020-07-11 12:11:26 +02:00
Nev3r
9f06903d72
What the fuck was I thinking?
...
Fixed really stupid brainless code piece involving polyobject spawnpoint tagging.
2020-07-11 11:01:05 +02:00
Nev3r
4013c0e0a1
Merge branch 'udmf-next' into udmf-multitag
2020-07-11 08:47:58 +02:00
Nev3r
a9dbf6daf6
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-11 08:47:32 +02:00
James R
6a54e5f4a6
Merge remote-tracking branch 'origin/master' into next
2020-07-10 23:04:50 -07:00
James R
8bcc2662d1
Merge branch 'netid-take-2' into 'next'
...
Use ordered id for netvars instead of shitty hash
See merge request STJr/SRB2!1010
2020-07-11 02:00:06 -04:00
James R
df98601b12
Merge branch 'bubbleshieldoverhaul' into 'next'
...
Bubble Shield overhaul
See merge request STJr/SRB2!1046
2020-07-11 01:56:53 -04:00
James R
f336b1e979
Merge branch 'i-added-the-branch-name-into-the-version-command-when-outside-of-develop-mode' into 'master'
...
Adds the branch name into the version command printout when outside of DEVELOP mode.
See merge request STJr/SRB2!981
2020-07-11 01:48:38 -04:00
James R
5cebf5c7bf
Merge branch 'makefile-detect-version' into 'master'
...
Detect GCC version in Makefile
See merge request STJr/SRB2!1002
2020-07-11 01:47:50 -04:00
James R
99e0c48f7b
Fix a lot of stuff related to the version automation
2020-07-10 22:39:46 -07:00
James R
1757002ddb
Automate VERSION/SUBVERSION; move version related definitions to version.h
...
CMake support. Srb2win.rc still needs touchy, whatever.
2020-07-10 22:20:33 -07:00
Steel Titanium
e22964ee0a
I screwed up
2020-07-10 23:16:18 -04:00
Steel Titanium
db6fc75b4f
Update player.dta hash
2020-07-10 20:53:42 -04:00
Steel Titanium
778089458c
Merge branch 'next' into 226-prep
2020-07-10 20:06:16 -04:00
Louis-Antoine
f8aefc2fd3
Revert "Fix computation of very high pings"
...
This reverts commit 82dbe95e22
2020-07-11 01:55:40 +02:00
Steel Titanium
d9483dabfd
Merge branch 'next' into 226-prep
2020-07-10 19:11:28 -04:00
Steel Titanium
759f9171a2
Update patch.pk3 hash again
2020-07-10 19:09:49 -04:00
Jaime Passos
d87c874559
Fix GL y-shearing ignoring a Y-flipped transform
2020-07-10 19:19:51 -03:00
Steel Titanium
dcd56a7fe3
Update patch.pk3 hash and Srb2win.rc
2020-07-10 18:13:01 -04:00
toaster
958d397cdb
Merge branch 'marathoninfo' into 'next'
...
Marathon Run adjustments
See merge request STJr/SRB2!1048
2020-07-10 17:54:51 -04:00
Steel Titanium
307125e84e
Update version number
2020-07-10 17:29:03 -04:00
Nev3r
6c6f16e158
Merge branch 'ogl-model-spr-uv-fix' into 'next'
...
Fix models that use sprite textures
See merge request STJr/SRB2!1049
2020-07-10 17:17:52 -04:00
toaster
217ac14ac5
Introduce a live event backup penalty for non MA_INGAME runs, since the change to saving time causes problems for this.
2020-07-10 21:36:37 +01:00
toaster
4c9cdcca0d
Hopefully fix the issue, which I can't recreate, of live event backups being created even if they shouldn't.
2020-07-10 21:27:34 +01:00
toaster
1956e9e670
Change the default value of the In-game/Realtime timer selection, based on speedrunner feedback.
2020-07-10 21:24:25 +01:00
toaster
8a5069156f
Add a small amount of extra info to the Evaluation screen for Marathon Mode, on request from multiple runners.
2020-07-10 21:16:28 +01:00
Hannu Hanhi
ad57426713
Adjust model uvs to power of two texture if sprite texture is used
2020-07-10 23:05:21 +03:00
toaster
205d4c8d20
Fix the issue where custom exits with skipped intermission screens (notably, Black Core Zone 2 and 3) would cause the game to softlock when playing on a save file, or with a live event backup.
2020-07-10 20:30:16 +01:00
Hannu Hanhi
5fdc4578db
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
2020-07-10 21:14:57 +03:00
Nev3r
ad55f5f872
Merge branch 'udmf-next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-multitag
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_ceilng.c
# src/p_floor.c
# src/p_mobj.c
# src/p_mobj.h
# src/p_polyobj.c
# src/p_saveg.c
# src/p_setup.c
# src/p_spec.c
# src/p_spec.h
# src/p_user.c
# src/r_bsp.c
# src/r_defs.h
2020-07-10 18:18:07 +02:00
Snu
be8f0853ef
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2 into bubbleshieldoverhaul
...
Updated to 2.2.5
2020-07-10 17:08:53 +01:00
Nev3r
710097a0ca
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-10 11:47:16 +02:00
Snu
d392c59935
Changed Bubble Shield functionality
2020-07-10 05:59:10 +01:00
Lachlan Wright
12ea5398c8
Merge branch 'restore-supergold' into 'next'
...
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3
See merge request STJr/SRB2!1042
2020-07-09 12:37:31 -04:00
Lachlan Wright
867728ca16
Merge branch 'custom-color-fixes' into 'next'
...
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
Closes #179 and #182
See merge request STJr/SRB2!1043
2020-07-09 12:37:16 -04:00
GoldenTails
59bd6d45a3
Whose idea was it to make the aPNG speed 1/2x by default?!
2020-07-08 18:14:11 -05:00
lachwright
3226a5d699
Fix custom skincolors being fullbright & signpost backgrounds using incorrect color shades
2020-07-09 05:56:11 +08:00
lachwright
c28ed25628
Restore SKINCOLOR_SUPERGOLD1-5 changes from 2.2.3
2020-07-09 00:00:21 +08:00
SteelT
31364d2120
Merge branch '225-prep' into 'next'
...
2.2.5 preparation
See merge request STJr/SRB2!1039
2020-07-07 14:55:06 -04:00
Lachlan Wright
337ec7bf6c
Merge branch 'remove-tricks' into 'next'
...
Remove Software tricks
See merge request STJr/SRB2!1036
2020-07-07 13:47:33 -04:00
Lachlan Wright
b9a088b16f
Merge branch 'fix-autoexec-netvars' into 'next'
...
Fix autoexec file trying to set netvars when joining from command-line
See merge request STJr/SRB2!1040
2020-07-07 13:47:13 -04:00
lachwright
994bf78fe2
Update Srb2win.rc
2020-07-08 00:48:01 +08:00
lachwright
129fd2e27b
Update patch.pk3 hash
2020-07-08 00:42:31 +08:00
toaster
274f649a02
M_RATHON header text.
2020-07-07 17:30:20 +01:00
Louis-Antoine
0858c2f6ed
Fix autoexec file trying to set netvars when joining from command-line
2020-07-07 16:19:25 +02:00
lachwright
706b3c509d
Make A_FlickyCenter usable in SOC/Lua
2020-07-07 20:42:00 +08:00
James R
d31c6ac5b5
Contact the master server admims
2020-07-06 19:15:40 -07:00
Steel Titanium
7d75c72263
Update the version number
2020-07-06 21:29:02 -04:00
Steel Titanium
ded902678c
Update md5 hash for player.dta and patch.pk3
2020-07-06 21:22:57 -04:00
Louis-Antoine
78f8a44c25
Fix timeout
2020-07-07 02:06:26 +02:00
Jaime Passos
3a4ce6aea3
Merge remote-tracking branch 'origin/next' into opengl-blending-fix
2020-07-06 19:48:13 -03:00
Jaime Passos
7911deebf8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
2020-07-06 19:29:14 -03:00
Steel Titanium
7d00255dc4
Merge branch 'master' into next
2020-07-06 12:13:00 -04:00
Nev3r
42d92eab2c
Fix erroneous merge conflict resolution.
2020-07-06 11:54:55 +02:00
Nev3r
fd5b05cafc
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-07-06 11:13:27 +02:00
Jaime Passos
4f6420274f
Remove Software tricks
2020-07-06 01:26:56 -03:00
Jaime Passos
5c5d907251
gr_ -> gl_
2020-07-06 01:15:08 -03:00
Jaime Passos
a739cb0da9
Remove unused texture formats
2020-07-06 00:58:09 -03:00
Jaime Passos
3d50bef0e5
Rename structs, turn GrTextureFormat_t into an enum
2020-07-06 00:52:10 -03:00
Jaime Passos
ac04853f8c
Remove GrTexInfo
2020-07-06 00:35:48 -03:00
Jaime Passos
abeedc4b65
Delete hw_glide.h
2020-07-06 00:27:34 -03:00
Hannu Hanhi
b4aa5cecc1
Merge remote-tracking branch 'upstream/next' into ogl-linkdraw
2020-07-05 13:27:51 +03:00
James R
de8019f163
Merge branch 'hahaha-credits' into 'next'
...
The credit
See merge request STJr/SRB2!1033
2020-07-04 18:00:49 -04:00
LJ Sonic
9c1bee694b
Merge branch 'knuxtweaks' into 'next'
...
Knuckles tweaks
See merge request STJr/SRB2!1030
2020-07-04 16:37:35 -04:00
LJ Sonic
9f69396054
Merge branch 'fix-gif-delay' into 'next'
...
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
See merge request STJr/SRB2!1023
2020-07-04 16:28:59 -04:00
LJ Sonic
6c61baa818
Merge branch 'fix-oldbrak-missiles2' into 'next'
...
Take 2: Fix Old Brak missiles + add pw_ignorelatch
See merge request STJr/SRB2!1006
2020-07-04 16:28:48 -04:00
James R
96bccd5f9f
Credit Oni for CODE
2020-07-04 12:59:56 -07:00
James R
d9005203c7
Fuck you macro
2020-07-04 12:52:01 -07:00
James R
e741a7b3c7
Actually save the cvar name in demos
2020-07-04 12:51:07 -07:00
LJ Sonic
17616967d3
Merge branch 'levelflat_name' into 'next'
...
Use levelflat->name instead of flatname
See merge request STJr/SRB2!1024
2020-07-04 08:46:04 -04:00
LJ Sonic
77e39a0fd5
Merge branch 'make-linedef-422-smarter' into 'next'
...
Make Linedef type 422 smarter
See merge request STJr/SRB2!1014
2020-07-04 08:35:42 -04:00
lachwright
17daf2faa2
Reduce speed cut when gliding underwater
2020-07-04 19:17:38 +08:00
LJ Sonic
cf4087a014
Merge branch 'jetjawsound' into 'next'
...
Jet Jaw Sounds
See merge request STJr/SRB2!1018
2020-07-04 07:09:43 -04:00
LJ Sonic
804ba6da9e
Merge branch 'more-platform-fixes' into 'next'
...
More platform fixes
See merge request STJr/SRB2!999
2020-07-04 07:07:17 -04:00
LJ Sonic
8d511ed565
Merge branch 'cez3debris' into 'next'
...
New Debris for CEZ3
See merge request STJr/SRB2!1012
2020-07-04 07:00:20 -04:00
lachwright
f03addc5a7
Merge remote-tracking branch 'origin/next' into knuxtweaks
2020-07-04 18:53:26 +08:00
LJ Sonic
98c657e703
Merge branch 'sf_nosupersprites' into 'next'
...
Add SF_NOSUPERSPRITES
See merge request STJr/SRB2!1000
2020-07-04 06:51:11 -04:00
LJ Sonic
5ee94c8ce7
Merge branch 'patch-1' into 'next'
...
Rename "Legacy" control scheme
See merge request STJr/SRB2!1029
2020-07-04 06:50:15 -04:00
lachwright
527e682931
Add sightcheck boolean to P_RadiusAttack
...
Also now destroys Egg Guard shields, and circumstantially Minuses
2020-07-04 18:27:06 +08:00
Lachlan
e2bdb56f97
Merge remote-tracking branch 'origin/next' into more-platform-fixes
2020-07-04 05:25:38 +08:00
Lachlan
cdb247d08f
Fix compiler warning
2020-07-04 05:25:34 +08:00
LJ Sonic
3679df07aa
Merge branch 'dragonbomber-height' into 'next'
...
Fix Dragonbomber z positioning
See merge request STJr/SRB2!1004
2020-07-03 17:05:10 -04:00
LJ Sonic
07bbebd9b0
Merge branch 'shift-when-hiding-in-1p-menu' into 'next'
...
Tweak display of hidden items in "1 Player" menu
See merge request STJr/SRB2!1013
2020-07-03 17:04:42 -04:00
LJ Sonic
6e7446dea3
Merge branch 'ff_horizontalflip' into 'next'
...
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
See merge request STJr/SRB2!987
2020-07-03 16:56:32 -04:00
Lachlan
e44d93f76b
Fix skiddust positional scaling
2020-07-04 04:30:57 +08:00
Lachlan
84000a0add
P_Earthquake: Use P_RadiusAttack in favor of thinker iteration
2020-07-04 04:00:28 +08:00
Lachlan
7e72009a87
Fix buildbot warning
2020-07-04 03:21:48 +08:00
SteelT
186335c2ac
Merge branch 'na-char-replays' into 'next'
...
Add support for saving/loading per-skin NiGHTS replays
See merge request STJr/SRB2!1025
2020-07-03 14:51:05 -04:00
lachwright
8652bbc1a5
Knuckles changes:
...
- Buffed crouch landing; lasts slightly shorter and cuts speed less
- Support for swimming! Knuckles has slightly different glide controls when he has swim sprites underwater
- Improved glide controls in 2D mode
- Super Knuckles perks: land from a glide or latch onto a wall to generate a shockwave and damage nearby enemies
- Refactored skid dust
- Made super sparks use FF_FULLBRIGHT
- Added P_SpawnSkidDust and P_Earthquake to Lua
2020-07-04 01:54:00 +08:00
colette
1cc2ab120d
"Legacy controls" was a mistake of a name
2020-07-02 23:17:33 -04:00
Hannu Hanhi
b29873ce1c
Better MF2_LINKDRAW support for OpenGL
2020-07-03 00:28:52 +03:00
lachwright
3ebc17ac3a
Merge branch 'next' into knuxtweaks
2020-07-02 13:08:04 +08:00
Zippy_Zolton
29dfa5f605
sound caption
2020-07-01 23:18:20 -05:00
James R
9eb58a8e42
Merge branch 'cheese' into 'next'
...
Cheese
See merge request STJr/SRB2!1028
2020-07-01 23:28:08 -04:00
James R
7a17c74893
Merge branch 'credits-225' into 'next'
...
More credits changes
See merge request STJr/SRB2!1027
2020-07-01 23:27:59 -04:00
James R
2cbf7ac27d
Cheese mode activate!
2020-07-01 16:37:36 -07:00
James R
e1996a437d
Add "Discord Community Testers" to the Testing section
2020-07-01 16:29:26 -07:00
James R
99a9c935f9
Credits: add back fickle, add Chrispy and Hannu
2020-07-01 16:23:26 -07:00
James R
fae583915a
Remove Producer role from the credits
2020-07-01 16:04:46 -07:00
Nev3r
ff8759e507
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/hardware/hw_main.c
2020-06-30 20:29:48 +02:00
Louis-Antoine
40e98e5712
Fix crash when a polyobject rotates a non-player mobj
2020-06-30 18:37:21 +02:00
Steel Titanium
612386aef0
Correct comment
2020-06-29 23:57:39 -04:00
Steel Titanium
e641895268
Address compat with old-style names
2020-06-29 23:54:45 -04:00
James R
696f9707fc
Merge branch 'special_save' into 'next'
...
Special saves! (Resolves #162 )
Closes #162
See merge request STJr/SRB2!1016
2020-06-29 19:18:30 -04:00
James R
84391f558b
Merge branch 'titlecard-double-clown-town' into 'next'
...
ACTUALLY fix #172
Closes #172
See merge request STJr/SRB2!1020
2020-06-28 18:41:22 -04:00
James R
e56fc08757
Merge branch 'delete-connection-screen-and-midgame-joins' into 'next'
...
Delete connection screen and midgame joins
See merge request STJr/SRB2!1021
2020-06-28 18:41:07 -04:00
Steel Titanium
3f3ff0688b
Add support for saving/loading per-skin NiGHTS replays
2020-06-28 16:59:36 -04:00
James R
335fc0b327
Use levelflat->name instead of flatname
2020-06-27 14:30:41 -07:00
SteelT
22459df1f1
Merge branch 'increase-input-buffer-more' into 'next'
...
Increase the length of the player input buffer even more
See merge request STJr/SRB2!951
2020-06-27 13:32:19 -04:00
GoldenTails
fef15be0af
Create a slightly more dynamic, optional frame delay system to show off your terrible hardware with
2020-06-27 10:56:15 -05:00
Louis-Antoine
93cc48054a
Expose "server" and "dedicated" to Lua scripts
...
Careful! Both are local variables and are always false for clients,
and therefore should obviously not be used in anything gamelogic-related.
2020-06-27 15:30:23 +02:00
Louis-Antoine
c96e07b61c
Delete CLIENT_CONNECTIONSCREEN and JOININGAME defines
2020-06-27 02:01:16 +02:00
Louis-Antoine
82dbe95e22
Fix computation of very high pings
2020-06-26 15:34:26 +02:00
James R
fbbfe3b3b1
Add back the int_none check
...
It got removed by 864e703355
2020-06-25 13:43:07 -07:00
James R
607a4dbee7
Remove caching of INTERSCW
2020-06-25 13:09:00 -07:00
James R
78e6bcc8ff
Just stretch the fallback card to the screen resolution
2020-06-25 13:08:00 -07:00
James R
864e703355
Only fill the intermission with blapck if we can't draw patches
...
This fixes an issue where patches cease to be drawn due to Y_UnloadData, but
the screen is still overwritten, causing the next wipe to start from void.
2020-06-25 13:04:03 -07:00
Zachary McAlpin
b973b43271
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-25 10:31:55 -05:00
toaster
f258131e55
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into special_save
...
# Conflicts:
# src/g_game.c
2020-06-25 10:48:36 +01:00
Zippy_Zolton
dc2f689957
Jet Jaw Sounds
2020-06-25 00:38:07 -05:00
James R
7317bbb692
Merge branch 'ogl-sprite-qsort' into 'next'
...
Faster OGL sprite sorting algorithm
See merge request STJr/SRB2!1008
2020-06-24 23:22:06 -04:00
James R
067d9b9a63
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-06-24 19:31:19 -07:00
Zachary McAlpin
b14f18c1a9
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 20:55:08 -05:00
James R
207d8aee4b
Merge branch 'acz3-softlock-fix' into 'next'
...
ACZ3 softlock fix
See merge request STJr/SRB2!1015
2020-06-24 21:43:42 -04:00
James R
95cc10d735
Merge branch 'ogl-mdl-tex-repeat-search-fix' into 'next'
...
Don't repeatedly look for model texture files
See merge request STJr/SRB2!1009
2020-06-24 21:42:40 -04:00
James R
9eb8fd8ac8
Merge branch 'fixeggsign' into 'next'
...
Fix the Eggman signpost's background color
See merge request STJr/SRB2!1007
2020-06-24 21:42:12 -04:00
James R
2e827705b4
Merge branch 'ogl-drawnode-fix' into 'next'
...
Faster and more correct OGL transparent surface sorting
See merge request STJr/SRB2!1005
2020-06-24 21:42:01 -04:00
James R
ac71bb76b6
Merge branch 'gme-cleanup-fixes' into 'next'
...
GME cleanup and fixes
See merge request STJr/SRB2!1001
2020-06-24 21:41:49 -04:00
Zachary McAlpin
5ef8c95cdb
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-24 19:47:52 -05:00
Monster Iestyn
7d2de8394f
Merge branch 'lua-side-enum-bruh' into 'next'
...
Fix missing bruh string in Lua side string options.
See merge request STJr/SRB2!1017
2020-06-22 15:23:34 -04:00
Latapostrophe
80e0d35391
Fix missing bruh string in lua side options. This is stupid.
2020-06-22 21:11:33 +02:00
toaster
4502604007
Special saves!
...
All this refactoring, just to resolve #162 . Specifically, it engages savegame events not at level load (except for savefile start) but on level completion, just after you've gotten all the intermission bonuses but before the intermission actually starts.
Also fixes a never-before-discovered bug where if the titlemap has LF_SAVEGAME, your save file will be overwritten upon returning to the title screen. This game is a mess of hacks, I swear...
One unintended side effect: It may actually be faster in some speedrun circumstances in mods with cutscenes to complete the map, exit back to the title screen, and reload the file. It's a common feature of optimal runs in games with cutscenes, though, and Marathon Run has a toggle for cutscenes, so I'm not particularly bothered.
2020-06-22 19:00:47 +01:00
GoldenTails
f0787077e3
More people ought to know what modulo is...
...
Or modulous if your prefer.
2020-06-22 04:14:42 -05:00
GoldenTails
6fe0874606
Stop resetting cusval cause that's annoying
2020-06-21 23:21:42 -05:00
GoldenTails
d609cfc9e3
Make it so Linedef type 422 instead sets cusval when the titlemap is in action.
...
I have no idea why it wasn't like this before, but oh well.
2020-06-21 22:20:06 -05:00
Zwip-Zwap Zapony
ae474b6945
Fix re-opening 1 Player menu re-lowering options
...
If an add-on disabled an option, re-opening the 1 Player menu
multiple times would lower the above options multiple times
Also fix Marathon Run and Tutorial being "perma-(un)lock"-able
2020-06-21 16:16:12 +02:00
sphere
e9e9cd6133
Give ACZ3 boss MF_NOCLIP(HEIGHT) when entering pinch phase, to prevent softlocking.
2020-06-21 16:01:24 +02:00
Zwip-Zwap Zapony
5655db11ab
Tweak display of hidden items in "1 Player" menu
...
If an option in the "1 Player" menu is unavailable in an add-on,
lower the above options to close the gap from the invisible option
Also make Marathon Run display as question marks if locked
And also change "sploadgame" to "spstartgame"
2020-06-21 09:30:55 +02:00
Louis-Antoine
65054bd0aa
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into increase-input-buffer-more
2020-06-21 01:20:39 +02:00
Zippy_Zolton
ca7fc22388
t_lspr
2020-06-20 14:16:22 -05:00
James R
7ec0b6c792
I meant consvar_number_of_netids to be exclusive :V
2020-06-20 00:53:51 -07:00
Zippy_Zolton
fc68134938
Thanks for the feedback, I have fixed your issues.
2020-06-20 02:04:18 -05:00
Zippy_Zolton
bfa1382736
New Debris for CEZ3
2020-06-20 02:02:13 -05:00
James R
3e52764935
Actually print a warning if the old demo id collides
2020-06-19 19:59:14 -07:00
James R
db34d70faa
Cvar compatibility with older demos
2020-06-19 18:04:20 -07:00
James R
32134a01fe
Save cvar names in demos; refactor cvar loading
2020-06-19 17:58:42 -07:00
James R
32773b71e0
Use ordered ids instead of hashes for cvar netid
...
Originally 6acd99c0a4
2020-06-19 16:36:36 -07:00
kaysrishaq
c74a607c54
Whoops, switched these for no reason
2020-06-19 11:11:19 -04:00
kaysrishaq
cad1f57b1e
FF_HORIZONTALFLIP and mobj->mirrored (sprite enhancements)
2020-06-19 11:11:18 -04:00
Hannu Hanhi
f3212746d2
Don't repeatedly look for model texture files
2020-06-19 16:18:04 +03:00
Hannu Hanhi
6f9b9aacf4
Faster OGL sprite sorting algorithm
2020-06-19 14:32:34 +03:00
lachwright
cab87b4632
lol should have tested before pushing
2020-06-19 15:59:09 +08:00
lachwright
47d9d87654
Fix the Eggman signpost's background color
2020-06-19 15:49:24 +08:00
kaysrishaq
682791a024
brak missile fix, pw_ignorelatch, small Recycler fix
2020-06-18 17:09:29 -04:00
Hannu Hanhi
ffaffdf3e1
Faster and more correct OGL transparent surface sorting
2020-06-18 20:27:19 +03:00
lachwright
7b2e54b426
Fix Dragonbomber z positioning
2020-06-19 00:52:24 +08:00
Hannu Hanhi
9477d372b9
Backwards compatibility for shaderless hardware
2020-06-18 17:39:34 +03:00
James R
193c45aa2f
Forgot a comma
2020-06-17 22:58:11 -07:00
James R
489bb81d00
Makefile: Move the PREFIX stuff up so version detection can take advantage of
2020-06-17 22:52:19 -07:00
James R
bf90fbb91f
Detect the compiler version and set the correct GCC flag
...
If the version is not supported by the Makefile, the flag for the latest
version supported is set instead.
2020-06-17 22:49:12 -07:00
SteelT
bff6b19056
Merge branch 'marathonmode' into 'next'
...
MARATHON RUN
See merge request STJr/SRB2!941
2020-06-17 19:36:10 -04:00
Steel Titanium
8365d975d3
A even more better fix for this
2020-06-17 18:40:56 -04:00
Steel Titanium
1e655fb2c1
Better fix for may be used uninitialized, maybe fixes GCC 4.x
2020-06-17 18:23:54 -04:00
Steel Titanium
3946309ece
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into sal-oglshaderport
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2020-06-17 18:15:07 -04:00
Steel Titanium
5708325d2b
Use SAMPLERATE for consistency with the rest of the code
2020-06-17 14:50:22 -04:00
Steel Titanium
f626b9f4d9
Fix VGZ sometimes causing SRB2 to crash by not playing the song early in I_LoadSong
2020-06-17 14:31:49 -04:00
Steel Titanium
a34be0e370
Reduce code duplication by creating get_zlib_error function
...
Reduce calls to gme_set_equalizer in I_LoadSong by moving it to I_PlaySong
Return false if it fails to decompress VGZ data in some form.
2020-06-17 14:19:19 -04:00
Steel Titanium
d3d5496a78
Fix facecolor may be used uninitialized.
2020-06-17 14:09:49 -04:00
lachwright
7d92631d97
Whoops, forgot hu_stuff.c
2020-06-17 05:27:42 +08:00
lachwright
edfd64877c
Add SF_NOSUPERSPRITES
2020-06-17 04:53:42 +08:00
lachwright
e403de7459
Merge branch 'next' into more-platform-fixes
2020-06-17 01:53:19 +08:00
lachwright
29738fcdd0
Allow Fang to bounce on solid rising floors without taking damage/losing all scorechain
2020-06-17 01:46:36 +08:00
lachwright
38e2c999c5
Platform fixes
2020-06-14 12:17:30 +08:00
MascaraSnake
88aad41310
Remove unnecessary options from quicksand FOF again
2020-06-12 18:22:16 +02:00
MascaraSnake
698c18bd40
Remove temporary splat rendering special case
2020-06-12 17:57:24 +02:00
MascaraSnake
06b581dcdf
Trim down options for the bobbing FOF preset types
2020-06-12 17:48:43 +02:00
MascaraSnake
5f9af65aa0
Revamp alpha setup for the remaining FOFs
2020-06-12 16:45:18 +02:00
Zachary McAlpin
6eccc7030d
I forgot to pop the error handler
2020-06-12 07:50:57 -05:00
Zachary McAlpin
965d42f974
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-12 07:32:44 -05:00
MascaraSnake
6521496d8a
Revamp alpha setup for bobbing FOFs
2020-06-12 10:53:27 +02:00
MascaraSnake
3317827151
Revamp alpha setup for bustable FOFs
2020-06-12 10:31:26 +02:00
MascaraSnake
f4e28f5cc4
Revamp alpha setup for quicksand FOFs
2020-06-12 10:23:16 +02:00
MascaraSnake
cc6820187c
Handle splat flag for laser FOFs
2020-06-12 10:17:52 +02:00
MascaraSnake
cadb03fd12
Revamp alpha setup for laser FOFs
2020-06-12 10:03:27 +02:00
MascaraSnake
d6a104f8a5
Revamp alpha setup for custom FOFs
2020-06-12 09:57:56 +02:00
MascaraSnake
ac549eddeb
Revamp alpha setup for crumbling FOFs
2020-06-12 09:28:41 +02:00
MascaraSnake
1ad8f75538
Revamp alpha setup for water FOFs
2020-06-12 09:00:06 +02:00
Nev3r
2322644488
Merge branch 'dofile' into 'next'
...
Add dofile() to Lua
See merge request STJr/SRB2!969
2020-06-12 02:32:16 -04:00
MascaraSnake
8dd3c78b05
Add FOF flag for splat flat rendering
2020-06-12 08:27:10 +02:00
MascaraSnake
a79862285e
Step 1 in refactoring FOF alpha setup: Pass alpha value to FOF adding functions as a parameter
2020-06-12 08:16:50 +02:00
Steel Titanium
b056bf1d6c
Merge branch 'master' into next
2020-06-11 20:11:26 -04:00
SteelT
c810ea3945
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolor bugfixes
See merge request STJr/SRB2!971
2020-06-11 20:08:50 -04:00
Zachary McAlpin
0d70e16b0b
Updated LUAh_GameQuit to use new error handler
2020-06-11 15:11:01 -05:00
Zachary McAlpin
08e9efee76
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-11 15:02:31 -05:00
lachwright
fad82265e0
Allow macOS builds to be launched through Steam
2020-06-12 01:19:06 +08:00
mazmazz
8fc414536f
CMAKE: Move launch-c into more sensible location
2020-06-10 15:08:09 -04:00
LJ Sonic
7ffee074d8
Merge branch 'next' into 'better-download'
...
# Conflicts:
# src/d_clisrv.c
2020-06-10 07:57:49 -04:00
LJ Sonic
bc2edb2ae4
Merge branch 'snake' into 'next'
...
Add a Snake minigame to the file transfer screen
See merge request STJr/SRB2!903
2020-06-10 07:38:37 -04:00
Zachary McAlpin
291479e3e8
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-09 19:54:47 -05:00
mazmazz
46b383acda
CMAKE: Fix toggle fullscreen breakage due to missing define
...
This is lazy. The correct solution is to eliminate the define in the program code
2020-06-09 17:32:14 -04:00
MascaraSnake
03cf0c6e3b
Merge branch 'udmf-next' into udmf-fofs-mkii
2020-06-09 22:10:30 +02:00
MascaraSnake
a76c8af60c
Compiling fix
2020-06-09 22:10:02 +02:00
mazmazz
36e17006b7
CMAKE: Fix OS X ccache scripts
2020-06-09 11:12:52 -04:00
MascaraSnake
9dbfa28dbc
Merge branch 'udmf-next' into udmf-fofs-mkii
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_linedefs.cfg
# src/p_setup.c
2020-06-09 09:50:02 +02:00
MascaraSnake
d07c376f6d
Adapt POF_SPLAT to UDMF setup
2020-06-09 09:44:49 +02:00
MascaraSnake
4a0206b38d
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_mobj.c
# src/p_polyobj.c
2020-06-09 09:38:01 +02:00
Steel Titanium
2abdc86537
Fix these "may be used uninitialized in this function" errors with batching
2020-06-08 20:18:32 -04:00
Steel Titanium
3dd89f67fa
Fix no previous prototype for TimeFunction
2020-06-08 19:56:24 -04:00
Steel Titanium
62d73968e2
Merge branch 'next' into sal-oglshaderport
2020-06-08 19:36:23 -04:00
mazmazz
01ff46326f
Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments
2020-06-08 11:57:57 -04:00
Digiku
70eb5ba634
Merge branch 'buffer-offset-fix' into 'master'
...
Strike null-pointer-arithmetic error in BUFFER_OFFSET
See merge request STJr/SRB2!989
2020-06-08 11:56:48 -04:00
Lachlan Wright
191e2e094d
Merge branch 'fix-spawn-desynch' into 'next'
...
Fix desynch when a player spawns
See merge request STJr/SRB2!977
2020-06-08 05:25:41 -04:00
Lachlan Wright
614a98bd9d
Merge branch 'dashmode-fixes' into 'next'
...
Dashmode fixes
See merge request STJr/SRB2!909
2020-06-08 05:25:30 -04:00
Lachlan Wright
590dfca582
Merge branch 'fix-continuing-mouse' into 'next'
...
Fix mouse being grabbed in continue screen
See merge request STJr/SRB2!983
2020-06-08 05:25:24 -04:00
mazmazz
f3c1db0650
CMAKE: Fix OSX CCache error
2020-06-08 03:08:58 -04:00
mazmazz
efba50c83c
CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package
2020-06-08 00:38:13 -04:00
mazmazz
aef9a1b522
CMAKE: Add CCACHE support
2020-06-08 00:35:31 -04:00
mazmazz
a5f7f9a534
Fix OPENMPT deprecation error, openmpt_module_ctl_set
2020-06-08 00:09:29 -04:00
mazmazz
2cefe82950
Fix OSX null-pointer-arithmetic error
2020-06-08 00:08:07 -04:00
mazmazz
ded6285249
CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo
2020-06-08 00:01:15 -04:00
mazmazz
a449fa4a1d
Added SDL Mixer X to CMAKE (Windows only)
2020-06-08 00:01:15 -04:00
Zachary McAlpin
78014cfd4c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-07 22:42:43 -05:00
Hannu Hanhi
0e521922c6
Change some unsigned ints to UINT32
2020-06-07 21:32:52 +03:00
Hannu Hanhi
abe13651d0
OpenGL draw call batching system
2020-06-07 21:20:52 +03:00
MascaraSnake
de7a806ec3
Merge branch 'nospinmovecut' into 'next'
...
Don't cut momentum if landing in a roll
See merge request STJr/SRB2!972
2020-06-07 13:24:19 -04:00
Hannu Hanhi
da98ea242e
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
2020-06-07 20:01:05 +03:00
SteelT
db32b01222
Merge branch 'renderstats' into 'sal-oglshaderport'
...
Render stats
See merge request STJr/SRB2!914
2020-06-07 12:29:58 -04:00
sphere
82200d80a9
Fix mouse being grabbed in the continue screen.
2020-06-07 00:40:33 +02:00
Monster Iestyn
28550b221a
Merge branch 'master' into next
2020-06-06 20:50:12 +01:00
Monster Iestyn
d2fefb6b9a
use void rather than VOID, because the logging init code isn't exclusively Win32, whoops
2020-06-06 20:49:12 +01:00
Monster Iestyn
7e562a3ca5
Merge branch 'master' into next
2020-06-06 20:35:48 +01:00
Monster Iestyn
982d1db5d8
Merge branch 'cppcheck-fixes' into 'master'
...
Cppcheck fixes
See merge request STJr/SRB2!967
2020-06-06 15:28:48 -04:00
lachwright
f68a95016e
Merge branch 'next' into nospinmovecut
2020-06-07 02:45:26 +08:00
Monster Iestyn
a4d7ff3c6d
Merge branch 'master' into next
2020-06-06 17:39:43 +01:00
Monster Iestyn
56b8ea3587
added liolib.c to the VC10 project files, since it was missing from them
2020-06-06 17:38:35 +01:00
GoldenTails
9aa68f524e
Adds the branch name into the version command printout when outside of DEVELOP mode.
...
Really just so I don't accidentally join netgames or record replays for vanilla SRB2 in the `next` branch...
2020-06-06 04:12:27 -05:00
MascaraSnake
50b47a1b25
Merge branch 'translucent-splat-planes' into 'next'
...
Allow transparent parts in translucent FOF and PolyObject planes
See merge request STJr/SRB2!978
2020-06-06 04:35:06 -04:00
Zachary McAlpin
ca66c5e7ee
Updated LUAh_GameQuit
2020-06-05 13:18:22 -05:00
Zachary McAlpin
7b779fa89b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-06-05 12:59:41 -05:00
Monster Iestyn
9e4ed738b7
Sync turnobjs for polyrotate_t thinkers in netgames
2020-06-04 21:31:26 +01:00
Monster Iestyn
cb7423b97e
sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean
2020-06-03 20:47:49 +01:00
Monster Iestyn
b11d58aef5
clean up BUGTRAP code in win32/win_main.c to avoid unmatched }
...
(though that said we don't officially care about the win32 folder files anymore)
2020-06-03 20:47:49 +01:00
Monster Iestyn
5349a0bf62
V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?)
2020-06-03 20:47:49 +01:00
Monster Iestyn
bb1a2dbba7
sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code
2020-06-03 20:47:49 +01:00
Monster Iestyn
8092d30376
Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t
2020-06-03 20:47:49 +01:00
Monster Iestyn
7340442839
P_XYMovement: initialise slopemom to all zeros
2020-06-03 20:47:49 +01:00
Monster Iestyn
adb11eec1b
dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large
2020-06-03 20:47:49 +01:00
Monster Iestyn
d11ba67288
G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order
2020-06-03 20:47:49 +01:00
Monster Iestyn
879a2bd20a
G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1
...
This way, if for some reason the ghost has no skin, nothing should spawn at all
2020-06-03 20:47:49 +01:00
MascaraSnake
33ed36cf4b
Effect 6 flag allows cutting of cyan pixels on FOF and PolyObject planes (even if they're translucent)
2020-06-03 19:41:47 +02:00
Louis-Antoine
9be188ff02
Minor edit
2020-06-02 10:31:56 +02:00
Louis-Antoine
286b316cf9
Fix dofile() return incorrect values
2020-06-01 15:43:14 +02:00
LJ Sonic
6895d7df92
Merge branch 'next' into 'dofile'
...
# Conflicts:
# src/lua_script.c
# src/lua_script.h
2020-06-01 09:28:56 -04:00
Louis-Antoine
e6ffedbce8
Fix food occasionally spawning inside the snake
2020-06-01 15:21:16 +02:00
LJ Sonic
04c7eeb6ae
Merge branch 'deprecate-fixedrem' into 'next'
...
Deprecate FixedRem.
See merge request STJr/SRB2!952
2020-06-01 08:30:44 -04:00
LJ Sonic
715cb857f5
Merge branch 'next' into 'better-download'
...
# Conflicts:
# src/sdl/i_system.c
# src/win32/win_sys.c
2020-06-01 08:16:53 -04:00
LJ Sonic
e2b860dc28
Merge branch 'next' into 'fix-spawn-desynch'
...
# Conflicts:
# src/p_map.c
2020-06-01 08:15:02 -04:00
MascaraSnake
11493e61d2
Merge branch 'executordelay' into 'udmf-next'
...
UDMF linedef executor delay
See merge request STJr/SRB2!918
2020-06-01 07:57:23 -04:00
MascaraSnake
b13f29852f
Merge branch 'gravflip-shadows' into 'next'
...
Move drop shadows to the ceiling for objects in reverse gravity
See merge request STJr/SRB2!973
2020-06-01 07:23:29 -04:00
MascaraSnake
8d7f4e3265
Merge branch 'movement-refactor' into 'next'
...
Clean up some movement code
See merge request STJr/SRB2!912
2020-06-01 07:21:41 -04:00
Louis-Antoine
3c3a60d189
Fix "downloads" command reporting incorrect progress
2020-06-01 10:37:05 +02:00
LJ Sonic
dd18915570
Merge branch 'traceback' into 'next'
...
Traceback
See merge request STJr/SRB2!974
2020-06-01 04:17:30 -04:00
MascaraSnake
508160ed42
Use 0 instead of 0xffff as dummy mobjnum
2020-05-31 22:58:14 +02:00
MascaraSnake
3a4502fa87
Netsync waypoint sequences
2020-05-31 22:44:25 +02:00
SwitchKaze
5a18bdf20b
Fix SOC color name reading
2020-05-30 16:52:44 -05:00
Louis-Antoine
d31346822d
Refactor hook library a little
2020-05-30 20:28:45 +02:00
Louis-Antoine
1bacaedde2
Show the traceback when a Lua script error happens
2020-05-30 20:24:33 +02:00
lachwright
f32d29f700
Oops, forgot to #undef
2020-05-31 01:26:23 +08:00
lachwright
a7f73bfa85
Move drop shadows to the ceiling for objects in reverse gravity
2020-05-31 01:21:26 +08:00
lachwright
5136a4d41d
Don't cut momentum if landing in a roll
2020-05-30 19:07:16 +08:00
lachwright
b874da5229
Ensure followmobj ghost exists before applying fuse
2020-05-30 18:26:11 +08:00
lachwright
51b640ad5a
Feedback so far indicates the old booster effect is preferred
2020-05-30 18:21:39 +08:00
lachwright
ae5d5b9546
Merge branch 'next' into dashmode-fixes
2020-05-30 18:13:21 +08:00
SwitchKaze
d589e6bc95
Fix signpost shade.
2020-05-29 21:41:20 -05:00
Zachary McAlpin
7bdea21435
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-29 15:32:59 -05:00
Louis-Antoine
1dbb755743
Add dofile() to Lua
2020-05-29 17:35:07 +02:00
LJ Sonic
b7c5163419
Merge branch 'luacolors-gcc10-fix' into 'next'
...
Fix the "Custom skincolors" branch not compiling with GCC 10.
See merge request STJr/SRB2!966
2020-05-29 11:23:54 -04:00
sphere
71cf31fcaf
Fix the "Custom skincolors" branch not compiling with GCC 10.
2020-05-28 18:43:04 +02:00
Louis-Antoine
c6e13d0e30
Fix crash when setting a mobj's angle from a Lua script
2020-05-28 18:34:56 +02:00
Monster Iestyn
755e9d659d
Merge branch 'master' into next
2020-05-28 16:34:06 +01:00
SteelT
07da7f7d29
Merge branch 'scroller-tweaks' into 'next'
...
Add back side wall scrollers & allow using offsets for tagged wall scrollers.
See merge request STJr/SRB2!955
2020-05-28 11:29:39 -04:00
LJ Sonic
aab6339e66
Merge branch 'possibly-fix-dedi-crash' into 'next'
...
Possible fix for dedicated server crashes (aka the msvcrt.dll!_mbscat crash)
See merge request STJr/SRB2!963
2020-05-28 11:29:00 -04:00
SteelT
1c42102ddb
Merge branch 'fix-input-buffer' into 'next'
...
Allow input buffer to hold more than 64 tics
See merge request STJr/SRB2!950
2020-05-28 11:27:39 -04:00
SteelT
f0b64971a0
Merge branch 'next-lc-uint16' into 'next'
...
Custom skincolors
See merge request STJr/SRB2!960
2020-05-28 11:23:05 -04:00
Louis-Antoine
67eef5a37f
Fix potential desynch when a player spawns
2020-05-28 11:03:35 +02:00
Louis-Antoine
bb1e3fdf13
Add a few missing calls to GameQuit hook
2020-05-27 14:58:10 +02:00
Monster Iestyn
40566e6926
Got_AddPlayer: check that I_GetNodeAddress(node) is non-NULL before using strcpy to copy it to the playeraddress array
2020-05-25 21:27:48 +01:00
mazmazz
272362a86f
Fix NOWIPE bugs with colormap fade and title card
2020-05-25 00:20:23 -04:00
mazmazz
8fee9a51ce
Add NOWIPE behavaior for colormap fades
2020-05-25 00:19:41 -04:00
Monster Iestyn
ed25fefcae
T_BounceCheese: Fix FOF height desync occurring if the FOF fell down too fast (resulting in a bizarre bouncing back up effect in MP SS5 due to P_FloorzAtPos messing up as a result)
2020-05-24 21:15:31 +01:00
SwitchKaze
f508f5b881
Fix typo SKINCOLOT
2020-05-24 12:36:20 -05:00
SwitchKaze
b37c73b008
Make colors UINT16, increase color freeslots to 1024
2020-05-23 19:35:36 -05:00
Zachary McAlpin
566a5a0ab7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-23 15:23:43 -05:00
MascaraSnake
747d784c77
Merge branch 'splitshot-notarget-fix' into 'next'
...
A_SplitShot no target fix
See merge request STJr/SRB2!956
2020-05-23 07:52:36 -04:00
SwitchKaze
46191cade7
Update to 2.2.4
2020-05-22 16:47:51 -05:00
Monster Iestyn
4b7f0f49f1
added the ability to get the # of a mapthing_t in Lua
2020-05-22 18:32:34 +01:00
Monster Iestyn
c9c7327011
A_SplitShot fix: don't even attempt to A_FaceTarget (or anything beyond) if there is no target to face to begin with
2020-05-21 19:42:48 +01:00
Monster Iestyn
7722d41be6
Merge branch 'sprite-projection-fixes' into 'next'
...
Sprite projection fixes
See merge request STJr/SRB2!954
2020-05-20 15:33:30 -04:00
Monster Iestyn
702a7041d4
also do the fovtan multiplication thing with precip sprites
2020-05-20 19:34:18 +01:00
Louis-Antoine
bf00955786
Wait for acks before resending file fragments
2020-05-20 16:21:18 +02:00
James R
4eeae51cbb
Merge branch 'more-lua-map-names' into 'next'
...
G_BuildMapTitle for Lua, G_BuildMapName outside of levels
See merge request STJr/SRB2!694
2020-05-19 23:13:35 -04:00
Louis-Antoine
06060c02d3
Add a command to list current file transfers
2020-05-20 00:24:53 +02:00
Louis-Antoine
c8948909d3
Fix I_Error when queuing multiple Lua files
2020-05-19 23:50:37 +02:00
sphere
934b28989f
Add linedef actions 507 & 508, allow using offsets for actions 502-504.
2020-05-19 23:39:35 +02:00
Monster Iestyn
c3d576058a
on second thought maybe we don't need extra tx clamping, it turns out to be more effort than it's worth (at least for now)
...
meanwhile, let's move x/yscale calculations down since we don't actually need them until later on
2020-05-19 22:00:34 +01:00
Louis-Antoine
f620b52672
Fix sending Lua files in text mode
2020-05-19 21:36:21 +02:00
Louis-Antoine
34c5da39e2
Create FIL_ConvertTextFileToBinary
2020-05-19 20:00:58 +02:00
Monster Iestyn
65d6b04fd2
change limits for tx based on fov, by multiplying by fovtan
...
this makes it so that higher fov values can actually let you see all the sprites that should be in the view
2020-05-19 18:54:39 +01:00
Monster Iestyn
35e5d673e0
do tx checking after tz clamping, not before
2020-05-19 18:43:33 +01:00
Monster Iestyn
12e1094143
We don't actually need x1 or x2 until these points in the function, at least for papersprites
2020-05-19 17:23:22 +01:00
Monster Iestyn
1a790235c6
added basic culling of papersprites if tx for either is too large, proper clamping to be added later
...
also removed some commented out old code
2020-05-19 17:19:44 +01:00
Monster Iestyn
c8320b6c9d
split "rot" into two variables: frame and rot, for frame number and rotation angle
...
it always bothered me that "rot" was used for both of the above, since it confused me as to what it was for every time I look at this function
2020-05-19 16:58:53 +01:00
Monster Iestyn
dd42682791
remove gxt and gyt, as they are unnecessary
...
also add a few comments to explain what tx/tz are
2020-05-19 16:48:50 +01:00
Louis-Antoine
06d3af6716
Refactor Lua file transfer code
2020-05-19 15:16:51 +02:00
Louis-Antoine
db85c62c6f
Allow resuming the most recent file transfer
2020-05-19 11:28:24 +02:00
MascaraSnake
ff37975892
Merge branch 'next' into movement-refactor
...
# Conflicts:
# src/p_map.c
2020-05-19 09:50:23 +02:00
MascaraSnake
6f854f2de3
Merge branch 'more-polyobject-cleanup' into 'next'
...
Smooth polyobject movement and other cleanup
See merge request STJr/SRB2!947
2020-05-18 16:00:55 -04:00
MascaraSnake
33a22331f8
Merge branch 'waypoints' into 'next'
...
Store waypoints at map load instead of iterating through the thinker list to find them
See merge request STJr/SRB2!938
2020-05-18 16:00:46 -04:00
Zachary McAlpin
530d0e3421
Remove redundant M_QuitResponse call
2020-05-18 14:56:10 -05:00
Zachary McAlpin
ed78d17ed3
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-18 14:50:58 -05:00
Louis-Antoine
d40a8efce2
I forgot to test OpenGL :slight_smile:
2020-05-18 20:35:30 +02:00
GoldenTails
8b801921a4
Deprecate FixedRem.
...
It's about time!
2020-05-18 11:29:56 -05:00
Louis-Antoine
435643b958
Fix P_GetZAt for Lua
2020-05-18 16:16:45 +02:00
Louis-Antoine
d0abd6e86c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into slope-cleanup
...
# Conflicts:
# src/hardware/hw_main.c
# src/p_spec.c
2020-05-18 16:14:05 +02:00
Louis-Antoine
a06c4a8c98
Rename P_GetZAt to P_GetSlopeZAt and P_GetZAt2 to P_GetZAt
2020-05-18 15:23:56 +02:00
Louis-Antoine
37d2796b91
Increase the length of the player input buffer even more
2020-05-18 12:35:55 +02:00
Louis-Antoine
56cc5190e5
Allow input buffer to hold more than 64 tics
2020-05-18 11:34:09 +02:00
Louis-Antoine
e49d3d0bb9
Use per-node reference tics in ExpandTics
2020-05-17 20:23:07 +02:00
Louis-Antoine
fc07db26c0
Store starttic as a raw value in PT_SERVERTICS packets
...
This avoids some desynch issues and is simpler to handle.
Those packets are always big anyway, so the difference is irrelevant.
2020-05-17 20:09:11 +02:00
MascaraSnake
c05d1dd979
Merge branch 'software-missing-sprite-column' into 'next'
...
Fix missing sprite column (resolves #135 )
See merge request STJr/SRB2!944
2020-05-17 02:30:32 -04:00
MascaraSnake
a7c7f7afa9
Merge branch 'fof-cleanup' into 'next'
...
FOF cleanup
See merge request STJr/SRB2!910
2020-05-17 02:30:16 -04:00
Louis-Antoine
bf11e3a361
Add missing packet name
2020-05-16 23:22:33 +02:00
Louis-Antoine
66ecfb741a
Show total size when downloading gamestate
2020-05-16 22:49:20 +02:00
Louis-Antoine
3c7c758d17
Rewrite file transfer code
...
This code uses a custom packet acknowledgement system,
which is more suited for file transfer and does not suffer from
the small sender window used by the default acknowledgement system
2020-05-16 22:09:00 +02:00
Jaime Passos
423494381e
Fix mistake
2020-05-16 14:01:42 -03:00
Jaime Passos
c64e231b2b
Attempt to properly match Software texture blending
...
without messing with the original ASTBlendPixel function
2020-05-16 13:51:10 -03:00
Monster Iestyn
20e4d5ab9e
lib_sStopSoundByID: fixed mixed declaration and code compiler warning
2020-05-16 16:14:47 +01:00
MascaraSnake
969c48fac8
Merge branch 'udmf-next' into udmf-polyobjects
...
# Conflicts:
# src/p_polyobj.c
2020-05-16 11:18:47 +02:00
MascaraSnake
9b25ab27ca
Merge branch 'stop-sound-by-id' into 'next'
...
S_StopSoundByID Lua support
See merge request STJr/SRB2!925
2020-05-16 04:55:46 -04:00
MascaraSnake
5d7bea6400
Merge branch 'more-demo-cleanup' into 'next'
...
More Demo code cleanup
See merge request STJr/SRB2!942
2020-05-16 04:52:31 -04:00
MascaraSnake
371a1851e3
Polyobject waypoint movement: Prevent infinite loop if all waypoints are in the same location
2020-05-16 10:24:06 +02:00
MascaraSnake
536e355cdf
polywaypointdata_t: Turn reverse and continuous into flags
2020-05-16 09:49:30 +02:00
MascaraSnake
06dda9c69d
EV_DoPolyObjWaypoint: Don't discard movement if you start at the last waypoint
2020-05-16 09:09:26 +02:00
MascaraSnake
3680b246c9
T_PolyObjWaypoint: We can find waypoints in constant time now, so no need to store the waypoint mobj in the thinker anymore
2020-05-16 09:03:02 +02:00
MascaraSnake
1057c0f7c1
T_PolyObjWaypoint: If the polyobject reaches its target exactly, find next waypoint in the same tic
2020-05-16 08:49:03 +02:00
MascaraSnake
e422d1fa1d
Rewrite T_PolyObjWaypoint to move more smoothly
2020-05-16 08:45:06 +02:00
Steel Titanium
69c86c63b3
Fix A_SpinSpin not being usable in Lua or SOC due to an error
2020-05-15 23:05:29 -04:00
MascaraSnake
ed9b76e4b9
Merge branch 'opengl-character-select-mipmap-memory-leak-fix' into 'next'
...
Fix colormap mipmap memory leak on the character select in OpenGL
See merge request STJr/SRB2!943
2020-05-15 16:41:19 -04:00
MascaraSnake
8f4ed5af62
Merge branch 'nights-character-select' into 'next'
...
Character select in Nights mode.
See merge request STJr/SRB2!862
2020-05-15 16:39:38 -04:00
toaster
a5150e07fd
* Swap location of Tutorial and Marathon Run, per sphere's suggestion.
...
* Lock Marathon Run if Record Attack isn't available, to avoid confusing new players.
2020-05-15 21:32:54 +01:00
toaster
a615de3504
Correctly reset map/timer for retries where the first map in Marathon Run is LF_NORELOAD (by forcing a reload when the retry option is used).
2020-05-15 21:17:57 +01:00
James R
1ccca987cb
Jart? What's that?
2020-05-15 12:57:31 -07:00
Jaime Passos
288d7166bc
Fix ASTBlendPixel outputting empty pixels if the background pixel was empty, BUT if the foreground pixel had no alpha at all
2020-05-15 16:41:39 -03:00
Jaime Passos
00ac9deb5b
Fix missing sprite column
2020-05-15 16:17:31 -03:00
Jaime Passos
dd3c7aa0af
Fix colormap mipmap memory leak on the character select in OpenGL
2020-05-15 15:58:20 -03:00
Jaime Passos
5e28e358ad
Fix memory leak
2020-05-15 15:45:00 -03:00
MascaraSnake
0508f99419
T_PolyObjWaypoint: Move duplicated movement code into its own function
2020-05-15 17:35:07 +02:00
toaster
9686ad2d70
* In-game timer option! Doesn't tick in intermission or in lag, only when a frame is actually run. Realtime option remains default.
...
* Tweak retry behaviour to restart timer and not subtract life if you're on the first level and haven't hit a checkpoint yet.
2020-05-15 16:33:20 +01:00
toaster
1e3e9c81ac
Remove emblem hints from Marathon Run (I think Options is good just for the sake of live events, though).
2020-05-15 15:23:31 +01:00
toaster
47419ce0df
Introducing "antisplice" - a pair of small highlights on the Marathon bar that is based on the real time the executable has been open for and *isn't* restored with the Live Event Backup, making spliced runs basically intractable.
2020-05-15 15:08:45 +01:00
toaster
f06206cd5f
Fix "press any other key" sending you to HOM hell.
2020-05-15 14:24:29 +01:00
toaster
271c6d354b
Re-order Marathon bar to be drawn before FPS and captions if applicable.
2020-05-15 13:39:27 +01:00
toaster
4348ebdfa8
Make live event backup files savedata specific (new format: live%s.bkp, where %s is the time attack folder name/savegame name - so vanilla's is livesrb2sav.bkp).
2020-05-15 13:37:06 +01:00
toaster
2aa542d2bf
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into marathonmode
...
# Conflicts:
# src/doomdef.h
2020-05-15 13:23:37 +01:00
toaster
e99d38ffaf
Make a falsy useBlackRoc prevent doing Black Rock sparkle calculations and Egg Rock pulse sounds.
2020-05-15 13:19:52 +01:00
MascaraSnake
9cd9d2e0d7
Merge branch 'carry-dust-devil' into 'next'
...
Add carry types to Dust devils
See merge request STJr/SRB2!886
2020-05-15 02:50:29 -04:00
Jaime Passos
1a79f6246d
Merge remote-tracking branch 'origin/next' into pictureformats
2020-05-15 01:34:54 -03:00
James R
2ec97b87a0
This is SRB2
2020-05-14 17:29:36 -07:00
James R
57c7df74d9
Rename hms123311.c to http-mserv.c
...
HMS lives on in our hearts!
(cherry picked from commit e8a2397deaacdd7dc6f80717755bc89161247cb5)
2020-05-14 17:28:55 -07:00
James R
fec8879797
Use Unlock_state here too
...
(cherry picked from commit a6ce21b450644a79b08b9533166704c7ef093816)
2020-05-14 17:28:55 -07:00
toaster
d593e2e1bb
Introducing Marathon Run. (I was going to call it Marathon Mode, but NiGHTS Mode being right next to it on the menu looked terrible.)
...
Basically a dedicated Record Attack-like experience for speedrunning the game as a continuous chunk rather than ILs. Has several quality of life features.
Benefits include:
* An unambiguous real-time bar across the bottom of the screen, always displaying the current time, ticking up until you reach the ending.
* Disable the console (pausing is still allowed, but the timer will still increment).
* Automatically skip intermissions as if you're holding down the spin button.
* Show centiseconds on HUD automatically, like record attack.
* "Live Event Backups" - a category of run fit for major events like GDQ, where recovery from crashes or chokes makes for better entertainment. Essentially a modified SP savefile, down to using the same basic functions, but has its own filename and tweaked internal layout.
* "spmarathon_start" MainCfg block parameter and "marathonnext" mapheader parameter, allowing for a customised flow (makes this fit for purpose for an eventual SUGOI port).
* Disabling inter-level custom cutscenes by default with a menu option to toggle this (won't show up if the mod doesn't *have* any custom cutscenes), although either way ending cutscenes (vanilla or custom) remain intact since is time is called before them.
* Won't show up if you have a mod that consists of only one level (determined by spmarathon_start's nextlevel; this won't trip if you manually set its marathonnext).
* Unconditional gratitude on the evaluation screen, instead of a negging "Try again..." if you didn't get all the emeralds (which you may not have been aiming for).
* Gorgeous new menu (no new assets required, unless you wanna give it a header later).
Changes which were required for the above but affect other areas of the game include:
* "useBlackRock" MainCFG block parameter, which can be used to disable the presence of the Black Rock or Egg Rock in both the Evaluation screen and the Marathon Run menu (for total conversions with different stories).
* Disabling Continues in NiGHTS mode, to match the most common singleplayer experience post 2.2.4's release (is reverted if useContinues is set to true).
* Hiding the exitmove "powerup" outside of multiplayer. (Okay, this isn't really related, I just saw this bug in action a lot while doing test runs and got annoyed enough to fix it here.)
* The ability to use V_DrawPromptBack (in hardcode only at the moment, but) to draw in terms of pixels rather than rows of text, by providing negative instead of positive inputs).
* A refactoring of redundant game saves smattered across the ending, credits, and evaluation - in addition to saving the game slightly earlier.
* Minor m_menu.c touchups and refactorings here and there.
Built using feedback from the official server's #speedruns channel, among other places.
2020-05-14 23:10:00 +01:00
Monster Iestyn
ee520b4a0d
split significant chunks of G_CheckDemoStatus into their own smaller functions, also give writing demo checksums its own little function
2020-05-14 20:57:21 +01:00
kaysrishaq
70896f9095
clean whitespace
2020-05-14 07:42:06 -04:00
kaysrishaq
c2a54acae3
Minor reorganization
2020-05-14 07:17:58 -04:00
kaysrishaq
fd31c5cd5e
Update
...
Worked out some edge cases that had resulted in tracks restarting in the same format when they shouldn't - or tracks not switching to the other format when they should.
Removed stray }
2020-05-14 06:33:03 -04:00
kaysrishaq
53252f0d14
Merge branch 'next' into musicpref-var
2020-05-14 03:38:38 -04:00
James R
0b9c20cc70
ok
2020-05-13 17:52:49 -07:00
ZipperQR
6a9543b1c2
no message
2020-05-14 03:35:46 +03:00
James R
ae45333535
Revert "Use new two digit version number for HMS"
...
This reverts commit 7d2b3b0877
2020-05-13 17:31:51 -07:00
James R
4b19a3321b
Bind HMS connection with -bindaddr
2020-05-13 17:26:53 -07:00
James R
fb6572f080
Reset the masterserver address if the old one was set by the config
2020-05-13 17:26:34 -07:00
James R
35419cd77e
Clarify where debug prints go when using masterserver_debug
2020-05-13 17:26:34 -07:00
James R
d91d7773be
Use IPv4 for master server connections
...
Your server's address is gathered from the request, so it needs to be IPv4!
2020-05-13 17:26:34 -07:00
James R
7d2b3b0877
Use new two digit version number for HMS
2020-05-13 17:26:34 -07:00
James R
3e936a0878
Oops a debug condition snuck in there
2020-05-13 17:26:34 -07:00
James R
f9ec2a634c
Fix switching the master server
2020-05-13 17:26:34 -07:00
James R
47bc3bff13
Put some mutex on CONS_Printf etc. hahaha
2020-05-13 17:26:34 -07:00
James R
ca8b3e95af
Fucking multithreading in the server registration
...
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
2020-05-13 17:25:52 -07:00
James R
a80c7a26dd
Wait for threads before SDL_Quit (lol)
2020-05-13 17:25:52 -07:00
James R
5fff4c35fc
Create cond if it doesn't exist when signaling
2020-05-13 17:25:52 -07:00
James R
00ffb29f95
Use malloc for hms
2020-05-13 17:25:52 -07:00
Steel Titanium
ff8987f745
Support for http downloads
...
(cherry picked from commit 6fcc06bf72cf3b95c30f04919e807c7aaacec68d)
(cherry picked just the libcurl stuff)
2020-05-13 17:25:52 -07:00
James R
7ebde22b77
Make mod update, room list and server list multithreaded
...
This took fucking ages and it still fails sometimes in edge cases, but I
don't give a FUCK right now.
2020-05-13 17:24:27 -07:00
James R
886bd34be5
Multithreading in my SRB2???
2020-05-13 17:21:19 -07:00
James R
1584b7394b
WHY THE FUCK DID I DO THIS
2020-05-13 17:21:18 -07:00
James R
676865c1b9
Oops
2020-05-13 17:21:18 -07:00
James R
9216406eea
Handle NULL hms buffer
2020-05-13 17:21:18 -07:00
James R
197cffb7f5
Compiler errors: won't stop, can't stop
2020-05-13 17:21:18 -07:00
James R
4fcd24d848
masterserver_update_rate cvar determines wait between updates in minutes
...
The new default is 15 minutes as well. And if you think that's too long, I have
confirmed that the Master Server delists inactive servers after a whopping 40
minutes, at least.
2020-05-13 17:20:59 -07:00
James R
bb8b279cd4
Don't try to update right after registering
2020-05-13 17:20:59 -07:00
James R
eac7b2e060
Add a hack so the 'All' room isn't display for hosting
2020-05-13 17:20:59 -07:00
James R
4fd707984b
Kill the old mserv, long live HMS!
2020-05-13 17:20:59 -07:00
James R
1e4e5275b5
Clean up header text
2020-05-13 17:18:27 -07:00
James R
1f295b8e50
HTTP update alert
2020-05-13 17:18:27 -07:00
James R
1f04f8e0c0
Fix some goofs
2020-05-13 17:18:27 -07:00
James R
ec1d4c9a91
Bruh
2020-05-13 17:18:27 -07:00
James R
bcfbd5563b
Clean up a bunch of stuff and follow the Master Server API more closely
2020-05-13 17:18:27 -07:00
James R
b15b90f217
Windows certs do work, thanks Steel!
2020-05-13 17:18:27 -07:00
James R
a4bbc06f25
Handle more errors
2020-05-13 17:18:27 -07:00
James R
f26ad18e28
Kill masterserver_token
2020-05-13 17:18:27 -07:00
James R
273e1ff170
This will be the Master Server in 2020
2020-05-13 17:18:27 -07:00
James R
bec97faf5c
Use https because my web server redirects
2020-05-13 17:18:27 -07:00
James R
768ad80a97
strtok can return NULL
2020-05-13 17:18:27 -07:00
James R
9e0c1b3f1f
This time I fucked up
2020-05-13 17:18:27 -07:00
James R
bec233515e
Windows gaysed: the sequel
2020-05-13 17:18:27 -07:00
James R
acdced643c
Windows is weird
2020-05-13 17:18:27 -07:00
James R
2cfb04f90b
masterserver_debug to set CURLOPT_VERBOSE
2020-05-13 17:18:27 -07:00
James R
8228182823
Don't show "All" room when hosting
2020-05-13 17:18:27 -07:00
James R
06764dd88e
I don't even know my own website
2020-05-13 17:18:26 -07:00
James R
83365e6ce0
lol
2020-05-13 17:18:26 -07:00
James R
06da1425b3
The big bad HTTP master server
...
Cvars:
http_masterserver is the url to the master server's API.
masterserver_token may be an authentication token.
2020-05-13 17:18:26 -07:00
kaysrishaq
7f7ccc9911
musicpref console variable
...
Adds musicpref to console and sound options menu, which allows users to select whether to prioritize MIDI or Digital music.
Functions GameMIDIMusic_OnChange and GameDigiMusic_OnChange updated to not assume digital music priority, and to have more consistent behavior between the two.
Positive side effect of using P_RestoreMusic in these functions means that powerup music (speed shoes, invincibility) will restore in the correct position when reenabling the original MusicType they loaded in with.
2020-05-13 19:20:21 -04:00
MascaraSnake
02c2aeb46a
Merge branch 'udmf-next' into udmf-fofs-mkii
2020-05-13 16:23:36 +02:00
MascaraSnake
7413da918b
Store PolyObject waypoint return behavior in an enum
2020-05-13 16:21:47 +02:00
MascaraSnake
b561ee7921
Remove diffx/y/z from polywaypoint_t, since they're always 0 anyway
2020-05-13 14:40:07 +02:00
MascaraSnake
acdb4b42ea
Merge branch 'actnum-tweaks' into 'next'
...
Act number tweaks
See merge request STJr/SRB2!905
2020-05-13 04:25:53 -04:00
MascaraSnake
9d06cb4be4
Merge branch 'fix-window-icon' into 'master'
...
Fix window icon being reset when switching renderers on non-Windows platforms
See merge request STJr/SRB2!898
2020-05-13 04:14:51 -04:00
MascaraSnake
0e2fb59650
Merge branch 'ogl-gif-fix' into 'master'
...
Fix OpenGL only recording the first frame of unoptimized GIFs
See merge request STJr/SRB2!928
2020-05-13 04:09:58 -04:00
MascaraSnake
ff3768f3e0
Merge branch 'udmf-next' into executordelay
2020-05-13 10:01:41 +02:00
MascaraSnake
1ccda0b85c
Merge branch 'next' into udmf-next
2020-05-13 10:01:12 +02:00
MascaraSnake
d3ec12c842
Merge branch 'udmf-next' into executordelay
...
# Conflicts:
# src/p_spec.c
2020-05-13 09:55:25 +02:00
MascaraSnake
aa16bd22f9
Fix accidental swap of first and last waypoint
2020-05-13 09:32:00 +02:00
MascaraSnake
36843cbfd6
Merge branch 'next' into waypoints
2020-05-12 23:51:32 +02:00
MascaraSnake
d708789c3a
Store waypoints (for zoom tubes, rope hangs, polyobjects) explicitly
2020-05-12 23:50:30 +02:00
Louis-Antoine
bf660dd35a
Rename local variables
2020-05-12 19:58:16 +02:00
Monster Iestyn
8c88c3dbb4
added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c)
2020-05-12 18:43:49 +01:00
Monster Iestyn
064f4bcf34
added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case)
2020-05-12 18:42:16 +01:00
Monster Iestyn
dab212dc56
turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file)
2020-05-12 18:40:51 +01:00
Monster Iestyn
89cd756cd8
make savegamename in doomdef.h an extern, put the actual definition in d_main.c
2020-05-12 18:37:15 +01:00
Louis-Antoine
061fd4761a
Rename some file transfer functions
2020-05-12 19:06:40 +02:00
sphere
4eb5f09c6f
Restore SHORT().
2020-05-12 17:20:29 +02:00
sphere
0287c6956e
Fix some errors and add some comments. Also, actnum is not an INT32.
2020-05-12 17:20:28 +02:00
sphere
69c11a8220
Support act numbers up to 99 and draw both digits individually.
2020-05-12 17:17:24 +02:00
MascaraSnake
435e6c9812
Rename variables for Fang waypoints, in preparation for new global waypoint data structure
2020-05-12 14:53:10 +02:00
Steel Titanium
feced5ec3c
Merge branch 'master' into next
2020-05-11 18:20:09 -04:00
SteelT
78fe9af56a
Merge branch 'splitscreen-titlecards-fix' into 'master'
...
Fix splitscreen Title Card act name regression
See merge request STJr/SRB2!934
2020-05-11 18:18:22 -04:00
SteelT
432cca7556
Merge branch 'menu-soc-bullshit-mergefix' into 'master'
...
Menu soc bullshit mergefix
See merge request STJr/SRB2!933
2020-05-11 18:17:59 -04:00
James R
e80f6497d7
Merge remote-tracking branch 'origin/next' into 2.2.4-prep
2020-05-11 15:01:32 -07:00
Louis-Antoine
0c4f983eb5
Fix crash with rollout rock
2020-05-11 23:48:35 +02:00
James R
a645f3a44f
Update patch.pk3 asset hash
2020-05-11 14:41:36 -07:00
James R
c52c8e0282
Update version names, SUBVERSION, MODVERSION
2020-05-11 14:41:36 -07:00
Monster Iestyn
d508d16cef
Merge branch 'master' into next
2020-05-11 20:08:02 +01:00
Zwip-Zwap Zapony
334ad93c56
Fix splitscreen Title Card act name regression
...
This fixes act names not being shown on player 2's view
2020-05-11 19:57:20 +02:00
MascaraSnake
e288c9d4f2
Merge branch 'fix-simple-camera-and-eggstatue' into 'next'
...
Fix Simple Camera not working with the tutorial's statue challenge
See merge request STJr/SRB2!931
2020-05-11 13:31:09 -04:00
toaster
e5bc0583e5
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2.git into fickleheart/SRB2-menu-soc-bullshit
...
# Conflicts:
# src/m_menu.c
2020-05-11 15:00:31 +01:00
James R
7257fc730a
Remove instances of HAVE_BLUA that actually disable Lua now
2020-05-10 19:59:56 -07:00
James R
6b4ee94e38
Use camera angle, not mobj angle, when comparing Angle Anchor
2020-05-10 19:40:28 -07:00
sphere
61dfee7e13
Don't show the FPS counter during startup.
2020-05-11 01:33:34 +02:00
Steel Titanium
fabd76a5fe
Merge branch 'next' into 2.2.3-prep
2020-05-10 17:05:56 -04:00
Monster Iestyn
49864f646e
Merge branch '2.2.3-prep' of git@git.magicalgirl.moe:STJr/SRB2.git into 2.2.3-prep
2020-05-10 20:10:11 +01:00
Monster Iestyn
197da95a23
Last minute OpenGL fix: don't check flippedness in HWR_RotateSpritePolyToAim if the mobj is actually a precipmobj!
...
precipmobj_t does not have eflags, so P_MobjFlip checking it would actually be accessing memory addresses beyond the end of the struct
2020-05-10 20:09:08 +01:00
lachwright
215ff828f8
Merge branch 'master' into next
2020-05-11 01:29:10 +08:00
Lachlan Wright
357ad68599
Merge branch 'patch_music' into 'next'
...
patch_music.pk3
See merge request STJr/SRB2!812
2020-05-10 12:51:49 -04:00
lachwright
b7af502ed4
Update MD5 hashes for player.dta and patch.pk3
2020-05-11 00:23:32 +08:00
Monster Iestyn
3ce4c1b789
Fix logging on Mac
...
These fixes were suggested by Sveciaost on #mac-users on Discord
2020-05-10 16:47:01 +01:00
Monster Iestyn
baee6a1d57
Update version number to 2.2.3 in all the usual files, also updated MODVERSION
2020-05-10 16:02:23 +01:00
Louis-Antoine
dc55ab9ae2
Use W_CachePatchLongName in Snake minigame
2020-05-10 11:02:45 +02:00
Louis-Antoine
614f45b380
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into snake
2020-05-10 11:00:30 +02:00
LJ Sonic
280633019a
Merge branch 'gfz3laser-mkii' into 'next'
...
New Greenflower Zone 3 laser
See merge request STJr/SRB2!924
2020-05-09 16:40:40 -04:00
LJ Sonic
62d5d16f5c
Merge branch 'optimise-archiving' into 'next'
...
Optimise net-archiving of Lua strings, numbers and booleans
See merge request STJr/SRB2!904
2020-05-09 16:40:28 -04:00
Jaime Passos
38c74cecc0
Avoid a crash
2020-05-09 17:26:27 -03:00
Jaime Passos
39c5ab4e17
Merge remote-tracking branch 'origin/next' into gtr-fixes
2020-05-09 17:12:52 -03:00
Jaime Passos
ab7987d1cf
Fix OpenGL only recording the first frame of unoptimized GIFs
2020-05-09 16:59:09 -03:00
Zachary McAlpin
61562683c2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-05-09 00:05:05 -05:00
sphere
c55d6dbc9f
Make showfps save to config, and add a compact option.
2020-05-08 15:40:50 +02:00
Lachlan
426925c5fc
Play the 1-up sound when 1upsound is set to sound
2020-05-08 04:07:00 +08:00
MascaraSnake
60aa0f82f3
Merge branch 'next' of git.magicalgirl.moe:STJr/SRB2 into next
2020-05-07 22:00:02 +02:00
MascaraSnake
650f44566f
Fixed a typo
2020-05-07 21:59:39 +02:00
lachwright
9d21d790a4
Prevent laser sprites clipping into walls/off ledges
2020-05-08 02:58:56 +08:00
lachwright
36b400387e
Remove MF_NOBLOCKMAP from MT_LASER so Silver can find it
2020-05-07 23:24:33 +08:00
lachwright
3a1988fc01
Fix knockback scaling
2020-05-07 22:47:34 +08:00
lachwright
51a5ece294
Merge remote-tracking branch 'origin/next' into gfz3laser-mkii
2020-05-07 22:34:44 +08:00
Alam Ed Arias
24df9f032f
Merge branch 'master' into next
2020-05-06 18:36:20 -04:00
Alam Ed Arias
38232ce07e
fix build errors in public master
2020-05-06 18:35:54 -04:00
Monster Iestyn
30105621d4
Merge branch 'master' into next
2020-05-06 21:51:36 +01:00
Zipper
87f7100d2e
Update p_user.c
2020-05-06 09:30:15 -04:00
ZipperQR
d0376e284a
S_StopSoundByID Lua support
2020-05-06 16:22:04 +03:00
Lachlan
05ea95d0eb
Merge branch 'next' into gfz3laser-mkii
2020-05-06 09:10:27 +08:00
lachwright
63cb58a10a
Update new GFZ3 laser
2020-05-06 09:03:03 +08:00
lachwright
92c900f284
New GFZ3 laser
2020-05-06 09:01:02 +08:00
Louis-Antoine
2d6c9a94f4
Fix compiler warning
2020-05-05 14:05:19 +02:00
MascaraSnake
5282f01a53
Fix PolyObject flags not being applied when there is no parameter line
2020-05-05 08:40:59 +02:00
MascaraSnake
df3ca712d8
Move polyobject crush option to the first line args
2020-05-04 23:27:26 +02:00
MascaraSnake
8c36b9efa5
Adapt basic PolyObject setup to UDMF
2020-05-04 22:40:49 +02:00
MascaraSnake
6e7373a475
Merge branch 'next' into udmf-next
2020-05-04 20:32:56 +02:00
MascaraSnake
023c095d55
Merge branch 'polyobject-cleanup' into 'next'
...
PolyObject cleanup
See merge request STJr/SRB2!919
2020-05-04 14:18:08 -04:00
MascaraSnake
de100b076a
PolyObject: Allow translucency to be set via X offset
2020-05-04 19:47:39 +02:00
MascaraSnake
d03742b15b
Merge branch 'level-header-sector-typeskd' into 'next'
...
Allow some map-wide settings to be set via level header instead of sector types
See merge request STJr/SRB2!917
2020-05-04 05:21:49 -04:00
MascaraSnake
248df41a2f
Simplify set/fade polyobject translucency code
2020-05-04 10:29:35 +02:00
MascaraSnake
e3ddb413aa
Make PolyObject special functions return boolean instead of INT32
2020-05-04 10:07:38 +02:00
MascaraSnake
78a700f5fa
Remove non-descriptive comments
2020-05-04 10:01:44 +02:00
MascaraSnake
2be775e74c
Move parameter parsing for EV_DoPolyObjFlag into its own function
2020-05-04 09:58:27 +02:00
MascaraSnake
482adc6124
Pass parameters to EV_DoPolyObjFlag in a struct and not via the line
2020-05-04 09:54:32 +02:00
MascaraSnake
02c347ada2
Refactor Polyobj_findSegs
2020-05-04 01:28:21 +02:00
MascaraSnake
8ae635c7ba
Purge uninformative comments
2020-05-04 00:17:05 +02:00
MascaraSnake
b82c3c2089
Clean up Polyobj_GetInfo
2020-05-03 23:55:23 +02:00
MascaraSnake
5de11441a1
Remove "explicitly include line in polyobject" code which has never worked
2020-05-03 23:47:26 +02:00
MascaraSnake
a881662ca9
Implement "set linedef executor delay" linedef type
2020-05-03 21:03:15 +02:00
MascaraSnake
f26648e6f2
Adapt linedef executor delay to UDMF
2020-05-03 20:41:37 +02:00
MascaraSnake
9eb81539a6
Merge branch 'udmf-next' into udmf-fofs-mkii
2020-05-03 19:31:36 +02:00
MascaraSnake
7fec1211fd
Bugfix in XGL3 ZNODES parsing
2020-05-03 19:28:52 +02:00
MascaraSnake
700b340827
Allow map-wide gravity to be set via level header
2020-05-03 18:33:18 +02:00
MascaraSnake
4b87bee759
Add level header options for setting special stage time and spheres requirements
2020-05-03 17:56:49 +02:00
MascaraSnake
a9bd307dc0
Merge branch 'next' into egg-capsule
...
# Conflicts:
# src/p_spec.c
2020-05-03 15:29:20 +02:00
MascaraSnake
dd50990e85
Add "trigger egg capsule" linedef executor
2020-05-03 15:22:13 +02:00
ZipperQR
0d7c49e7e4
no message
2020-05-03 14:02:23 +03:00
MascaraSnake
1aafc2f463
Replace "bouncy FOF" sector type with "make FOF bouncy" linedef type
2020-05-03 12:44:30 +02:00
MascaraSnake
c68fea3d06
Merge branch 'movement-refactor' into udmf-fofs-mkii
2020-05-03 10:03:18 +02:00
MascaraSnake
d0d25025e1
Refactor P_CheckBouncySectors
2020-05-03 10:01:58 +02:00
MascaraSnake
35e9e5b33c
Rearrange FOF flags and improve custom FOF backwards compatibility
2020-05-03 09:13:14 +02:00
MascaraSnake
96a464c881
Move FOF modifier linedef type to the 70s range, to avoid being considered FOFs themselves
2020-05-03 08:43:16 +02:00
Steel Titanium
887c25e047
Remove inline keyword from P_DoTwinSpin function
...
The compiler doesn't like this and will give you a "inlining failed in call to 'P_DoTwinSpin': call is unlikely and code size would grow" error
2020-05-02 17:39:55 -04:00
MascaraSnake
6949b70dbf
Remove temporary FOF setup code
2020-05-02 23:33:07 +02:00
MascaraSnake
0d4d7bfc38
Adapt custom FOF setup
2020-05-02 23:00:22 +02:00
Hannu Hanhi
c9114867cc
Dummy I_GetTimeMicros
2020-05-02 23:24:49 +03:00
Hannu Hanhi
1b6e65b91c
Implement I_GetTimeMicros without affecting I_GetTime behaviour details
2020-05-02 23:14:20 +03:00
Hannu Hanhi
724e093ce8
Render stats cleanup
2020-05-02 23:14:08 +03:00
Hannu Hanhi
7e8543a408
More render stats for software mode, renamed and relocated some render stats variables
2020-05-02 23:13:53 +03:00
Hannu Hanhi
8dcc2fe20d
Move some render stats variables to better locations, add I_FinishUpdate timing
2020-05-02 23:13:32 +03:00
Hannu Hanhi
64a153fdee
Render stats
2020-05-02 23:13:08 +03:00
MascaraSnake
25219b614e
Implement "Make FOF quicksand" linedef type
2020-05-02 22:07:42 +02:00
MascaraSnake
1693689305
Implement "make FOF bustable" linedef type
2020-05-02 21:50:49 +02:00
MascaraSnake
1f041496c7
Store bustable FOF data directly in ffloor_t instead of referring to master line
2020-05-02 21:19:55 +02:00
MascaraSnake
245d5be047
Merge branch 'movement-refactor' into udmf-fofs-mkii
...
# Conflicts:
# src/p_mobj.c
# src/p_user.c
2020-05-02 19:05:48 +02:00
Monster Iestyn
1528f2aef8
Fix drop shadow and rotsprite code to use SHORT()
2020-05-02 17:13:16 +01:00
MascaraSnake
d9ed914e14
Merge branch 'amyswings' into 'next'
...
Restore jump-related pflags properly during twinspin
See merge request STJr/SRB2!908
2020-05-02 10:03:49 -04:00
MascaraSnake
452fd100b8
Refactor P_CheckBustableBlocks
2020-05-02 15:50:18 +02:00
MascaraSnake
122104815a
Revert some very incorrect refactoring
2020-05-02 15:33:15 +02:00
MascaraSnake
ddb4c2c97f
Refactor P_PushableCheckBustables
2020-05-02 15:30:56 +02:00
MascaraSnake
bc2d0dcea6
Some minor PTR_GlideClimbTraverse cleanup
2020-05-02 15:25:19 +02:00
MascaraSnake
929064b998
Refactor PTR_SlideTraverse
2020-05-02 15:21:53 +02:00
MascaraSnake
21eccc15d8
Bustable blocks: Forgot to adapt linedef executor triggering for pushables
2020-05-02 14:51:03 +02:00
MascaraSnake
4dd25721f6
Merge branch 'movement-refactor' into udmf-fofs-mkii
2020-05-02 14:29:10 +02:00
MascaraSnake
a67c8786ae
P_PlayerZMovement: Move PolyObject handling code into its own function
2020-05-02 13:49:16 +02:00
MascaraSnake
29192eff9a
Merge branch 'remove-polyobjects' into movement-refactor
2020-05-02 13:37:13 +02:00
MascaraSnake
afc6378868
P_PlayerZMovement: Move checks for Mario blocks into their own function
2020-05-02 13:34:24 +02:00
MascaraSnake
2605f29bd4
P_PlayerMobjThinker: Move check for floatbob platforms into its own function
2020-05-02 13:08:13 +02:00
MascaraSnake
19d77bfc53
P_PlayerMobjThinker: Move crumbling platforms check into its own function
2020-05-02 12:50:09 +02:00
MascaraSnake
485a4e5035
Remove POLYOBJECTS and POLYOBJECTS_PLANES defines
2020-05-02 12:08:31 +02:00
MascaraSnake
538c81676b
Recognize ML_EFFECT1 and ML_EFFECT2 on crumbling FOFs
2020-05-02 10:40:35 +02:00
MascaraSnake
312a2def3d
Implement "add laser thinker to FOF" linedef type
2020-05-02 10:30:21 +02:00
MascaraSnake
1ae797359e
Merge branch 'fof-cleanup' into udmf-fofs-mkii
...
# Conflicts:
# src/p_spec.c
2020-05-02 10:24:40 +02:00
MascaraSnake
2a39265156
Make the laser thinker find the FOF itself instead of storing it in the thinker struct
2020-05-02 10:03:16 +02:00
MascaraSnake
c1304e019d
Clean up Thwomp spawning code
2020-05-02 09:15:34 +02:00
MascaraSnake
7000c203a2
Implement "add thwomp thinker to FOF" linedef type
2020-05-01 19:41:52 +02:00
MascaraSnake
cada0d2928
Implement "add airbob thinker to FOF" linedef type
2020-05-01 19:29:19 +02:00
MascaraSnake
d7363ff87a
Implement linedef type that adds a raise thinker to an FOF
2020-05-01 19:07:29 +02:00
Zipper
dd645d88ea
Update p_user.c
2020-05-01 08:25:37 -04:00
MascaraSnake
f3360bd373
Merge branch 'udmf-next' into udmf-fofs-mkii
...
# Conflicts:
# src/p_floor.c
# src/p_spec.c
2020-05-01 14:02:48 +02:00
MascaraSnake
5c8b50ca8b
Merge branch 'next' into udmf-next
...
# Conflicts:
# src/p_saveg.c
# src/p_slopes.c
# src/p_spec.c
2020-05-01 12:44:39 +02:00
MascaraSnake
2449c66b78
Merge branch 'find-sector-from-tag' into 'next'
...
Remove P_FindSectorFromLineTag and P_FindLineFromLineTag
See merge request STJr/SRB2!901
2020-05-01 05:49:52 -04:00
MascaraSnake
7922306113
Merge branch 'more-thinker-refactor' into 'next'
...
More thinker refactoring
See merge request STJr/SRB2!900
2020-05-01 05:47:14 -04:00
MascaraSnake
790affd13b
Merge branch 'next' into elevator-cleanup
...
# Conflicts:
# src/p_saveg.c
2020-05-01 11:42:05 +02:00
MascaraSnake
be0959fa90
Remove bogus comments from p_saveg.c
2020-05-01 11:25:32 +02:00
LJ Sonic
ef5f8f3bd2
Merge branch 'join-delay' into 'next'
...
Add a minimum delay between connections
See merge request STJr/SRB2!889
2020-05-01 03:29:15 -04:00
lachwright
165b6c2435
Dashmode fixes:
...
- Don't force the player's default normalspeed and jumpfactor while not in dashmode
- Properly trim the fuse for followmobj ghosts spawned during dashmode
- Add deliberate dashmode ghosts for Metal's jet fume
2020-05-01 08:26:23 +08:00
lachwright
f9b831c00b
Restore jump-related pflags properly during twinspin
2020-05-01 06:34:30 +08:00
Monster Iestyn
279ad0707e
Merge branch 'strncpy-brullshit' into 'next'
...
Fix a few strncpy bullshit
See merge request STJr/SRB2!895
2020-04-30 14:53:46 -04:00
Hannu Hanhi
be99670a39
More HWR_ProcessSeg sky code from master
2020-04-30 19:57:28 +03:00
Hannu Hanhi
ff8f48647b
HWR_ProcessSeg skywall processing from master
2020-04-30 19:57:15 +03:00
Monster Iestyn
0d3876abf3
Merge branch 'next' into netarchive-cleanup
2020-04-29 15:27:07 +01:00
Monster Iestyn
2f0bf3860f
Don't discard const, added missing &
2020-04-29 15:24:28 +01:00
Monster Iestyn
d89d2505bb
Whoops the third
2020-04-29 14:45:52 +01:00
Louis-Antoine
9b3917cd72
Revert "Replace a few instance of strncpy with strlcpy"
...
This reverts commit 2e27f32d3e
2020-04-29 10:55:49 +02:00
Zachary McAlpin
196c12549c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-28 18:31:15 -05:00
Louis-Antoine
ae05f11c45
Optimise number archiving
2020-04-28 23:12:02 +02:00
Louis-Antoine
3e8fb8db25
Optimise boolean archiving
2020-04-28 23:11:28 +02:00
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
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
863ac48c9b
Fix rising FOF speed
2020-04-27 11:56:29 +02:00
MascaraSnake
c702e697b6
Fix bobbing FOF speed
2020-04-27 11:55:05 +02:00
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
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
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
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
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
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
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
Louis-Antoine
29a94ee26a
Add a longname field to lumpinfo_t
2020-04-21 10:21:41 +02:00
Louis-Antoine
f6e2c7063f
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
2020-04-20 23:40:41 +02:00
Nev3r
5c605a8a39
Merge branch 'udmf-next' into udmf-multitag
2020-04-20 09:05:55 +02:00
Nev3r
efb81fc526
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-20 09:05:21 +02:00
James R
e79d8c7896
Merge branch 'flipfuncpointers-master' into 'master'
...
Flipfuncpointers (take two)
See merge request STJr/SRB2!864
2020-04-19 18:23:56 -04:00
Nev3r
1e4eab77a6
Use fixed_t on the mapthing scale for the sake of coherence.
2020-04-19 18:34:00 +02:00
Nev3r
aa98eb5a4c
Add mapthing pitch/roll Lua access as well.
2020-04-19 17:19:04 +02:00
Nev3r
0147320ff4
Add missed pitch and roll to precipmobj_t
2020-04-19 16:05:08 +02:00
Nev3r
beb42c9499
Move the scale setting code behind the MapthingSpawn hook.
2020-04-19 16:00:57 +02:00
Nev3r
67acb6e498
Add Lua support.
2020-04-19 15:56:06 +02:00
Nev3r
7cf08e1a08
Add mapthing scale support; fields scale, scalex and scaley set the only mapthing scale field alike.
2020-04-19 15:18:36 +02:00
Nev3r
ca10b38b9c
Add textmap pitch and roll parsing, and mobj pitch and roll variables.
2020-04-19 14:51:55 +02:00
Nev3r
9ac60a62b3
Fix cage issue with boss 4.
2020-04-19 13:13:53 +02:00
Nev3r
cde14c1d9f
Fix an outrageous typo which didn't get pushed for some reason.
2020-04-19 12:23:51 +02:00
Nev3r
6eaaa744f4
Taggroups are now sorted when a new entry is added.
2020-04-19 12:21:22 +02:00
James R
536fb1ef2a
Merge remote-tracking branch 'origin/master' into next
2020-04-18 17:20:33 -07:00
James R
cbe181c66d
Merge branch 'angle-for-spawn-object' into 'next'
...
Make the Spawn Object linedef executor able to set the object's angle.
See merge request STJr/SRB2!877
2020-04-18 20:16:07 -04:00
James R
b11845b045
Merge branch 'packetversion-revision' into 'master'
...
The rule for PACKETVERSION is too confusing, it's also too hard to unify formats
See merge request STJr/SRB2!875
2020-04-18 20:15:23 -04:00
James R
abb338d650
Merge branch 'continue_tweaks' into 'next'
...
A tangible mechanism to disable Continues
See merge request STJr/SRB2!865
2020-04-18 20:15:04 -04:00
MascaraSnake
1d3aa7129a
Add enums for textmap FOF values
2020-04-18 18:02:43 +02:00
MascaraSnake
8e5effa07b
Merge branch 'udmf-argenums' into udmf-fofs-mkii
2020-04-18 17:23:02 +02:00
MascaraSnake
09506112d7
Add enums to encapsulate the textmap colormap settings
2020-04-18 17:15:25 +02:00
MascaraSnake
f0c63ce76a
Merge branch 'udmf-next' into udmf-argenums
2020-04-18 16:56:21 +02:00
MascaraSnake
111da04b07
Add enums to encapsulate the textmap slope settings
2020-04-18 16:55:56 +02:00
MascaraSnake
c031008eab
Enable SF_TRIGGERSPECIAL_TOUCH for sectors with spike damage
2020-04-18 15:17:25 +02:00
Nev3r
ffc161e2aa
Merge branch 'udmf-next' into udmf-multitag
...
# Conflicts:
# src/p_spec.c
2020-04-18 14:04:15 +02:00
Nev3r
2b2a18fdf1
Merge branch 'udmf-colormaps' into 'udmf-next'
...
UDMF colormaps
See merge request STJr/SRB2!855
2020-04-18 07:42:24 -04:00
MascaraSnake
2a300bcea4
Fix NULL pointer crash involving stringargs
2020-04-18 12:23:01 +02:00
Nev3r
b7c4ed9c6b
Implement dynamic global taggroups/lists functionality.
2020-04-18 11:35:56 +02:00
MascaraSnake
54cbd66999
Eradicate levelspecthink_t
2020-04-18 11:05:58 +02:00
MascaraSnake
da594db3fc
Remove return values from a few elevator functions that don't use them
2020-04-18 10:52:58 +02:00
MascaraSnake
ab17267363
Make T_BounceCheese use its own thinker struct
2020-04-18 10:45:21 +02:00
MascaraSnake
08f1e03e79
Refactor T_ThwompSector
2020-04-18 10:26:03 +02:00
MascaraSnake
29d33f0a93
Refactor T_NoEnemiesSector
2020-04-18 09:21:04 +02:00
MascaraSnake
0038605979
Make T_MarioBlock use its own thinker data structure
2020-04-18 02:05:23 +02:00
MascaraSnake
7e2f95c3f5
Refactor T_ContinuousFalling
2020-04-18 01:42:13 +02:00
MascaraSnake
70d262653e
Refactor T_MovePlane a little bit
2020-04-18 01:08:01 +02:00
MascaraSnake
cc0f686c95
Refactor T_FloatSector
2020-04-18 00:26:49 +02:00
Nev3r
aa0d76f8fa
Delete tags.
2020-04-18 00:23:24 +02:00
Nev3r
e87ad0fb38
Delete old taglists.
2020-04-18 00:05:55 +02:00
MascaraSnake
fd598f315e
Add an enum for crumblestate
2020-04-17 23:54:37 +02:00
Nev3r
d775a42e93
Rewrote a bit of the boss 4 code, which still requires working dynamic global tag lists.
2020-04-17 23:43:26 +02:00
MascaraSnake
779b10681f
Refactoring in T_BounceCheese
2020-04-17 23:32:39 +02:00
Nev3r
38c665fa79
Remove old taglist access from Lua.
2020-04-17 23:31:08 +02:00
Nev3r
7c11091c40
Remove old tag list netgame packing/unpacking.
2020-04-17 23:30:47 +02:00
Nev3r
9eb17e4104
Remove P_ChangeSectorTag().
2020-04-17 23:30:07 +02:00
Nev3r
e2a98a1591
Double fuck.
2020-04-17 23:05:41 +02:00
MascaraSnake
9b27d004e3
Remove the spike thinker, which hasn't been necessary for a while now
2020-04-17 22:54:35 +02:00
Nev3r
0c2fb80ec9
Fuck.
2020-04-17 22:41:04 +02:00
Nev3r
6c12e6701d
Make the Lua interface return/set the first tags from the local taglists.
2020-04-17 22:30:16 +02:00
Nev3r
ae07b7c96c
Netsynch the sector local taglists.
2020-04-17 22:29:26 +02:00
Nev3r
7904856e8e
Remove presumably the remaining old tag references in the gamelogic.
2020-04-17 22:28:41 +02:00
MascaraSnake
099ad6cf20
Remove sec assignments that have become superfluous
2020-04-17 21:39:38 +02:00
MascaraSnake
5a58b2d90e
Refactor T_EachTimeThinker
2020-04-17 21:19:21 +02:00
Nev3r
b5eaad42fc
Carry over a considerable case regarding accessing the old tag vars.
2020-04-17 18:15:25 +02:00
Nev3r
e3dfdb448e
Add currently unused auxiliary function.
2020-04-17 18:14:15 +02:00
MascaraSnake
89539512f6
Make T_EachTimeThinker use its own struct
2020-04-17 14:00:48 +02:00
Nev3r
b690d35a99
Move the global taglist init functionality to the taglist files.
2020-04-17 12:52:44 +02:00
Nev3r
209b8e7678
Map loading should consider tag 0 as a valid tag and add its respective entries just like the rest of tags.
2020-04-17 11:21:40 +02:00
Nev3r
dd46b1ab44
P_ConvertBinaryMap() line conversion now uses the first tag from taglists.
2020-04-17 11:16:01 +02:00
MascaraSnake
3e0a9c8718
Forgot to clean up some stuff
2020-04-17 11:13:13 +02:00
MascaraSnake
63a901b714
-Remove superfluous variables from raise_t
...
-Cleanup signatures of P_AddRaiseThinker and P_AddAirbob
2020-04-17 11:11:36 +02:00
Nev3r
a5bc3fb507
P_SpawnSpecials() line special spawn sequence now uses the taglist, until we move on to using args[0].
2020-04-17 10:52:12 +02:00
Nev3r
61c3e12d63
Make a commented out debug code account for taglists.
2020-04-17 10:41:26 +02:00
Nev3r
e59480e4cf
Portal lines now use the taglist's first element.
2020-04-17 10:34:24 +02:00
Nev3r
b9decb2837
Polyobject spawning now use the taglist.
2020-04-17 10:30:38 +02:00
MascaraSnake
a41dbe2bae
Get rid of code duplication in T_RaiseSector
2020-04-17 10:19:02 +02:00
Nev3r
4fc07473fd
Skybox spawning now uses the taglists.
2020-04-17 10:05:50 +02:00
Nev3r
81be6b4067
Thing-based slope vertexes use taglists now.
2020-04-17 10:04:11 +02:00
MascaraSnake
d0c473c9ae
Make T_RaiseSector use its own thinker struct instead of levelspecthink_t
2020-04-17 09:58:53 +02:00
Nev3r
944716c45a
Add auxiliary functions to the taglist library.
2020-04-17 09:57:45 +02:00
Nev3r
c0b4090924
Clean up type inconsistency on tags.
2020-04-16 18:48:57 +02:00
Nev3r
1d572c5b2c
Fix fuckup in the -1 tag bailout on the global tag lists.
2020-04-16 15:10:48 +02:00
Nev3r
786e448f16
Do not add -1 to the global taglists.
2020-04-15 10:17:14 +02:00
Nev3r
95c7690a40
Remove P_FindSpecialLineFromTag()
2020-04-15 10:16:49 +02:00
Nev3r
7d3d71c418
Get rid of the last case of P_FindSpecialLineFromTag() in the main code.
2020-04-15 10:05:59 +02:00
MascaraSnake
2e9dc59ca7
Forgot some stuff regarding FOF type 170
2020-04-15 09:49:00 +02:00
MascaraSnake
f815597219
Implement FOF types 170-180
2020-04-15 09:44:33 +02:00
Nev3r
f9b1acb813
reworked Tag_FindLineSpecial()
2020-04-15 09:41:21 +02:00
Nev3r
2d9b0e4906
Fix the args in Tag_FindLineSpecial() being swapped.
2020-04-15 09:32:19 +02:00
Nev3r
439fde3434
Replace most P_FindSpecialLineFromTag() cases with Tag_FindLineSpecial(), which settle with the first found result.
2020-04-14 23:59:22 +02:00
Nev3r
d518703334
Replaces P_FindSectorFromTag() occurrences with its corresponding macro and vanishes it from existence.
2020-04-14 23:33:56 +02:00
Nev3r
25102ab4af
Remove P_FindSectorFromLineTag()
2020-04-14 22:22:48 +02:00
Nev3r
35f539e398
Merge branch 'udmf-next' into udmf-multitag
2020-04-14 22:21:32 +02:00
Nev3r
d40713d08b
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-04-14 22:20:54 +02:00
Nev3r
24baf5bea0
Replace P_FindSectorFromLineTag() with its corresponding macro for most cases.
2020-04-14 22:19:18 +02:00
Nev3r
5df60f8e15
Make use of functions for the tag lists iterations instead of bloated macros.
2020-04-14 21:46:02 +02:00
Nev3r
8495b59890
Added hilarious -1 tag support for the iteration macros.
2020-04-14 18:53:05 +02:00
MascaraSnake
5389344a32
Implement FOF type 257
2020-04-14 11:56:11 +02:00
Nev3r
464ecc01a4
Merge branch 't_moveplane-refactor' into 'next'
...
Remove faulty code from T_MovePlane()
See merge request STJr/SRB2!876
2020-04-14 05:53:59 -04:00
MascaraSnake
e3b86d0c74
Implement FOF types 252-256
2020-04-14 11:45:37 +02:00
Nev3r
778ef86fee
Remove the bridge thinker code.
2020-04-14 10:31:07 +02:00
MascaraSnake
15defaebeb
Render insides on FOF type 222
2020-04-14 10:14:56 +02:00
MascaraSnake
f8c51ccde3
Implement FOF types 220-222
2020-04-14 10:13:38 +02:00
MascaraSnake
9fc2b5b1b9
Implement FOF type 258
2020-04-14 09:51:48 +02:00
MascaraSnake
32a1131c68
Implement FOF type 251
2020-04-14 09:43:49 +02:00
MascaraSnake
916f831edb
Implement linedef type 250
2020-04-14 09:14:10 +02:00
MascaraSnake
fdb46e5d14
Implement FOF types 202 and 223
2020-04-14 09:06:02 +02:00
MascaraSnake
60e589e92a
Implement FOF types 200-201
2020-04-14 09:03:00 +02:00
MascaraSnake
61d903cb5b
Revise setup of solid FOFs
2020-04-14 01:34:11 +02:00
Nev3r
e820b9e369
Fixed a typo worthy of divine punishment.
2020-04-13 19:45:41 +02:00
sphere
01b28b66a6
Make linedef type 461 able to set object angle, using the line's angle.
2020-04-13 17:10:25 +02:00
Nev3r
01c0797ba6
Remove now unused P_MobjReadyToMove().
2020-04-13 16:00:58 +02:00
Nev3r
74bd23c275
Actually remove the entire code block in T_MovePlane(), and remove line_t.tagline as it served no other purpose.
2020-04-13 15:17:53 +02:00
Nev3r
711c35970c
Refactor an unholy piece of code.
2020-04-13 14:31:19 +02:00
Nev3r
dbf0f14dc4
Replace P_FindSectorFromLineTag() in p_floor.c
2020-04-13 13:27:45 +02:00
Nev3r
909268d175
Replace P_FindLineFromLineTag() instances with macros and remove its code.
2020-04-13 13:10:38 +02:00
Nev3r
de07c04f5c
Make the macros and their usage relatively cleaner.
2020-04-13 13:09:58 +02:00
Nev3r
0d1f898869
Added disabled test code in P_FindSectorFromTag().
2020-04-13 13:09:04 +02:00
Nev3r
5e20e9e27e
Fix typo involving the stringargs exposure.
2020-04-13 10:21:32 +02:00
James R
4214397679
Make the PACKETVERSION rule easier
2020-04-12 17:05:18 -07:00
Nev3r
499c884501
Add multitag support to FOF spawners.
2020-04-12 18:52:47 +02:00
Nev3r
cb2571b12c
Rename the macros, reshape them slightly to avoid mixed declarations, and add a finalizer.
2020-04-12 18:42:42 +02:00
Nev3r
f7f9b68bb9
Introduce tagged element iteration macros.
2020-04-12 17:50:48 +02:00
Nev3r
07b4d0ee3d
Add lookup tag tables construction.
2020-04-12 15:16:04 +02:00
Nev3r
38e92aecfd
Fix Tags_Compare() typo to Tag_Compare().
2020-04-12 15:03:14 +02:00
Nev3r
64e2e7c12f
Use Tags_Compare wrapper in the OpenGL renderer, as well.
2020-04-12 13:16:33 +02:00
Nev3r
fe4ab5d29f
Use Tags_Compare wrapper on software renderer to compare sector tags.
2020-04-12 13:14:39 +02:00
Nev3r
bfd48c4c83
add Tag_Compare()
2020-04-12 13:05:21 +02:00
Nev3r
ab2619d538
Wrap P_FindSectorFromLineTag() is now a wrapper for P_FindSectorFromTag().
2020-04-12 13:04:15 +02:00
Nev3r
a7e99ab5cf
Added static multitag read and storage on mapload.
2020-04-12 11:56:36 +02:00
Nev3r
ca694c8c43
Merge branch 'udmf-next' into udmf-thingargs
2020-04-12 10:02:12 +02:00
Nev3r
4128f826b7
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
...
# Conflicts:
# src/lua_hooklib.c
2020-04-12 09:57:19 +02:00
Nev3r
21de33bd08
Add mapthing arg support.
2020-04-11 12:54:34 +02:00
fickleheart
be07a23e52
Make a separate function instead of clogging up IdentifyVersion
2020-04-09 20:56:27 -05:00
fickleheart
6845aca6e5
Make chdir usage consistent with other source usage
2020-04-09 20:52:23 -05:00
fickleheart
614449298e
Merge remote-tracking branch 'upstream/master' into netgame-urls
2020-04-09 20:48:52 -05:00
James R
d460e1e826
Merge branch 'pk3-xtra-comm-fix' into 'next'
...
PK3: Proper ignorance for file comments/extra data
See merge request STJr/SRB2!761
2020-04-09 21:25:11 -04:00
James R
efe74cfd8f
Merge branch 'md2-rollangle' into 'master'
...
Fix MD2 rollangle in reverse gravity
See merge request STJr/SRB2!818
2020-04-09 21:25:02 -04:00
James R
0313213c59
Merge branch 'hw-horizon' into 'master'
...
OGL horizon lines
See merge request STJr/SRB2!861
2020-04-09 21:24:41 -04:00
James R
e457b71e7e
Merge branch 'execcfg-fixes' into 'master'
...
ExecCfg fixes
See merge request STJr/SRB2!821
2020-04-09 21:24:12 -04:00
Zachary McAlpin
31b19f69a2
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-09 20:12:11 -05:00
James R
dc25177457
You don't need to push the value twice, it's only used once
2020-04-09 17:30:53 -07:00
James R
aca39d6210
Merge remote-tracking branch 'origin/master' into next
2020-04-09 17:04:04 -07:00
James R
b029ccff0d
Merge branch 'hide-useless-1p-menu-options' into 'master'
...
Hide record & NiGHTS attack options if there are no available maps for them.
See merge request STJr/SRB2!868
2020-04-09 19:57:27 -04:00
James R
40a74a6211
Merge branch 'ra-emblemhints' into 'master'
...
Allow emblem hints (and radar) in record attack.
See merge request STJr/SRB2!820
2020-04-09 19:56:17 -04:00
James R
5f7bd9a947
Merge branch 'fix-256-brightness' into 'master'
...
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
See merge request STJr/SRB2!840
2020-04-09 19:53:40 -04:00
James R
2fda89f1c3
Merge branch 'bot-respawn-hook' into 'next'
...
BotRespawn hook
See merge request STJr/SRB2!804
2020-04-09 19:52:25 -04:00
James R
bd7d05fdf0
Merge branch 'gtr-replace' into 'next'
...
Separate PvP damage from ringslinger
See merge request STJr/SRB2!831
2020-04-09 19:51:52 -04:00
James R
2dfe276a73
Merge branch 'sdlglcontext' into 'master'
...
Only initialise OpenGL if the user intends to load it (for real this time)
See merge request STJr/SRB2!796
2020-04-09 19:51:20 -04:00
James R
b8d40a5783
Merge branch 'dye' into 'next'
...
Expose colorization to mappers and SOC
See merge request STJr/SRB2!679
2020-04-09 19:50:32 -04:00
James R
78613ec445
Merge branch 'supergoldedit' into 'next'
...
Change SKINCOLOR_SUPERGOLD1-5
See merge request STJr/SRB2!805
2020-04-09 19:50:06 -04:00
James R
4e7283c833
Merge branch 'pk3-directory-start' into 'next'
...
Don't skip the first directory entry of PK3 if it's a file
See merge request STJr/SRB2!764
2020-04-09 19:49:44 -04:00
James R
d4c08a8410
Merge branch 'lightmemedata' into 'next'
...
Cvars returned by CV_FindVar did not work with userdataType
See merge request STJr/SRB2!754
2020-04-09 19:48:39 -04:00
James R
e100f21dda
Merge branch 'loop-patch' into 'next'
...
Let MUSICDEF set loop point
See merge request STJr/SRB2!762
2020-04-09 19:47:43 -04:00
James R
aad225932d
Merge branch 'SF_NONIGHTSSUPER' into 'next'
...
Skin flag for disabling super colors in NiGHTS
See merge request STJr/SRB2!782
2020-04-09 19:47:20 -04:00
James R
673a842043
Merge remote-tracking branch 'origin/next' into SF_NONIGHTSSUPER
2020-04-09 16:47:52 -07:00
James R
1edc300d0c
Merge branch 'lua-hook-cleanup' into 'next'
...
Lua hook cleanup
See merge request STJr/SRB2!851
2020-04-09 19:40:09 -04:00
James R
a4fa4351d8
Merge branch 'fix-consbackpic' into 'master'
...
Fix console backpic
See merge request STJr/SRB2!850
2020-04-09 19:39:16 -04:00
James R
b4ab284d21
Merge branch 'fixed2float-funcs' into 'master'
...
Turn FIXED_TO_FLOAT into a function
See merge request STJr/SRB2!869
2020-04-09 19:37:22 -04:00
Zachary McAlpin
28de6b1f93
Execute LUAh_GameQuit in 2 additional places in m_menu.c
2020-04-03 17:44:57 -05:00
Zachary McAlpin
c629883afa
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-04-02 16:13:20 -05:00
sphere
806884a3f4
Use M_GametypeHasLevels again (properly this time) to save memory.
2020-04-02 17:59:56 +02:00
sphere
3074880ac1
Actually check for available maps correctly. Whoops!
2020-04-02 16:07:38 +02:00
Steel Titanium
9a242818a7
Merge branch 'master' into next
2020-03-31 20:46:54 -04:00
Louis-Antoine
ad12e29fda
Fix allowjoin off affecting single player
2020-03-30 22:11:48 +02:00
Monster Iestyn
befae492fe
use ATTRINLINE rather than inline to match some of the other functions in this file, though I'm told modern compilers ignore inlining info as they actually decide themselves now
...
(though I could pretend we still support the older ones lol)
2020-03-30 20:25:56 +01:00
Monster Iestyn
2e27b3ea87
Turn the fixed-float convert macros into inline functions, like those in GZDoom. The old macros get to be just the same as calling these inline functions.
2020-03-30 19:58:46 +01:00
Louis-Antoine
8130599a4f
Fix disconnected players being kicked for high ping
2020-03-28 15:23:15 +01:00
toaster
da86c17ee1
Disable continues outside of no-save/Ultimate by default, but allow SOC to re-enable them globally.
...
Please look at the merge request description for a full explanation, since I know the vanilla team has been hashing this out and I don't want to add fuel to the fire without at least presenting a solid case.
2020-03-26 20:16:44 +00:00
toaster
ce2a1aa3b2
Minor optimisations surrounding R_DrawFlippedMaskedColumn.
...
* Replace the texheight parameter provided directly to it with a previously existing (now renamed) global used for the same purpose, so that it can be used as an interchangeable function pointer with R_DrawMaskedColumn.
* Using the above, optimise R_DrawVisSprite to call a function pointer in a tighter loop rather than check SC_VFLIP each time around.
* SHORT macro can involve repeated operations; calculate once and put in memory for both RANGECHECK and papersprite.
* Remove irrelevant range check (already covered by existing range check immediately above) from R_DrawFlippedMaskedColumn and R_DrawMaskedColumn.
* "Warning: avoiding a crash in %s %d" is a terrible error message, and it chips away at the tightness of the loop just for something most people will never see printed. Replace with a PARANOIA I_Error in case someone actively wants to go hunting for its cause.
2020-03-26 16:09:19 +00:00
MascaraSnake
92c74814cf
Standardize the behavior of FF_INVERTSIDES and FF_INVERTPLANES
2020-03-25 08:34:52 +01:00
Zachary McAlpin
decce7905b
Moved LUAh_GameQuit(void) function to the end of the lua_hooklib.c
2020-03-24 22:55:25 -05:00
Zachary McAlpin
21353f1209
Screw merge conflicts
2020-03-24 20:38:46 -05:00
Sonic Edge
60f7e35383
Character select in Nights mode.
2020-03-24 16:21:33 -04:00
sphere
99a5192872
Hide record/NiGHTS attack if there are no available maps for them.
2020-03-24 16:10:30 +01:00
fickleheart
719f29d27e
Reduce near renderdist to lessen visible texture distortion
2020-03-23 08:23:36 -05:00
Monster Iestyn
4722fbbc2a
Merge branch 'demos-refactor' into 'next'
...
Demos refactor
See merge request STJr/SRB2!853
2020-03-22 17:52:45 -04:00
Monster Iestyn
23b6679b3a
Merge branch 'buggle-trouble' into 'next'
...
P_HomingAttack related fixes
See merge request STJr/SRB2!836
2020-03-22 16:57:22 -04:00
Monster Iestyn
3b9dd31faf
Merge branch 'fix-setspriteinfo' into 'next'
...
Fix lib_setSpriteInfo indexes being off-by-one
See merge request STJr/SRB2!854
2020-03-22 16:40:34 -04:00
fickleheart
f9027ccaeb
Split horizon lines for minimal distortion
2020-03-22 12:52:17 -05:00
fickleheart
14d6a01292
Distort far edges to viewz for a flat horizon line
2020-03-22 12:28:49 -05:00
fickleheart
deff1565dc
GL horizon lines
2020-03-22 12:13:59 -05:00
Louis-Antoine
6ffbc89f42
Remove redundant conditional in P_IsClimbingValid
2020-03-22 17:45:07 +01:00
Louis-Antoine
478f0f2059
Cleanup P_IsClimbingValid
2020-03-22 17:39:51 +01:00
Louis-Antoine
ea631715a6
Remove unused define
2020-03-22 17:29:15 +01:00
Louis-Antoine
6f9422d380
Encapsulate plane height checks
2020-03-22 17:28:50 +01:00
Louis-Antoine
077543f2e9
Fix typo in camera handling code
2020-03-22 15:21:23 +01:00
MascaraSnake
77936f6c12
Merge branch 'udmf-colormaps' into udmf-fofs-mkii
2020-03-22 08:06:03 +01:00
MascaraSnake
2133bc89e6
Merge branch 'udmf-next' into udmf-colormaps
2020-03-22 08:05:05 +01:00
MascaraSnake
1580e14cbc
Merge branch 'next' into udmf-next
...
# Conflicts:
# extras/conf/Includes/SRB222_linedefs.cfg
# extras/conf/Includes/SRB222_misc.cfg
# src/p_spec.c
2020-03-21 20:04:31 +01:00
MascaraSnake
42445b39d7
Merge branch 'master' into next
2020-03-21 19:16:52 +01:00
LJ Sonic
fa9c2f43f7
Merge branch 'skip-empty-gametypes' into 'master'
...
Skip empty gametypes in level select menu
See merge request STJr/SRB2!819
2020-03-21 08:52:54 -04:00
fickleheart
f32ab5918e
Define SERVER_URL_PROTOCOL const for easy reconfiguration
2020-03-21 07:47:29 -05:00
fickleheart
feb18208cb
Add support for srb2:// URL handler (server links)
2020-03-21 01:36:39 -05:00
Louis-Antoine
892a8dd6e7
Make SRB2 flat like Earth
2020-03-20 18:55:29 +01:00
Monster Iestyn
7a585e2498
Merge branch 'next' into demos-refactor
...
# Conflicts:
# src/g_game.c
(also update g_demo.c)
2020-03-20 17:48:31 +00:00
MascaraSnake
6e8760524c
Implement water FOF types
2020-03-20 16:15:39 +01:00
MascaraSnake
1e306dc7b4
Implement linedef type 100-146
2020-03-20 16:08:48 +01:00
MascaraSnake
a9866f84ad
Implemented FOF types 100-105
2020-03-20 16:03:48 +01:00
MascaraSnake
0ecf8616ba
Add sector flag that protects the colormap from being changed
2020-03-20 12:19:02 +01:00
MascaraSnake
7cf9ad2f2b
Adapt setup of colormap linedefs
2020-03-20 11:19:30 +01:00
fickleheart
78ec210896
hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh
2020-03-19 18:55:10 -05:00
Jaime Passos
5eaa73b6ac
Fix lib_setSpriteInfo indexes being off-by-one
2020-03-19 19:09:34 -03:00
Monster Iestyn
4236ae7c08
We don't need m_cheat.h either in g_demo.c
2020-03-19 21:10:23 +00:00
Monster Iestyn
6610150bfe
We definitely don't need these files to compile!
2020-03-19 20:43:56 +00:00
Monster Iestyn
dd76be16cb
Create G_FreeGhosts, for the benefit of G_DeferedInitNew (assuming it actually needs to do ghosts = NULL; at all)
2020-03-19 20:42:51 +00:00
Monster Iestyn
1a14234088
update Makefile, CMakeLists.txt and MSVC project files
2020-03-19 20:13:39 +00:00
Monster Iestyn
dcb4ce8cb9
Created g_demo.c/.h, for the demo recording and playback code that formerly lived in g_game.c
2020-03-19 20:09:55 +00:00
Louis-Antoine
e3cbdf8fab
Use HAVE_BLUA as fuel for my fireplace
2020-03-19 18:36:14 +01:00
Louis-Antoine
c1b50397ce
Fix compiler warning
2020-03-19 14:40:35 +01:00
Louis-Antoine
1d5d6ead65
Fix misleading naming
2020-03-19 14:40:12 +01:00
Louis-Antoine
58c42eec29
Simplify hook code
2020-03-19 14:38:42 +01:00
fickleheart
725826a64b
Avoid infinite loops if no maps are selectable (y tho)
2020-03-18 22:56:20 -05:00
fickleheart
05b2570ae7
Merge remote-tracking branch 'upstream/next' into lua-music
2020-03-18 22:43:07 -05:00
fickleheart
9c86cd0bc2
More union types for the union type god
2020-03-18 22:42:31 -05:00
fickleheart
520e3c5dc3
Are these casts unnecessary...??
2020-03-18 22:40:11 -05:00
fickleheart
647f73c8f2
Clean up after myself
2020-03-18 22:38:51 -05:00
fickleheart
dd0d86120b
> building SRB2 without Lua in 2020
2020-03-18 22:38:18 -05:00
fickleheart
e0badd1e5b
Rename hook to ShouldJingleContinue
2020-03-18 22:35:21 -05:00
Steel Titanium
5dac9c6875
Merge branch 'master' into next
2020-03-18 15:42:02 -04:00
SteelT
04131d3268
Merge branch 'fix-nights-mode-menu-wrong-return' into 'master'
...
NiGHTS Mode menu fixes
See merge request STJr/SRB2!841
2020-03-18 15:41:17 -04:00
SteelT
e3a5164ddf
Merge branch 'deadzone-sigfpe-fix' into 'master'
...
Fix division-by-0 crash from 100% gamepad deadzones, and lack of input from 0% deadzones
See merge request STJr/SRB2!838
2020-03-18 15:39:04 -04:00
SteelT
bd058ecc4b
Merge branch 'viewpointswitch-fix' into 'next'
...
Fix incorrect newdisplayplayer in forced ViewpointSwitch
See merge request STJr/SRB2!814
2020-03-18 15:34:18 -04:00
LJ Sonic
38bcfe4997
Merge branch 'screenshot-menu-header' into 'master'
...
Actually use the "SCREENSHOT OPTIONS" header for its menu.
See merge request STJr/SRB2!832
2020-03-18 10:56:35 -04:00
LJ Sonic
c43ca31dc2
Merge branch 'increase-input-buffer' into 'next'
...
Increase the length of the player input buffer
See merge request STJr/SRB2!835
2020-03-18 09:49:14 -04:00
Jaime Passos
1904e3b5e9
Fix OpenGL
2020-03-17 15:23:13 -03:00
Jaime Passos
c2cd9a71fa
Fix con_backpic
2020-03-17 13:05:54 -03:00
Monster Iestyn
31b1188a3e
Merge branch 'master' into next
2020-03-15 20:32:43 +00:00
LJ Sonic
0a54c40ff4
Merge branch 'fix-playernode-crash' into 'next'
...
Fix buffer overrun with players with no associated node
See merge request STJr/SRB2!810
2020-03-15 15:36:45 -04:00
Monster Iestyn
3f43dd22f9
Merge branch 'skins-refactor' into 'master'
...
Skins refactor
See merge request STJr/SRB2!843
2020-03-15 15:31:49 -04:00
Zachary McAlpin
569034d3a9
Call LUAh_GameQuit in I_GetEvent in if the event is SDL_Quit and if you are in a playing session
...
Time for the ultimate testing to see if I get any undefined reference compiling errors
2020-03-15 10:47:55 -05:00
Zachary McAlpin
2052ee1144
Check if you are playing a game then execute `LUAh_GameQuit` if you are in Command_quit_f and Command_ExitGame_f
2020-03-15 10:34:43 -05:00
Zachary McAlpin
8b7f93d50a
Revert "Let's just call LUAh_GameQuit in I_Quit anyways"
...
This reverts commit 7c65577336
2020-03-15 10:33:24 -05:00
MascaraSnake
c2443b8e8c
Merge branch 'udmf-formatcheck' into udmf-colormaps
2020-03-15 16:26:00 +01:00
MascaraSnake
f689bc88aa
Add boolean variable that indicates if current map is in UDMF format
2020-03-15 16:23:15 +01:00
MascaraSnake
bc8a1350e4
Merge branch 'udmf-next' into udmf-colormaps
2020-03-15 09:58:39 +01:00
MascaraSnake
3c294b5e3d
Merge branch 'next' into udmf-next
2020-03-15 09:57:42 +01:00
MascaraSnake
e545e5f9ba
Add UDMF colormap fields
2020-03-15 09:55:57 +01:00
Zachary McAlpin
766ca2f5a5
Since exitgame shuts down the server if you are running a dedicated server I may as well allow the hook to run for the dedicated server as well
2020-03-15 00:54:06 -05:00
Zachary McAlpin
7c65577336
Let's just call LUAh_GameQuit in I_Quit anyways
2020-03-15 00:39:46 -05:00
Zachary McAlpin
0e56202d63
Let's just call LUAh_GameQuit in Command_ExitGame_f during its execution if you are in game and are not a dedicated server
2020-03-15 00:28:41 -05:00
Zachary McAlpin
b067d1e134
Revert "Call `LUAh_GameQuit` in 2 places."
...
This reverts commit a329ca43ba
2020-03-15 00:08:57 -05:00
Zachary McAlpin
a329ca43ba
Call `LUAh_GameQuit` in 2 places.
2020-03-15 00:53:05 -04:00
Zachary McAlpin
de9dc43b21
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into gamequit-hook
2020-03-14 22:55:40 -05:00
Steel Titanium
efab0f479c
Merge branch 'master' into next
2020-03-14 22:21:12 -04:00
SteelT
49001b207e
Merge branch 'nadraw-fix' into 'master'
...
Fix NiGHTS Attack crash after render mode change
See merge request STJr/SRB2!837
2020-03-14 22:19:35 -04:00
SteelT
88fff119ea
Merge branch 'hwrflipcolchromakey' into 'master'
...
Fix HWR_DrawFlippedColumnInCache ignoring chroma key TF
See merge request STJr/SRB2!826
2020-03-14 22:13:19 -04:00
SteelT
e80a09a651
Merge branch 'tex' into 'master'
...
Replace NextTexAvail with glGenTextures
See merge request STJr/SRB2!828
2020-03-14 22:12:02 -04:00
SteelT
2d16281d86
Merge branch 'acz-fence' into 'master'
...
Fix ASTBlendPixel blending with nothing
See merge request STJr/SRB2!827
2020-03-14 22:11:23 -04:00
fickleheart
e3b17cd82b
Use po2 patches to fix mipmaps
2020-03-14 15:52:25 -05:00
fickleheart
b9d7b3e5c5
Merge remote-tracking branch 'upstream/master' into shaders-222
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
# src/i_video.h
# src/r_main.c
# src/r_main.h
# src/screen.c
# src/sdl/i_video.c
# src/sdl/ogl_sdl.c
# src/w_wad.c
2020-03-14 12:52:15 -05:00
sphere
bdab78152c
Check if emblem hints are actually unlocked.
2020-03-13 10:46:57 -04:00
Zachary McAlpin
f97187f59b
Revert "Call LUAh_GameQuit in Command_ExitGame_f"
...
This reverts commit 2b16971137
2020-03-12 22:31:48 -05:00
Zachary McAlpin
7ec241c59e
Revert "Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game"
...
This reverts commit bef49f5660
2020-03-12 22:31:39 -05:00
Zachary McAlpin
bef49f5660
Don't execute LUAh_GameQuit in Command_ExitGame_f if you are in a multiplayer game
2020-03-12 20:51:16 -05:00
Zachary McAlpin
2b16971137
Call LUAh_GameQuit in Command_ExitGame_f
2020-03-12 20:15:21 -05:00
Zachary McAlpin
4d144f2e40
No longer call LUAh_GameQuit in D_QuitNetGame
2020-03-12 19:59:50 -05:00
Zachary McAlpin
4d7f64a53d
Let's call LUAh_GameQuit in D_QuitNetGame since that function is still called outside of netgames
...
However, the D_QuitNetGame function returns early if you are not in a netgame.
2020-03-12 12:45:41 -05:00
Zachary McAlpin
bb08b55b43
Created GameQuit hook, but I need to decide where to execute it
2020-03-12 12:22:04 -05:00
Nev3r
68f60f3c29
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2/ into udmf-next
2020-03-11 09:31:31 +01:00
Monster Iestyn
ddc0762ecc
Merge branch 'master' into next
2020-03-09 19:53:08 +00:00
Monster Iestyn
db6a3bbd1f
Merge branch 'archive-sprite2-hotfix' into 'master'
...
Archive sprite2 Hotfix
See merge request STJr/SRB2!845
2020-03-09 15:50:55 -04:00
Monster Iestyn
40e728fdb5
One line fix: don't assume 0 (aka SPR2_STND) is the default value for sprite2, but rather what the state sets for it
...
This fixes some issues with a custom character tested during netplay, which did not have SPR2_WAIT sprites and therefore fell back to SPR2_STND sprites. Unfortunately, the fact they used SPR2_STND instead meant the sprite2 was not synced at all!
2020-03-09 15:04:22 +00:00
Monster Iestyn
f4cb6e1f5e
Include r_skins.h instead of r_things.h in many files where all they wanted from it was skins stuff
...
(oddly enough, this actually revealed some secret file dependencies previously included via r_things.h! I also needed to include d_player.h in r_skins.h itself it seems)
2020-03-09 13:54:56 +00:00
Monster Iestyn
1dd4ed4afa
Reorganise r_things.h
2020-03-08 21:17:30 +00:00
Monster Iestyn
e81ef824d6
Set the "spritename" variable within R_AddSingleSpriteDef rather than externally to it, since R_InstallSpriteLump is the only place it gets used anyway
...
This way we don't have to make it some extern in order for r_skins.c to use it
2020-03-08 19:51:18 +00:00
Monster Iestyn
37ecb47436
update Makefile, CMakeLists.txt and MSVC project files
2020-03-08 19:48:23 +00:00
Monster Iestyn
b2d9697e07
remove r_skins.c include in r_things.c, on second thoughts
2020-03-08 19:36:56 +00:00
Monster Iestyn
a67dbfff54
Create r_skins.c/.h, to contain skins code formerly in r_things.c/h
2020-03-08 19:32:07 +00:00
Louis-Antoine
b85ac65378
Fix missing break
2020-03-08 20:04:29 +01:00
colette
ce29129f3a
Fix resyncs never recovering if node and player mismatch
2020-03-08 13:09:39 -04:00
Tatsuru
be338da3f6
I guess
2020-03-08 14:06:18 -03:00
Steel Titanium
e5270ad9c7
Fix guest data being deleted regardless of choice
2020-03-08 00:34:15 -05:00
Steel Titanium
a3f3dd649f
Fix guest deletion confirmation returning to Record Attack menu from Nights Mode menu
2020-03-08 00:02:43 -05:00
GoldenTails
cdba9ba033
Fix spaces before someone yells at me for it
2020-03-07 21:48:40 -06:00
GoldenTails
0d92bf3dd0
Florida man fixes sectors with light level 256 blacking out OpenGL objects; mappers riot.
...
Disclaimer: I'm not actually from Florida.
2020-03-07 21:41:52 -06:00
Jaime Passos
26e367eb9b
Merge remote-tracking branch 'origin/next' into pictureformats
2020-03-07 20:43:16 -03:00
Zipper
4b28e19d16
Update p_inter.c
2020-03-05 18:48:20 -05:00
Zipper
4d8a523da9
Update p_inter.c
2020-03-05 18:30:27 -05:00
ZipperQR
da9bf34175
fix source player being nil
2020-03-05 12:26:27 +03:00
Zwip-Zwap Zapony
bce6349b1d
More gamepad deadzone tweakage
2020-03-04 21:44:57 +01:00
Zwip-Zwap Zapony
df220aa2c2
Hotfix for 100% deadzone returning 0 input
...
It makes more sense for 100% deadzone to just make it so that
you have to push the axis all the way to trigger it,
rather than 100% deadzone resulting in no axis input
ever happening... So, let's make it be the former way instead
2020-03-04 21:11:55 +01:00
Zwip-Zwap Zapony
27e084a827
Fix division-by-0 crash with gamepad deadzones
...
Fix division-by-0 crash with gamepad deadzones
The problem was that it checked if A was more than B,
then lowered A to a max value, then subtracted B from A,
then divided something by that, without checking if A minus B was 0,
allowing division by 0 if B was the same as that max value
This fixes that by making sure that A is less than the max value
2020-03-04 17:31:52 +01:00
Jaime Passos
b8db3e2216
Fix NiGHTS Attack crash after render mode change
2020-03-04 09:42:34 -03:00
Tatsuru
761ec3b6a4
Separate PvP damage from non-friendly gametypes
2020-03-03 11:56:57 -03:00
Tatsuru
776951c6a8
Never forget who your enemy is
2020-03-03 11:40:35 -03:00
SteelT
039aeed633
Merge branch 'tolflag-fix' into 'next'
...
Fix G_TOLFlag returning the wrong type
See merge request STJr/SRB2!834
2020-03-02 21:27:45 -05:00
Steel Titanium
10d08fc8bb
Merge branch 'master' into next
2020-03-02 15:26:01 -05:00
SteelT
7d14796954
Merge branch 'fix-ogllib' into 'master'
...
Fix -OGLlib
See merge request STJr/SRB2!794
2020-03-02 15:21:50 -05:00
Jaime Passos
67b8a7eb67
Merge remote-tracking branch 'origin/next' into tolflag-fix
2020-03-02 13:14:12 -03:00
Louis-Antoine
04a1f479be
Increase the length of the player input buffer
2020-03-02 15:36:28 +01:00
Louis-Antoine
7ba93c184f
Fix warning and formatting
2020-03-02 13:33:12 +01:00
sphere
c671097c04
Actually use the "SCREENSHOT OPTIONS" header for its menu.
2020-03-02 13:23:54 +01:00
Jaime Passos
70a103b9af
Fix G_TOLFlag returning the wrong type
2020-03-02 00:20:53 -03:00
LJ Sonic
60cd6fe986
Merge branch 'next' into 'resend-gamestate'
...
# Conflicts:
# src/d_clisrv.c
2020-03-01 12:35:53 -05:00
Jaime Passos
76bda716cd
Merge branch 'tol-moment' into 'next'
...
Fix TYPEOFLEVEL options not having enough bits for TOL_ flags
See merge request STJr/SRB2!825
2020-03-01 11:14:29 -05:00
LJ Sonic
2cace6e147
Merge branch 'lua-io' into 'next'
...
Support for Lua's I/O library
See merge request STJr/SRB2!727
2020-03-01 11:12:45 -05:00
SwitchKaze
fd4666b481
Bruh.
2020-02-29 23:44:56 -05:00
SwitchKaze
21b28b6295
Merge branch 'next' of https://github.com/STJr/SRB2 into next-luacolors
2020-02-29 23:41:16 -05:00
SwitchKaze
3106a92e8b
Prohibit modification of built-in colors
...
In addition, fixes a bug where loading a custom color using command line params exhibits strange behavior.
2020-02-29 23:14:49 -05:00
Louis-Antoine
46d8546f49
Update packet names
2020-03-01 03:26:15 +01:00
Louis-Antoine
846560910d
Obliterate resynch
...
Okay, more precisely this substitutes the old resynch with
the newly added gamestate resend code.
2020-03-01 03:22:47 +01:00
Jaime Passos
94107a5320
Set pixel RGBA to nothing instead of the alpha only
2020-02-29 19:36:50 -03:00
Monster Iestyn
cf95837a76
Merge branch 'follow-is-mobj' into 'next'
...
Turn FollowMobj into a mobj hook
See merge request STJr/SRB2!803
2020-02-29 12:48:39 -05:00
Louis-Antoine
29d8389461
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into resend-gamestate
2020-02-29 13:43:47 +01:00
Louis-Antoine
4f7591a044
Rename packet
2020-02-29 13:40:15 +01:00
Jaime Passos
7d77600e71
Make exitmove friendly, don't start empty intermission screens
2020-02-29 01:51:45 -03:00
Jaime Passos
4e7b47440f
G_CoopGametype, for all the GT_COOP cases
2020-02-29 00:57:22 -03:00
Jaime Passos
6fb5a6efb6
Consider hide-and-seek as GTR_HIDEFROZEN
2020-02-28 23:52:33 -03:00
Jaime Passos
d3ed5ad44f
Race is Competition without the lives
2020-02-28 23:47:38 -03:00
Jaime Passos
fd062308fe
Score adding and stealing should check the gametype's rules.
2020-02-28 23:41:10 -03:00
Jaime Passos
3ce4ddf854
Fix incorrect team gametype rule being used in A_OldRingExplode
2020-02-28 23:25:25 -03:00
Jaime Passos
51c593e633
Fix homing ring using the wrong team gametype rule
2020-02-28 23:21:27 -03:00
Jaime Passos
4a489c4d95
Fix NOTEXTURE_NUM
2020-02-28 18:57:34 -03:00
Jaime Passos
9b88edc458
Same deal for screen textures
2020-02-28 18:57:15 -03:00
Jaime Passos
48b352049f
Stop using NextTexAvail
2020-02-28 18:56:41 -03:00
