Alam Ed Arias
|
fd12e85697
|
TravisCi: remove WFLAGS
|
2018-11-26 19:20:12 -05:00 |
|
Alam Ed Arias
|
ac2ec6c982
|
Makefile: disable some warnings for GCC 8.x
|
2018-11-26 19:01:40 -05:00 |
|
Monster Iestyn
|
4b0d45afd8
|
Merge branch 'opengl-noloading' into 'master'
Hide OpenGL loading screen
See merge request STJr/SRB2!349
|
2018-11-26 15:30:45 -05:00 |
|
mazmazz
|
b5000f1151
|
More debian 2.1.21 tweaks; update some copyright info to STJr
|
2018-11-26 14:40:59 -05:00 |
|
mazmazz
|
e615784248
|
Debian control syntax fix
|
2018-11-26 09:08:39 -05:00 |
|
mazmazz
|
b3262bfd4e
|
Debian package version to 2.1.21-beta~1
|
2018-11-26 09:07:21 -05:00 |
|
mazmazz
|
ac2e93abbb
|
LibGME debian rules hack
|
2018-11-26 09:06:53 -05:00 |
|
Monster Iestyn
|
a71ca1d259
|
Merge branch 'fof-slope-skew-backport' into 'master'
FOF wall slope skewing backport
See merge request STJr/SRB2!341
|
2018-11-26 08:54:29 -05:00 |
|
mazmazz
|
9e025cfd33
|
Debian packaging adjustments
|
2018-11-26 07:11:10 -05:00 |
|
Steel Titanium
|
ba111d42ca
|
Last minute changes.
|
2018-11-26 00:24:11 -05:00 |
|
Steel Titanium
|
cf01e820c4
|
Take the command line params into account
Really I'm just making it return early if either of the parms are used.
|
2018-11-25 22:39:11 -05:00 |
|
mazmazz
|
930835f1a2
|
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
|
2018-11-25 21:47:56 -05:00 |
|
Monster Iestyn
|
1c5bd554c2
|
Merge branch 'ms-sqlexample' into 'master'
Add example SQL file.
See merge request STJr/SRB2!330
|
2018-11-25 15:59:17 -05:00 |
|
Steel Titanium
|
7d4c9dda91
|
Add newline to end of file
|
2018-11-25 14:24:50 -05:00 |
|
Steel Titanium
|
981a1192fb
|
Save sound toggles to config
|
2018-11-25 14:22:52 -05:00 |
|
Monster Iestyn
|
aaabf062b8
|
Merge branch 'ms-cvars-fix' into 'master'
Update server name insantly
See merge request STJr/SRB2!344
|
2018-11-25 14:04:12 -05:00 |
|
Monster Iestyn
|
5069acb110
|
Merge branch 'mpc-software-yslope-fix' into 'master'
Fix glitches with flats visible when looking up/down in 1st person (software renderer fix)
See merge request STJr/SRB2!282
|
2018-11-25 11:51:54 -05:00 |
|
Monster Iestyn
|
028236006b
|
Merge branch '21-copyright-followup' into 'master'
Print copyright notice in stdout console on program start
See merge request STJr/SRB2!347
|
2018-11-25 11:07:34 -05:00 |
|
Monster Iestyn
|
8b4a64ac05
|
Merge branch 'last-min-cleanup' into 'master'
Last min cleanup
See merge request STJr/SRB2!342
|
2018-11-25 10:14:34 -05:00 |
|
Monster Iestyn
|
11cb2e05ba
|
Merge branch 'cmake-use-internal-libs' into 'master'
CMake: Use internal libs.
See merge request STJr/SRB2!325
|
2018-11-25 09:33:50 -05:00 |
|
mazmazz
|
e4d7ba39a9
|
Whitespace
|
2018-11-25 08:17:57 -05:00 |
|
mazmazz
|
8e7fc9afd8
|
Add README and LICENSE to cmake install
|
2018-11-25 08:12:34 -05:00 |
|
mazmazz
|
83531469d7
|
Print GPL license notice and SEGA disclaimer in console on start
|
2018-11-25 08:12:19 -05:00 |
|
Digiku
|
40dfe89273
|
Merge branch '21-source-copyright' into 'master'
Update source copyrights to 2018
See merge request STJr/SRB2!346
|
2018-11-25 07:36:41 -05:00 |
|
mazmazz
|
bd4743007e
|
Update source copyrights to 2018, outdated targets
|
2018-11-25 07:35:53 -05:00 |
|
mazmazz
|
ea7162a76a
|
Update source copyrights to 2018
|
2018-11-25 07:35:38 -05:00 |
|
Digiku
|
62443c9090
|
Merge branch '21-credits-update' into 'master'
Extra credits update .21
See merge request STJr/SRB2!345
|
2018-11-25 07:21:31 -05:00 |
|
Steel Titanium
|
f3ea628fea
|
Update server name instantly on change
|
2018-11-24 21:24:05 -05:00 |
|
mazmazz
|
cf8b4a6cb1
|
Additional 2.1 credits update
|
2018-11-23 21:57:07 -05:00 |
|
Monster Iestyn
|
794d27b49e
|
Kill CheckMissileImpact, it has been useless for probably a decade and a half
|
2018-11-23 23:14:49 +00:00 |
|
Monster Iestyn
|
0a0336a674
|
Merge branch 'master' into fof-slope-skew-backport
# Conflicts:
# src/r_segs.c
|
2018-11-23 22:40:28 +00:00 |
|
Monster Iestyn
|
d228e35fcb
|
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 |
|
Steel Titanium
|
97dd291f3f
|
Merge branch 'master' into responsefile-fix
|
2018-11-23 15:29:52 -05:00 |
|
Alam Arias
|
30b9cef043
|
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
|
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 |
|
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
|
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 |
|
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
|
e75a9e2def
|
Add README and LICENSE for installs
|
2018-11-22 07:41:35 -05:00 |
|