Alam Ed Arias
|
9a042cd5e2
|
Merge branch 'master' into next
|
2018-11-26 19:49:19 -05:00 |
|
Alam Ed Arias
|
776e920895
|
TravisCI: need WFLAGS for cmake builds
|
2018-11-26 19:39:36 -05:00 |
|
Alam Ed Arias
|
5ba788e089
|
Revert "TravisCi: remove WFLAGS"
This reverts commit fd12e85697.
|
2018-11-26 19:38:30 -05:00 |
|
Alam Ed Arias
|
78a1931bdf
|
Makefile: disable implicit-fallthroug warnings
|
2018-11-26 19:38:14 -05:00 |
|
Alam Ed Arias
|
5a3f469593
|
Makefile: skip implicit-fallthroug warnings
|
2018-11-26 19:28:55 -05:00 |
|
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 |
|
Alam Ed Arias
|
4e332b3848
|
Fix MSVC build
|
2018-11-26 18:27:07 -05:00 |
|
Digiku
|
a2678dcb2e
|
Merge branch 'public-nights-invertloopfix' into 'next'
NiGHTS fix lap detection on inverted axis
See merge request STJr/SRB2!300
|
2018-11-26 16:08:24 -05:00 |
|
Digiku
|
fd891aa21d
|
"Turn Left/Right" control naming instead of "Look Left/Right" due to analog mode keymapping quirk
|
2018-11-26 15:48:08 -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 |
|
MonsterIestyn
|
9940b53742
|
Merge pull request #348 from Nevur/PK3-BackportNext
Pk3 backport next
|
2018-11-26 20:14:45 +00:00 |
|
mazmazz
|
b5000f1151
|
More debian 2.1.21 tweaks; update some copyright info to STJr
|
2018-11-26 14:40:59 -05:00 |
|
MonsterIestyn
|
b53cd70201
|
Merge branch 'next' into PK3-BackportNext
|
2018-11-26 18:56:51 +00: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 |
|
Monster Iestyn
|
1b2aea81dc
|
Merge branch 'master' into next
|
2018-11-25 20:39:17 +00: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 |
|
Monster Iestyn
|
85305791d8
|
Merge branch 'objectplace-skybox-fix' into 'next'
Objectplace skybox fix.
See merge request STJr/SRB2!319
|
2018-11-25 09:30:16 -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 |
|
Nev3r
|
d7b3cf9314
|
Forgot the alignment for compact structs.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-25 11:35:19 +01:00 |
|
Nev3r
|
b48c1d1ce6
|
Merge branch 'PK3-BackportNext' of https://github.com/Nevur/SRB2 into PK3-BackportNext
# Conflicts:
# src/w_wad.c
|
2018-11-25 11:18:28 +01:00 |
|
Nev3r
|
7dd6692f40
|
Merge branch 'ghPK3-Backport' into PK3-BackportNext
|
2018-11-25 11:14:32 +01:00 |
|
Nev3r
|
32a9e40baa
|
Progress?
Get all IO outputs used for possible errors.
Attempt to fix errors from travis-ci.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-25 11:11:50 +01:00 |
|
Nev3r
|
7c44054aa3
|
Take out the ifdef?
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-25 09:48:52 +01:00 |
|
Steel Titanium
|
f3ea628fea
|
Update server name instantly on change
|
2018-11-24 21:24:05 -05:00 |
|
Alam Ed Arias
|
1113849f5c
|
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
|
2018-11-24 18:00:14 -05:00 |
|
Nev3r
|
ec67c4cbd6
|
Fix uninitialized pointer.
Signed-off-by: Nev3r <apophycens@gmail.com>
|
2018-11-24 23:39:31 +01:00 |
|
Alam Ed Arias
|
1bcfe16933
|
Do not remove newlines from the end of files
|
2018-11-24 17:30:49 -05:00 |
|
Alam Ed Arias
|
4ac481bcc6
|
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
|
2018-11-24 17:22:11 -05:00 |
|
Nevur
|
3f69e7c9b4
|
Merge branch 'next' into PK3-BackportNext
|
2018-11-24 23:08:52 +01:00 |
|