vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,721 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

2721 Commits

Author SHA1 Message Date
Alam Arias b1587cb0a3
Merge pull request #325 from monster-psychic-cat/opengl_startup_screen 
Render the startup screen on OpenGL mode
 2018-11-23 14:47:56 -05:00
Alam Arias 3d0fd7ff2e
Merge pull request #258 from light2yellow/master 
m_fixed: asm: cc is not a register
 2018-11-23 14:47:36 -05:00
Monster Iestyn 08af33c51f 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
Nev3r 0487558a98 Add missing tweaks 
Also remove a test printf.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 17:58:45 +01:00
Nev3r c548aaa347 Backported PK3 support to 2.1 
Hopefully I'm not missing anything.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-11-23 16:58:16 +01:00
Digiku 9a3d2d0ee5 Merge branch '21-credits-update' into 'master' 
2.1.21 credits update

See merge request STJr/SRB2!339
 2018-11-23 07:38:28 -05:00
Digiku 9154ece829 Merge branch '21-readme' into 'master' 
Add README and LICENSE for installs

See merge request STJr/SRB2!335
 2018-11-23 07:36:12 -05:00
Digiku 3c95a63fc2 Merge branch 'public-darker-credits' into 'master' 
Make the credits pics darker

See merge request STJr/SRB2!336
 2018-11-23 07:35:44 -05:00
Digiku 9519534031 Merge branch 'less-confusing-errors' into 'master' 
Make the error less confusing

See merge request STJr/SRB2!337
 2018-11-23 07:35:26 -05:00
mazmazz 2f7f472ca2 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
mazmazz 36e020c366 Update version to 2.1.21 2018-11-23 06:58:45 -05:00
mazmazz 19a8b7b2b1 Finish 3rd party library license file 2018-11-22 23:24:06 -05:00
Steel Titanium fe43deacec Merge branch 'master' into responsefile-fix 2018-11-22 23:02:20 -05:00
Steel Titanium 933c1311cd Make the error less confusing 2018-11-22 22:59:46 -05:00
Steel Titanium 6020abab94 Fix the not found errors on DLLs 2018-11-22 22:44:47 -05:00
Steel Titanium 0412015469 Move DLLs into seperate folders 2018-11-22 22:44:21 -05:00
mazmazz 0d4cd35e13 Make the credits pics darker 2018-11-22 20:08:02 -05:00
mazmazz edd98842d5 Added chasefreecam to menu 2018-11-22 17:32:03 -05:00
mazmazz 17ff7e69a0 Add chasefreelook to separate third and first person mouselook 2018-11-22 17:05:24 -05:00
Monster Iestyn 8f48f082d1 Merge branch 'master' into next 2018-11-22 20:12:59 +00:00
mazmazz a8e01ee69b Smarter pause/break rejection for setcontrol 2018-11-22 14:47:01 -05:00
mazmazz 7075cdbfa8 Don't accept KEY_PAUSE for control console command 2018-11-22 14:37:28 -05:00
mazmazz f926774ee1 Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-22 14:37:21 -05:00
mazmazz 4b5246d5b7 Adjust menu for movement and camera controls 2018-11-22 14:13:28 -05:00
Monster Iestyn 37c0e646e4 Merge branch 'ms-update-alert-fix' into 'master' 
Master Server Update alert fix

See merge request STJr/SRB2!333
 2018-11-22 13:34:43 -05:00
mazmazz 2a5ae054f9 Make movement controls consistent with 2.2 2018-11-22 10:41:21 -05:00
mazmazz e75a9e2def Add README and LICENSE for installs 2018-11-22 07:41:35 -05:00
Steel Titanium ff9c41ca5f Merge branch 'master' into cmake-use-internal-libs 2018-11-21 20:05:08 -05:00
Monster Iestyn 4a88ddf897 Merge branch 'disappearing-servers-fix' into 'master' 
Disappearing servers fix

See merge request STJr/SRB2!334
 2018-11-21 17:12:37 -05:00
Monster Iestyn 3acc312923 Fix servers disappearing from the server list when you refresh, by forcefully closing connnections to the servers immediately after sending ASKINFO. Also force close connections to old server list when refreshing, because we don't need to hear from them anymore full stop. 2018-11-21 20:45:03 +00:00
Monster Iestyn 66900c70ee Merge branch 'master' into next 2018-11-20 13:55:36 +00:00
Monster Iestyn 948466658f Merge branch 'fof-wall-rendering-fixes-and-cleanup' into 'master' 
FOF wall rendering fixes and cleanup

See merge request STJr/SRB2!317
 2018-11-20 08:54:09 -05:00
Monster Iestyn 2d1f927a17 Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs. 
...that was a mouthful
 2018-11-19 22:12:26 +00:00
Monster Iestyn 418943acdc change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
Monster Iestyn 797f9d180e Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages 2018-11-19 17:46:38 +00:00
Alam Ed Arias f34e1edb4d Travis-CI: allow GCC 8.x to fail 2018-11-18 21:25:33 -05:00
Alam Ed Arias a290c4727b Merge branch 'master' into Travis_CI-gcc8 2018-11-18 21:23:27 -05:00
Alam Ed Arias 42afd3532d Merge branch 'master' into next 2018-11-18 20:22:40 -05:00
Alam Ed Arias 0b5069f36c We need to include the NUL char 2018-11-18 20:21:32 -05:00
Alam Ed Arias 5a09d44fd2 Merge remote-tracking branch 'public/master' into Travis_CI-gcc8 2018-11-18 19:59:21 -05:00
Monster Iestyn ab39534ef6 Merge branch 'mingw-64bit' into 'master' 
MinGW: Fix compiling on 64-bit Windows.

See merge request STJr/SRB2!329
 2018-11-18 19:49:18 -05:00
Steel Titanium 9ff0761ab2 Remove 64-bit libgme 2018-11-18 18:24:03 -05:00
Steel Titanium 243f4eedd8 Statically link stdc++ and libgcc into libgme 
Should fix libgme depending on two DLLs externally.
 2018-11-18 18:09:34 -05:00
Monster Iestyn 8c71cd0b90 Merge branch 'master' into next 2018-11-18 17:11:57 +00:00
Monster Iestyn a400bb9ef6 Merge branch 'camera-subsector-crash-fix' into 'master' 
Camera subsector crash fix

See merge request STJr/SRB2!318
 2018-11-18 08:28:38 -05:00
Steel Titanium 7cdb0441dd Add example sql file 2018-11-15 17:31:42 -05:00
Steel Titanium c26c850f5d Add missing 64-bit libgme dll 2018-11-15 13:30:59 -05:00
Steel Titanium 02c08a3e10 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium f02105732e Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium c5a97dcfe6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00