Jaime Ita Passos
|
be274a4fa9
|
Merge branch 'next' into spritestuff2
|
2020-11-19 00:52:43 -03:00 |
|
James R
|
e0a799c1ed
|
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 |
|
James R
|
2edf884fbf
|
Merge branch 'x' into 'next'
Whitelist missing graphics
See merge request STJr/SRB2!1189
|
2020-11-08 20:48:25 -05:00 |
|
Zolton Auburn
|
6748795a51
|
Continue
|
2020-10-20 15:56:41 -04:00 |
|
Zippy_Zolton
|
442878020d
|
titlecard
|
2020-10-17 15:51:22 -05:00 |
|
Zippy_Zolton
|
76d2343aa7
|
Crosshair fix, no GAMEQUIT
|
2020-10-13 16:41:39 -05:00 |
|
Zippy_Zolton
|
6c636b6130
|
more!!!!! :3
|
2020-10-13 14:23:56 -05:00 |
|
Zippy_Zolton
|
cef2aab8df
|
good night
|
2020-10-13 02:19:20 -05:00 |
|
Zippy_Zolton
|
72efff4c7c
|
More whitelists :D
|
2020-10-13 02:13:35 -05:00 |
|
Zippy_Zolton
|
aa38fe3f20
|
Whitelist the "X" shown in the HUD
|
2020-10-11 23:22:16 -05:00 |
|
Jaime Passos
|
b44837324f
|
Merge branch 'next' into patch-stuff-again-2
|
2020-10-10 17:01:10 -03:00 |
|
Jaime Passos
|
f133726df0
|
Let the server or an admin toggle clients' custom shaders
|
2020-10-09 02:06:13 -03:00 |
|
Jaime Passos
|
70cd48c9a2
|
Merge remote-tracking branch 'origin' into slight-shader-cleanup
|
2020-10-08 22:45:39 -03:00 |
|
Jaime Passos
|
9ad15fd556
|
Fix PNG issue in OpenGL + optimize PNG sprite loading
|
2020-10-02 19:48:13 -03:00 |
|
James R
|
d612fb5c99
|
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 |
|
Lachlan Wright
|
6faa84eaee
|
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 |
|
SteelT
|
6a168ac5e9
|
Merge branch 'pictureformats' into 'next'
PNG conversion refactoring
See merge request STJr/SRB2!675
|
2020-09-10 15:58:18 -04:00 |
|
GoldenTails
|
8b6450fa4d
|
Forgot to check if the file was important, whoops!
|
2020-08-21 04:00:54 -05:00 |
|
GoldenTails
|
972c8da4bb
|
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 |
|
Jaime Passos
|
d18d12fdea
|
Introduce Doom patch format into picture formats
Fixes sprite rotation
|
2020-08-15 21:52:01 -03:00 |
|
Jaime Passos
|
7bc4af41ab
|
Merge branch 'pictureformats' into patch-stuff-again-2
|
2020-08-15 20:48:28 -03:00 |
|
Jaime Passos
|
cb3660331a
|
Refactor renderer switching
|
2020-08-14 22:27:16 -03:00 |
|
James R
|
9955ff1357
|
Merge branch 'kill-dos' into 'next'
Remove support for DOS
See merge request STJr/SRB2!1090
|
2020-08-08 21:26:18 -04:00 |
|
Jaime Passos
|
a7f3dd7eff
|
Refactor patch loading
|
2020-08-08 05:16:47 -03:00 |
|
Jaime Passos
|
368e550ab1
|
Shader code cleanup
|
2020-08-07 18:17:05 -03:00 |
|
James R
|
e8a06868b9
|
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 |
|
GoldenTails
|
b14633f745
|
Include "is old" in the list of possible causes for a MD5 mismatch.
|
2020-07-28 03:53:25 -05:00 |
|
Steel Titanium
|
62c85ea4a5
|
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 |
|
Jaime Passos
|
10189ecdc0
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-21 22:25:00 -03:00 |
|
Jaime Passos
|
c385eca5d2
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats
|
2020-07-06 19:29:14 -03:00 |
|
Jaime Passos
|
146da28f88
|
Remove GrTexInfo
|
2020-07-06 00:35:48 -03:00 |
|
Steel Titanium
|
06f76f07f4
|
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 |
|
Hannu Hanhi
|
6961bba693
|
Merge remote-tracking branch 'upstream/next' into shaders-224-next-merge
|
2020-06-07 20:01:05 +03:00 |
|
Louis-Antoine
|
808b7b17cc
|
Add dofile() to Lua
|
2020-05-29 17:35:07 +02:00 |
|
Jaime Passos
|
c69a4f9ced
|
Merge remote-tracking branch 'origin/next' into pictureformats
|
2020-05-15 01:34:54 -03:00 |
|
Alam Ed Arias
|
ec948af34f
|
Merge branch 'master' into next
|
2020-05-06 18:36:20 -04:00 |
|
Alam Ed Arias
|
b46398b06a
|
fix build errors in public master
|
2020-05-06 18:35:54 -04:00 |
|
Louis-Antoine
|
4130a30008
|
Revert "Replace a few instance of strncpy with strlcpy"
This reverts commit b03e0d1289.
|
2020-04-29 10:55:49 +02:00 |
|
Louis-Antoine
|
b03e0d1289
|
Replace a few instance of strncpy with strlcpy
|
2020-04-26 00:42:17 +02:00 |
|
Louis-Antoine
|
70d03c9c6f
|
Restore old entry searching functions and add alternate versions for long names
|
2020-04-26 00:39:52 +02:00 |
|
James R
|
eb0ba37dce
|
Merge remote-tracking branch 'origin/master' into HEAD
|
2020-04-24 22:10:59 -07:00 |
|
Louis-Antoine
|
74fd37fa38
|
Let W_CheckNumForName(Pwad) find entries with long names
|
2020-04-21 11:08:18 +02:00 |
|
Louis-Antoine
|
90ebe18c5a
|
Add a longname field to lumpinfo_t
|
2020-04-21 10:21:41 +02:00 |
|
Louis-Antoine
|
74e8d7f733
|
Rename lumpinfo_t.name2 to lumpinfo_t.fullname
|
2020-04-20 23:40:41 +02:00 |
|
James R
|
8de2bab4a9
|
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
|
81a01041e8
|
Merge remote-tracking branch 'origin/master' into next
|
2020-04-09 17:04:04 -07:00 |
|
James R
|
f68a361f6e
|
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 |
|
Louis-Antoine
|
46df2b9551
|
Use HAVE_BLUA as fuel for my fireplace
|
2020-03-19 18:36:14 +01:00 |
|
Jaime Passos
|
876d4cd02b
|
Fix OpenGL
|
2020-03-17 15:23:13 -03:00 |
|
fickleheart
|
33a9e5aa83
|
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 |
|