Sally Coolatta
f9ca40e673
Merge branch 'master' into the-scary-22-merge
2020-08-12 20:59:09 -04:00
Sally Coolatta
120dc253af
Merge remote-tracking branch 'origin/iwantmychat' into nametags
2020-06-03 20:19:26 -04:00
Sally Coolatta
63917ffccc
The start of the scary 2.2 merge
...
All conflicts are left in-tact. We should be collaborating on solving these files one at a time.
2020-05-29 13:43:38 -04:00
Sally Coolatta
15d18640de
Merge remote-tracking branch 'public/master' into merge-12
2020-05-12 03:16:14 -04:00
James R
6274b9fde1
ferror does not return errno, are you stupid?
...
Use M_FileError to return the proper error description, or "end-of-file".
(cherry picked from commit 2f521f2eb18a79fd7e0a6aca2f2b7b6113042d6c)
2020-03-24 15:48:42 -07:00
TehRealSalt
217f61897f
K_PlayerForfeit on I_Quit
...
(I believe these are the only i_systems that matter?)
2019-10-02 11:47:56 -04:00
James R
9579f6ea9e
Add font system to Makefile and Visual Studio project files
2019-06-26 16:33:59 -07:00
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
Monster Iestyn
474b70aa69
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
TehRealSalt
da7e79ac83
Adjust file loading
...
Many files converted to pk3, and we now have a distinct IWAD
2019-05-12 20:58:26 -04:00
Jaime Passos
08efec4cf3
destroy hw_glide.h because no modern GPU supports such API
2019-03-21 18:23:40 -03:00
wolfy852
963cbf4671
Merge branch 'next' into md3-vanilla-kart
...
# Conflicts:
# src/hardware/r_opengl/r_opengl.c
2019-03-20 19:50:20 -05:00
Jaime Passos
c8bec127ec
I don't care about DirectDraw
...
Neither SDL 1.2
2019-03-18 15:54:29 -03:00
Alam Arias
18233eba23
Merge branch 'master' into ping-stuff-take2
2019-03-09 18:05:30 -05:00
wolfs
8a6f4b6405
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
wolfy852
277216af2b
I don't think these old interfaces even compile but let's not kill them off
2019-02-22 18:13:22 -06:00
wolfy852
733c472e1f
Reorganization + kill old interfaces
2019-02-19 18:52:57 -06:00
Latapostrophe
4129dae3af
Move ping display in i_video for consistency with showfps display
2019-02-16 13:38:50 +01:00
Steel Titanium
264adb7c7e
Update project files
2019-02-14 21:32:57 -05:00
Sally Cochenour
1928721218
Better cpusleep
...
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -05:00
mazmazz
aae6eb945d
Merge remote-tracking branch 'kart-public-gl/next' into md3-vanilla-kart
2019-01-10 22:08:37 -05:00
Marco Z
74c57ad447
Kart Public Next merge
2019-01-08 18:43:49 -05:00
mazmazz
1b2124b99b
Add model sources to sdl1.2 VC project
2019-01-07 04:23:20 -05:00
SeventhSentinel
1d58c6b8c2
merge srb2 next
2019-01-05 15:59:23 -05:00
mazmazz
f0715d7af3
Updated Kart icons to higher res
2019-01-03 12:26:25 -05:00
mazmazz
c520447f77
Merge remote-tracking branch 'kart-public-gl/next' into kart-public-travis-deployer
2018-12-31 18:20:04 -05:00
mazmazz
937ac47650
Change DEFAULTWADLOCATION to SRB2Kart
2018-12-30 21:13:02 -05:00
mazmazz
7deac7e603
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
8a6031ba01
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
TehRealSalt
bf3a9d1d2e
Edited even more things to say "SRB2Kart"
2018-12-05 20:40:58 -05:00
TehRealSalt
26315ccf63
Merge remote-tracking branch 'srb2public/master' into merge-next
2018-12-05 19:21:13 -05:00
Monster Iestyn
b32f5830ed
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
mazmazz
95fff25a7f
Update OSX icon
2018-12-03 23:09:54 -05:00
mazmazz
a7b12b3ce5
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
mazmazz
856f826afb
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
Monster Iestyn
94ad0b880f
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
mazmazz
951b78ee2d
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
0bff44e22b
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
mazmazz
8c845510a4
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
Steel Titanium
0c30cd0fa1
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Sryder
9350721d12
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into nextmerge
...
# Conflicts:
# src/d_main.c
# src/d_main.h
# src/d_netcmd.c
# src/doomtype.h
# src/hardware/hw_md2.h
# src/p_user.c
# src/r_splats.h
# src/s_sound.c
# src/s_sound.h
# src/screen.c
# src/sdl/i_system.c
2018-11-10 21:14:53 +00:00
Monster Iestyn
51ee510b85
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
Monster Iestyn
b34e8c5390
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
Steel Titanium
d7a0a3c94b
Update copyright info on some files
2018-11-01 14:47:19 -04:00
toaster
1142fddc71
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
Sryder
4132b39b9a
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Sryder
eeb6003595
Disable VSync by default. I wouldn't be surprised if there are issues that arise from it, and I'm fairly sure its always been slightly spotty.
2018-10-04 21:08:47 +01:00
