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
mazmazz
b8850b5819
Revert "Adjust mouse scaling calculation for SDL in windowed mode"
...
This reverts commit 65b5d74844 .
2018-11-24 15:36:50 -05: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
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
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
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
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
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
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
Steel Titanium
e6fa257b42
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -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