Nev3r
c548aaa347
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
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
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -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
mazmazz
edd98842d5
Added chasefreecam to menu
2018-11-22 17:32:03 -05:00
mazmazz
17ff7e69a0
Add chasefreelook to separate third and first person mouselook
2018-11-22 17:05:24 -05:00
Monster Iestyn
8f48f082d1
Merge branch 'master' into next
2018-11-22 20:12:59 +00:00
mazmazz
146dd52d24
Smarter pause/break rejection for setcontrol
2018-11-22 14:48:33 -05:00
mazmazz
a8e01ee69b
Smarter pause/break rejection for setcontrol
2018-11-22 14:47:01 -05:00
mazmazz
7075cdbfa8
Don't accept KEY_PAUSE for control console command
2018-11-22 14:37:28 -05:00
mazmazz
f926774ee1
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-22 14:37:21 -05:00
mazmazz
4b5246d5b7
Adjust menu for movement and camera controls
2018-11-22 14:13:28 -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
Digiku
38b4425030
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
dd1ecb04cf
Change camera control names to Look
2018-11-22 11:28:32 -05:00
mazmazz
2a5ae054f9
Make movement controls consistent with 2.2
2018-11-22 10:41:21 -05:00
mazmazz
e75a9e2def
Add README and LICENSE for installs
2018-11-22 07:41:35 -05:00
Digiku
9ff8881e95
Merge branch 'nights-nerfjump' into 'master'
...
Nights nerfjump
See merge request STJr/SRB2Internal!206
2018-11-21 21:25:14 -05:00
mazmazz
6a3b41ea6f
Let skins jump their regular strength variances in NiGHTS
2018-11-21 21:24:44 -05:00
mazmazz
40eda0e749
Nerf jumping
2018-11-21 21:13:15 -05:00
Digiku
9e75774fd2
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
250aab5889
Missed sign cast
2018-11-21 20:30:26 -05:00
Digiku
c6bd1111e5
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
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
Digiku
bb38aa649f
Merge branch 'nov20-build-fixes' into 'master'
...
Nov20 build fixes
See merge request STJr/SRB2Internal!205
2018-11-21 17:23:20 -05:00
Monster Iestyn
4a88ddf897
Merge branch 'disappearing-servers-fix' into 'master'
...
Disappearing servers fix
See merge request STJr/SRB2!334
2018-11-21 17:12:37 -05:00
Digiku
e599428442
Merge branch 'debug_stuff' into 'master'
...
Debug tweaks
See merge request STJr/SRB2Internal!144
2018-11-21 16:41:51 -05:00
Digiku
f3e4cf1f9d
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
597877773b
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
Digiku
973df61ec2
Merge branch 'hud-n-menu-tidbits' into 'master'
...
Improved addons menu performance and other HUD tidbits
See merge request STJr/SRB2Internal!151
2018-11-21 16:29:24 -05:00
Monster Iestyn
3acc312923
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
9bdab67de6
Don't accept KEY_PAUSE for control console command
2018-11-21 11:21:17 -05:00
mazmazz
2acad7ad86
Dont show Hold to Retry HUD when using Pause/Break key
2018-11-21 11:10:18 -05:00
mazmazz
8a9c10e633
Hardcode Pause/Break key and change Pause default; show prompt in menu about Pause key
2018-11-21 10:58:07 -05:00
mazmazz
74da082c75
Merge remote-tracking branch 'origin/master' into HEAD
2018-11-20 23:19:36 -05:00
Marco Z
c0df7b47c5
Merge branch 'c88bbda028a21a51058488ee0214ce925625f0a0' into nov20-build-fixes
...
# Conflicts:
# src/hardware/hw_main.c
2018-11-20 22:42:20 -05:00
Marco Z
ddd357d27c
VC build fixes
2018-11-20 21:54:20 -05:00
mazmazz
0af071dbca
build errors
2018-11-20 20:23:48 -05:00
mazmazz
dcac157ccd
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
mazmazz
5870d145b2
Draw connection screen correctly; make scroll speed inherit global setting
2018-11-20 18:13:18 -05:00
mazmazz
094ec7ce3c
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
