lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
11183 commits 1 branch 29 tags 122 MiB
Commit graph

9863 commits

Author SHA1 Message Date
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
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
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 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
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 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
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
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 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
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
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