James R
2274129f57
Update copyright year to 2020
2020-02-19 14:08:45 -08:00
Jaime Passos
fd23294cc4
Rename stuff around
2020-02-17 21:11:56 -03:00
Jaime Passos
da45526b63
DoScreenWipe is void
2020-01-28 00:17:07 -03:00
Jaime Passos
85f016e4d8
port pfnUpdateTexture
2020-01-28 00:16:38 -03:00
Jaime Passos
96340ac80c
Move texture stuff to its own file
2020-01-07 12:35:10 -03:00
Jaime Passos
4e0810e8a3
Picture formats test
2020-01-06 18:22:23 -03:00
Louis-Antoine
61a681ed02
Grab mouse again when closing menu, unpausing, etc
2020-01-02 00:45:28 +01:00
Jaime Passos
1002c47407
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
James R
bc939a2211
Merge branch 'opengl-is-a-bad-renderer' into 'master'
...
OpenGL fixes
See merge request STJr/SRB2!519
2019-12-14 16:48:50 -05:00
Jaime Passos
b47cc01f50
Separate non-powers-of-two draw routines into its own file
2019-12-13 13:11:56 -03:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Jaime Passos
4ccc854a90
Die
2019-12-08 22:12:56 -03:00
Alam Ed Arias
ed33758b5f
Fix building libpng and zlib with MSVC
2019-12-05 12:33:18 -05:00
Alam Ed Arias
bbce679a73
Libs: move pngconf.h out of top level libpng source folder
2019-12-04 10:41:54 -05:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
Steel Titanium
b1f39e836d
Better ping implementation.
2019-11-17 20:22:47 -05:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
Jaime Passos
24d20d2abb
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
toaster
f7c5774b7e
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into metalrecording
...
# Conflicts:
# src/p_user.c
2019-11-12 21:56:46 +00:00
toaster
2a16cf539a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c
...
Merge seems fine, but won't compile for some reason.
2019-11-02 18:34:12 +00:00
toaster
a23e1946c4
Do a bunch of stuff to the MD2/3 sprite2 support to get it back to feature parity with before, without going back to being hacky as fuck.
...
* Store the number of frames per sprite2 run in the spr2frames struct.
* Reintroduce P_GetModelSprite2, to allow for the sprite2 defaulting system to be used to full advantage even in GL.
* Instead of splitting the SUPER and normal SPR2 stuff within the same cell of the struct, have them exist in different cells just like in the "normal" sprite2 structs.
* Allow for just providing spr2 frames in order without specifying which "normal" sprite2 frame it's supposed to replace.
Also:
* Fix FF_VERTICALFLIP-ignoring regression.
* Fix whitespace adjustment in win_dll.c
* Remove bracket in P_GetSkinSprite2 because I realised it was extraneous while making sure P_GetModelSprite2 worked with it.
2019-11-02 17:52:54 +00:00
toaster
91d2beebfa
* Add a death animation for killing the Metal object, in case somebody wants to Lua up a Sonic CD style race finish for the Metal object, or in case of the following...
...
* Add an alternate DEMOMARKER for ending the Metal Recording on death, which kills the Metal object as well.
* Add some more relevant exceptions to the "most objects are removed when touching a deathpit" thing, primarily for the sake of ghosts and Metal playback.
2019-10-29 17:38:14 +00:00
Jaime Passos
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
Jaime Passos
1c46be78af
add r_patch.c
2019-10-28 15:28:42 -03:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
Jaime Passos
e95bd8add3
Merge remote-tracking branch 'origin/master' into renderswitch
2019-09-27 22:53:57 -03:00
Jaime Passos
5e1ebad9d3
sky barreling
2019-09-17 23:38:04 -03:00
Alam Ed Arias
aab58a4613
Revert "Merge branch 'gl_skydome' into 'master'"
...
This reverts merge request !326
2019-09-17 20:20:09 +00:00
Jaime Passos
0d11dd516a
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-09-15 16:24:24 -03:00
Steel Titanium
5ba4e604b2
Merge branch 'newicon' into 'master'
...
New EXE icon
See merge request STJr/SRB2Internal!265
2019-09-12 14:05:32 -04:00
Jaime Passos
0695b6ecc1
Merge remote-tracking branch 'origin/master' into gl_skydome
2019-09-10 19:20:20 -03:00
Jaime Passos
ce8b821691
Merge remote-tracking branch 'jimita/renderswitch' into renderswitch
2019-09-10 18:12:01 -03:00
Jaime Passos
53568ba62f
Better fades
2019-09-09 23:31:48 -03:00
Alam Ed Arias
8a69d97a12
Be clear on what FALLTHRU we really want
2019-09-09 15:02:13 -04:00
Jaime Passos
93ea8c4019
can i push this already?
2019-09-08 22:25:18 -03:00
Jaime Passos
1cb22d5e6b
initial stuff
2019-09-08 18:44:40 -03:00
Jaime Passos
398b320aec
initial stuff
2019-09-08 18:27:35 -03:00
Jaime Passos
6573e94e3a
PRBoom sky dome
2019-09-03 02:12:17 -03:00
Jaime Passos
24d08edf05
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-09-02 20:27:50 -03:00
Alam Ed Arias
01020ae65f
Merge branch 'public_next' into private
2019-08-08 23:41:19 -04:00
Alam Ed Arias
5c0912bab1
Tested to be compile with Mingw64 9.1.0
2019-08-08 21:25:46 -04:00
Alam Ed Arias
2c7fbe2087
Makefile: stop building with DWARF v2 debugging info
2019-08-08 18:43:42 -04:00
mazmazz
4ac4034eb9
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b
2019-08-04 21:33:13 -04:00
toaster
534b98251b
Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'""
...
This reverts commit a76668f55a
2019-08-04 12:03:57 +01:00
toaster
a76668f55a
Revert "Merge branch 'musicplus-aug2019-b' into 'master'"
...
This reverts commit 0f89fb123f8fb211d8cf
2019-08-04 11:32:55 +01:00
mazmazz
12e86aaa44
Merge branch 'internal-musicplus-jingle' into musicplus-aug2019
2019-08-04 02:41:37 -04:00
mazmazz
8ab76b50c6
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
2019-08-04 01:10:21 -04:00
