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
55dae90eb7
Smarter pause/break rejection for setcontrol
2018-11-22 14:48:33 -05: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
Digiku
bc520b603a
Merge branch 'new-control-names' into 'master'
...
Change camera control names to Look
See merge request STJr/SRB2Internal!207
2018-11-22 11:32:10 -05:00
mazmazz
e72df07c6c
Change camera control names to Look
2018-11-22 11:28:32 -05:00
mazmazz
2a61fa990f
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
mazmazz
2eb1b5186c
Let skins jump their regular strength variances in NiGHTS
2018-11-21 21:24:44 -05:00
mazmazz
b1ddcb644e
Nerf jumping
2018-11-21 21:13:15 -05:00
Digiku
7e48af8afd
Merge branch 'nights-ideyaspawn-dronebox' into 'master'
...
NiGHTS: Ideya Anchor Points
See merge request STJr/SRB2Internal!160
2018-11-21 21:03:29 -05:00
mazmazz
06b8128013
Missed sign cast
2018-11-21 20:30:26 -05:00
Digiku
aed64a7c73
Merge branch 'nights-dronebox' into 'master'
...
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
Steel Titanium
e6fa257b42
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
Digiku
24218532af
Merge branch 'nov20-build-fixes' into 'master'
...
Nov20 build fixes
See merge request STJr/SRB2Internal!205
2018-11-21 17:23:20 -05:00
Digiku
989bdfb85e
Merge branch 'debug_stuff' into 'master'
...
Debug tweaks
See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -05:00
Digiku
5101d6ef36
Merge branch 'nights-fastercapsule' into 'master'
...
NiGHTS: Faster Egg Capsule destruct sequence
See merge request STJr/SRB2Internal!164
2018-11-21 16:30:01 -05:00
Digiku
180a6b3dc2
Merge branch 'nights-onfootcapsulefix' into 'master'
...
NiGHTS: Allow player to destroy capsule on-foot before transforming into NiGHTS
See merge request STJr/SRB2Internal!185
2018-11-21 16:29: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
mazmazz
2d01a33da5
Don't accept KEY_PAUSE for control console command
2018-11-21 11:21:17 -05:00
mazmazz
72a32696a5
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
mazmazz
21a3121b95
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 10:58:07 -05:00
mazmazz
3bb75690c4
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
Marco Z
c81857c8d8
Merge branch '5ec9ab373f5dccdc377527ecbc9d1a4f331f5d56' into nov20-build-fixes
...
# Conflicts:
# src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
Marco Z
633c28b28a
VC build fixes
2018-11-20 21:54:20 -05:00
mazmazz
2c3ed93178
build errors
2018-11-20 20:23:48 -05:00
mazmazz
b37a2016c7
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
mazmazz
e682fb919f
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
mazmazz
c65ff66383
Performance improvements
...
* Don't loop every frame for menu drawing parameters
* Fixed in-game escape menu not dimming correctly
* Fixed glitches on default title screen parameters
2018-11-20 17:28:26 -05:00
Monster Iestyn
ec10b18c46
I forgot to do this earlier, welp
2018-11-20 21:17:46 +00:00
Monster Iestyn
eb4eef6104
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
Monster Iestyn
3cbe8b26b5
Merge branch 'master' into next
2018-11-20 13:55:36 +00:00
