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 |
|
Nevur
|
71910e9c92
|
Merge pull request #1 from STJr/master
update stupid fork to date
|
2018-11-23 21:34:14 +01: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
|
f793db7e6e
|
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
|
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 |
|
Digiku
|
dcb0b0cd99
|
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
|
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 |
|
mazmazz
|
e7c0581bfc
|
Finish 3rd party library license file
|
2018-11-22 23:24:06 -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 |
|
Steel Titanium
|
42368550c0
|
Move DLLs into seperate folders
|
2018-11-22 22:44:21 -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
|
4cf48536b9
|
Add README and LICENSE for installs
|
2018-11-22 07:41:35 -05:00 |
|
Digiku
|
b06482728d
|
Merge branch 'nights-nerfjump' into 'master'
Nights nerfjump
See merge request STJr/SRB2Internal!206
|
2018-11-21 21:25:14 -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 |
|
Monster Iestyn
|
8eae64b38e
|
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
|
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 |
|
Digiku
|
4ecc1fcab7
|
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 |
|