Commit graph

2810 commits

Author SHA1 Message Date
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
Steel Titanium
165ea9ce25 Remove 64-bit libgme 2018-11-18 18:24:03 -05:00
Steel Titanium
e1f7717f24 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
b912008c41 Merge branch 'master' into next 2018-11-18 17:11:57 +00:00
Monster Iestyn
dbb308e284 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
db7d3e5513 Add example sql file 2018-11-15 17:31:42 -05:00
Steel Titanium
15a70109ae Add missing 64-bit libgme dll 2018-11-15 13:30:59 -05:00
Steel Titanium
a84c49d7d6 Some small changes 2018-11-14 21:01:54 -05:00
Steel Titanium
ae2b331a11 Fix up compiling on DD version 2018-11-14 18:00:10 -05:00
Steel Titanium
a817c84836 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit 2018-11-14 17:28:41 -05:00
Alam Ed Arias
8277f32b67 fix format-truncation: need bigger string buffers 2018-11-14 16:50:52 -05:00
Monster Iestyn
d366ee76b6 Merge branch 'master' into next 2018-11-14 21:49:11 +00:00
Monster Iestyn
9e3e9a3248 Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix

See merge request STJr/SRB2!320
2018-11-14 16:48:13 -05:00
Alam Ed Arias
270ec5e2b9 Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length 2018-11-14 16:32:57 -05:00
Alam Ed Arias
e2249b3f08 Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination? 2018-11-14 16:26:46 -05:00
Steel Titanium
b82c2bffde Properly check if cmake is running on wwindows
Thanks Monster Iestyn for informing me this is the correct way.
2018-11-14 15:58:45 -05:00
Alam Ed Arias
f2f02c6095 TravisCI: test build on GCC 8.x 2018-11-14 15:56:46 -05:00
Alam Ed Arias
aef0d9a421 Merge branch 'master' into next 2018-11-14 15:45:29 -05:00
MonsterIestyn
0ea835058c Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
2018-11-14 19:57:47 +00:00
MonsterIestyn
44646db6af Merge branch 'master' into analog-flipcam-synch-fix 2018-11-14 19:36:39 +00:00
Monster Iestyn
4e86572285 Merge branch 'master' into next 2018-11-14 18:01:31 +00:00
Monster Iestyn
a0bec73904 Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4

See merge request STJr/SRB2!322
2018-11-14 12:58:07 -05:00
Monster Iestyn
16451363b9 Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9

See merge request STJr/SRB2!321
2018-11-14 12:57:54 -05:00