vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6348 commits 50 branches 7 tags 75 MiB
Commit graph

6348 commits

This branch
This branch
All branches
Author SHA1 Message Date
fickleheart 7fc1f02b07 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/doomdef.h
#	src/g_game.c
#	src/p_user.c
 2019-03-19 22:17:25 -05:00
Jaime Passos 9451b10ac5 add SHADERS comment support 2019-03-19 18:52:41 -03:00
Jaime Passos dd4e5ea373 fix shader loading on startup 2019-03-19 18:41:12 -03:00
Jaime Passos da001a5b54 PK3 support 2019-03-19 18:25:55 -03:00
Jaime Passos f714cba310 Improve custom shader support 2019-03-19 17:37:04 -03:00
Jaime Passos 848ae84188 Merge branch 'master' of https://github.com/STJr/SRB2 into gl_shaders 2019-03-19 15:33:16 -03:00
Jaime Passos 9ffb093f44 change (void*) to (char*) 2019-03-19 14:41:48 -03:00
Jaime Passos ae3ad1ea56 wups 2019-03-19 13:32:44 -03:00
Alam Ed Arias 1c55daef2a CMake: have funny check for empty CMAKE_SIZEOF_VOID_P 2019-03-19 09:10:25 -04:00
Alam Arias e50eb1f593 Merge remote-tracking branch 'upstream/master' 2019-03-19 01:05:54 -04:00
Alam Ed Arias 49dddf54ab CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac? 2019-03-19 00:04:14 -04:00
Alam Ed Arias 6142becb4d Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check" 
This reverts commit d03c53930b.
 2019-03-18 23:58:31 -04:00
Jaime Passos 75919422c6 custom shader support 2019-03-18 23:03:29 -03:00
Jaime Passos 1de35b9076 fix buildbot 2019-03-18 20:04:28 -03:00
Jaime Passos 5c399b0944 add vertex shaders 2019-03-18 19:17:47 -03:00
Monster Iestyn 2fb569857a Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
Jaime Passos f210053735 md3-vanilla 2019-03-18 18:34:20 -03:00
Alam Ed Arias d03c53930b Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check 2019-03-18 16:50:17 -04:00
Jaime Passos 9879734d52 I don't care about DirectDraw 
Neither SDL 1.2
 2019-03-18 15:54:29 -03:00
fickleheart af17038cfb LAT 2019-03-17 21:44:11 -05:00
Jaime Passos 1cfdd07ee0 gl4 2019-03-17 22:27:50 -03:00
Sryder 7c3925e1ea Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git 2019-03-17 22:59:08 +00:00
fickleheart e18c6c0e1f Merge branch 'version-prep' 2019-03-17 17:55:38 -05:00
Sryder ca522b3702 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-03-17 22:54:28 +00:00
fickleheart ca68042d95 Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep 2019-03-17 16:37:01 -05:00
fickleheart f909a055d8 Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep 2019-03-17 16:36:52 -05:00
James R 70f40d54cb Resume sounds on unpausing after a window re-focus 2019-03-16 15:50:16 -07:00
James R 5057c37dfb Move change viewpoint control checking so it doesn't take precedence 
Notably over chat.
 2019-03-16 15:42:18 -07:00
fickleheart 4b71ac7b6b Merge branch 'netarchive-fix' into version-prep 2019-03-16 15:00:02 -05:00
fickleheart b9ae148af6 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 14:59:55 -05:00
fickleheart 50c0ed0f07 Fix bad merge in map data archiving code 2019-03-16 14:56:56 -05:00
fickleheart 875506e6cc Don't free this cached colormap! 2019-03-16 12:22:11 -05:00
fickleheart f18d2a684b Merge branch 'lua-ticcmd-latency' into version-prep 2019-03-16 02:41:19 -05:00
fickleheart d727492c87 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 02:41:14 -05:00
fickleheart 0b1cc92f1a Allow reading ticcmd latency 2019-03-16 02:19:43 -05:00
fickleheart ebe76f7a1b Remove dumb special case 2019-03-16 01:29:13 -05:00
fickleheart cd4fc40b9e Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00
fickleheart abc479980c Update patch.kart hash again 2019-03-16 00:35:13 -05:00
fickleheart fd12ff9163 Merge branch 'kartstuff-fix' into version-prep 2019-03-16 00:02:40 -05:00
Steel Titanium 6d751ff302 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium 5a170b9e4e Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Steel Titanium 67a80ba311 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command 2019-03-15 16:13:31 -04:00
Jimita 6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots 2019-03-15 16:38:33 -03:00
Digiku c0782aa89e Merge branch 'public-musicplus-feature-interfadeout' into 'next' 
Fade out level music during intermission via level header

See merge request STJr/SRB2!470
 2019-03-15 01:40:23 -04:00
mazmazz 6b93ca9221 Intermission: Don't fade out level music when using win32 midi volume hack 2019-03-15 01:26:13 -04:00
mazmazz 6cf05a4613 Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
Digiku dcd8669ec2 Merge branch 'public-musicplus-inter' into 'next' 
Custom intermission music by level header [by SteelTitanium]

See merge request STJr/SRB2!469
 2019-03-15 00:23:45 -04:00
mazmazz bd9e42ce6e Merge branch 'public-gl-next' into public-musicplus-inter 2019-03-14 23:42:16 -04:00
Sal bc85256add Merge branch 'kartstuff-fix' into 'master' 
Add missing deh entry for k_starpostflip

See merge request KartKrew/Kart!127
 2019-03-14 17:32:22 -04:00
mazmazz fdde5f13c5 When resetting volume on same music, make it fade instead of a hard change 2019-03-13 23:55:30 -04:00