stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-02 09:12:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
11969 commits 177 branches 41 tags 188 MiB
Commit graph

10592 commits

Author SHA1 Message Date
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
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
katsy
2971156ba7 Update info.c 2020-12-11 23:39:42 -05:00
katsy
ddf743d521 make fire spindust dust fullbright 2020-12-11 20:59:14 -05: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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