thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-01-20 13:42:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
8236 commits 2 branches 14 tags 206 MiB
Commit graph

223 commits

Author SHA1 Message Date
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
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
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
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
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 0f89fb123f, reversing
changes made to 8fb211d8cf.
 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
mazmazz
ae05d8c0dd Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle 2019-08-03 23:38:49 -04:00
Steel Titanium
538928031c use VERSIONSTRING 2019-07-30 20:56:03 -04:00
Alam Ed Arias
827bd7e123 Merge remote-tracking branch 'private/master' into newicon 2019-07-29 19:04:19 -04:00
Alam Ed Arias
5286938853 Fix building with MSVC 2019-07-29 19:02:45 -04:00
Steel Titanium
2cccab7655 More icon stuff 2019-07-27 01:13:54 -04:00
Steel Titanium
93acb98aa7 New icons 
Also update IMG_xpm.c
 2019-07-16 19:20:00 -04:00
mazmazz
f7936876be Merge branch 'master' into musicplus-sdlmixerx 2019-06-29 19:31:01 -04:00
mazmazz
7bbd05e85d Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle 2019-06-29 18:33:45 -04:00
mazmazz
53fe455a8f Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle 2019-06-29 18:10:44 -04:00
mazmazz
14df513db6 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla 2019-06-29 17:51:30 -04:00
mazmazz
11955ba838 Merge remote-tracking branch 'public-gl/master' into md3-vanilla 2019-06-29 15:02:07 -04:00
Steel Titanium
8e5593c207 Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt 
# Conflicts:
#	.travis.yml
#	src/m_menu.c
#	src/sdl/Srb2SDL-vc10.vcxproj
#	src/sdl/Srb2SDL.props
 2019-06-11 17:48:00 -04:00
Monster Iestyn
67392baae0 Merge branch 'public_next' 
# Conflicts:
#	src/doomdef.h
#	src/hardware/hw_draw.c
#	src/m_misc.c
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-06-09 20:04:08 +01:00
Alam Ed Arias
cd1c87ea71 Merge branch 'master' into next 2019-06-07 18:07:32 -04:00
Alam Ed Arias
d5c1fe6467 Merge branch 'gme-msvc' into 'master' 
Add GME to MSVC 10 solution

See merge request STJr/SRB2!448
 2019-06-07 18:06:51 -04:00
Steel Titanium
813ccf71e5 Merge branch 'next' into public-musicplus-libopenmpt 2019-06-03 15:36:50 -04:00
Steel Titanium
2ede6dd29f Merge branch 'master' into public-musicplus-libopenmpt 2019-05-20 21:33:10 -04:00
Monster Iestyn
04a8c9a283 Merge branch 'public_next' 2019-05-16 15:58:17 +01:00