Alam Ed Arias
fc5e97dba9
Merge branch 'master' into next
2018-11-26 19:49:19 -05:00
Alam Ed Arias
30a3780ecd
TravisCI: need WFLAGS for cmake builds
2018-11-26 19:39:36 -05:00
Alam Ed Arias
6373aec1b1
Revert "TravisCi: remove WFLAGS"
...
This reverts commit 3859d48033
2018-11-26 19:38:30 -05:00
Alam Ed Arias
96ef08cd8f
Makefile: disable implicit-fallthroug warnings
2018-11-26 19:38:14 -05:00
Alam Ed Arias
b608dd9d05
Makefile: skip implicit-fallthroug warnings
2018-11-26 19:28:55 -05:00
Alam Ed Arias
3859d48033
TravisCi: remove WFLAGS
2018-11-26 19:20:12 -05:00
Alam Ed Arias
6759240861
Makefile: disable some warnings for GCC 8.x
2018-11-26 19:01:40 -05:00
Alam Ed Arias
6dbe534c8e
Fix MSVC build
2018-11-26 18:27:07 -05:00
Digiku
e2e0069259
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
Monster Iestyn
a9b813cef2
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
18a10861e0
Merge pull request #348 from Nevur/PK3-BackportNext
...
Pk3 backport next
2018-11-26 20:14:45 +00:00
MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
3750e41347
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
e6be735a08
Dummy out OpenGL loading screen; fix console toggle so it doesn't actually show
2018-11-25 21:47:56 -05:00
Monster Iestyn
a47ba390cc
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
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
Monster Iestyn
72fc63eb8a
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
358e84f56d
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
235c23ded8
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
1983f3bfde
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
0897adcf98
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
058b5bcbda
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
91f2c4f8a7
Whitespace
2018-11-25 08:17:57 -05:00
mazmazz
564d736bb6
Add README and LICENSE to cmake install
2018-11-25 08:12:34 -05:00
mazmazz
22d0d8cb2e
Print GPL license notice and SEGA disclaimer in console on start
2018-11-25 08:12:19 -05:00
Digiku
f79adecdef
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
951b78ee2d
Update source copyrights to 2018, outdated targets
2018-11-25 07:35:53 -05:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Digiku
bacdb3a392
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
df819f2329
Forgot the alignment for compact structs.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 11:35:19 +01:00
Nev3r
63dabd87cd
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
dc9baec6f5
Merge branch 'ghPK3-Backport' into PK3-BackportNext
2018-11-25 11:14:32 +01:00
Nev3r
34facc7c60
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
be2a977ce5
Take out the ifdef?
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-25 09:48:52 +01:00
Steel Titanium
0023f8d7eb
Update server name instantly on change
2018-11-24 21:24:05 -05:00
Alam Ed Arias
0642d7e2c9
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 18:00:14 -05:00
Nev3r
b4110fdb8b
Fix uninitialized pointer.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 23:39:31 +01:00
Alam Ed Arias
8ebb775da9
Do not remove newlines from the end of files
2018-11-24 17:30:49 -05:00
Alam Ed Arias
ee4e86fc67
Merge remote-tracking branch 'Nevur/PK3-BackportNext' into PK3-BackportNext
2018-11-24 17:22:11 -05:00
Nevur
7dd7608006
Merge branch 'next' into PK3-BackportNext
2018-11-24 23:08:52 +01:00
Nev3r
f360e3431c
Revamped the lumpinfo_t array generation code.
...
-The resource type is 'adequately*' detected first.
-The type-specific behaviors are now contained in their own functions, which are called accordingly for each.
-The PKZip lumpinfo_t generation has been almost entirely rewritten.
-If the functions return null pointer, the resource addition is considered invalid and pops an error.
2018-11-24 22:58:35 +01:00
Alam Ed Arias
bd576c8e80
Merge branch 'next' into PK3-BackportNext
2018-11-24 14:54:42 -05:00
Alam Ed Arias
40f7bb5afe
Merge branch 'PK3-Backport' into PK3-BackportNext
2018-11-24 14:54:07 -05:00
Alam Ed Arias
faaf5262da
LFS fixup for PK3 support
2018-11-24 14:48:56 -05:00
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
48cf6572b3
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
mazmazz
354037b251
Additional 2.1 credits update
2018-11-23 21:57:07 -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
