Commit graph

2730 commits

Author SHA1 Message Date
mazmazz
65b5d74844 Adjust mouse scaling calculation for SDL in windowed mode 2018-11-23 21:43:50 -05:00
mazmazz
ef18d22f63 Change default mouse sensitivity 2018-11-23 20:51:57 -05:00
Monster Iestyn
e34f2bf467 Kill CheckMissileImpact, it has been useless for probably a decade and a half 2018-11-23 23:14:49 +00:00
Monster Iestyn
24f14fc526 Merge branch 'master' into fof-slope-skew-backport
# Conflicts:
#	src/r_segs.c
2018-11-23 22:40:28 +00:00
Monster Iestyn
4db1220ad9 Merge branch 'master' into next 2018-11-23 21:01:03 +00:00
Monster Iestyn
d6238ffbe9 Merge branch 'responsefile-fix' into 'master'
Fix M_FindResponseFile returning garbage data

See merge request STJr/SRB2!254
2018-11-23 15:59:40 -05:00
Nevur
71910e9c92 Merge pull request #1 from STJr/master
update stupid fork to date
2018-11-23 21:34:14 +01:00
Steel Titanium
e5611eec7b Merge branch 'master' into responsefile-fix 2018-11-23 15:29:52 -05:00
Alam Arias
5fd6df3625 Merge pull request #326 from monster-psychic-cat/opengl_splitscreen_sky_fix
Render the skies correctly on splitscreen in OpenGL mode
2018-11-23 14:48:05 -05:00
Alam Arias
004de4fb6d 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
7c02cfe486 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
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
Nev3r
206d411f46 Add missing tweaks
Also remove a test printf.

Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
Nev3r
623c7097f1 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
032d6a02fe 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
f793db7e6e 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
6049796027 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
dcb0b0cd99 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
f51d2950a5 Update credits for 2.1.21 2018-11-23 07:34:23 -05:00
mazmazz
8c845510a4 Update version to 2.1.21 2018-11-23 06:58:45 -05:00
mazmazz
e7c0581bfc Finish 3rd party library license file 2018-11-22 23:24:06 -05:00
Steel Titanium
0c30cd0fa1 Merge branch 'master' into responsefile-fix 2018-11-22 23:02:20 -05:00
Steel Titanium
97ea1966fd Make the error less confusing 2018-11-22 22:59:46 -05:00
Steel Titanium
6d946c1c84 Fix the not found errors on DLLs 2018-11-22 22:44:47 -05:00
Steel Titanium
42368550c0 Move DLLs into seperate folders 2018-11-22 22:44:21 -05:00
mazmazz
d1209e3f3d Make the credits pics darker 2018-11-22 20:08:02 -05:00
mazmazz
21095ad813 Added chasefreecam to menu 2018-11-22 17:32:03 -05:00
mazmazz
823b75797e Add chasefreelook to separate third and first person mouselook 2018-11-22 17:05:24 -05:00
Monster Iestyn
4028929e6e Merge branch 'master' into next 2018-11-22 20:12:59 +00:00
mazmazz
6e25b6f523 Smarter pause/break rejection for setcontrol 2018-11-22 14:47:01 -05:00
mazmazz
7c689946e0 Don't accept KEY_PAUSE for control console command 2018-11-22 14:37:28 -05:00
mazmazz
340b5e9d4f Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key 2018-11-22 14:37:21 -05:00
mazmazz
472caaf277 Adjust menu for movement and camera controls 2018-11-22 14:13:28 -05:00
Monster Iestyn
be21e6074c 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
2a61fa990f Make movement controls consistent with 2.2 2018-11-22 10:41:21 -05:00
mazmazz
4cf48536b9 Add README and LICENSE for installs 2018-11-22 07:41:35 -05:00
Steel Titanium
e6fa257b42 Merge branch 'master' into cmake-use-internal-libs 2018-11-21 20:05:08 -05:00
Monster Iestyn
8eae64b38e 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
07f45a954c 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
3cbe8b26b5 Merge branch 'master' into next 2018-11-20 13:55:36 +00:00
Monster Iestyn
22835af9e1 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
8da74cb193 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
cfa4bbd75b change return type of M_CheckMODVersion to boolean 2018-11-19 17:47:23 +00:00
Monster Iestyn
1fa80d57dd 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
1ff6cb01c7 Travis-CI: allow GCC 8.x to fail 2018-11-18 21:25:33 -05:00
Alam Ed Arias
674d31e808 Merge branch 'master' into Travis_CI-gcc8 2018-11-18 21:23:27 -05:00
Alam Ed Arias
6b3616aee6 Merge branch 'master' into next 2018-11-18 20:22:40 -05:00
Alam Ed Arias
dbf6884b37 We need to include the NUL char 2018-11-18 20:21:32 -05:00
Alam Ed Arias
913e6aeeb7 Merge remote-tracking branch 'public/master' into Travis_CI-gcc8 2018-11-18 19:59:21 -05:00
Monster Iestyn
07fc73dbad 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