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 |
|
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 |
|
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 |
|
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 |
|
Monster Iestyn
|
8da74cb193
|
Fix the nonsense going on here regarding dc_colormap, this makes FOF walls appear strange if they were for a fog block with colormap adjacent to a normal sector with a colormap and no FOFs.
...that was a mouthful
|
2018-11-19 22:12:26 +00:00 |
|
Monster Iestyn
|
cfa4bbd75b
|
change return type of M_CheckMODVersion to boolean
|
2018-11-19 17:47:23 +00:00 |
|
Monster Iestyn
|
1fa80d57dd
|
Make sure GetMODVersion and its console equiv properly detect failing to get a reply from the MS, also added extra console/menu messages
|
2018-11-19 17:46:38 +00:00 |
|
Alam Ed Arias
|
1ff6cb01c7
|
Travis-CI: allow GCC 8.x to fail
|
2018-11-18 21:25:33 -05:00 |
|
Alam Ed Arias
|
674d31e808
|
Merge branch 'master' into Travis_CI-gcc8
|
2018-11-18 21:23:27 -05:00 |
|
Alam Ed Arias
|
6b3616aee6
|
Merge branch 'master' into next
|
2018-11-18 20:22:40 -05:00 |
|
Alam Ed Arias
|
dbf6884b37
|
We need to include the NUL char
|
2018-11-18 20:21:32 -05:00 |
|
Alam Ed Arias
|
913e6aeeb7
|
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
|
2018-11-18 19:59:21 -05:00 |
|
Monster Iestyn
|
07fc73dbad
|
Merge branch 'mingw-64bit' into 'master'
MinGW: Fix compiling on 64-bit Windows.
See merge request STJr/SRB2!329
|
2018-11-18 19:49:18 -05:00 |
|
Steel Titanium
|
165ea9ce25
|
Remove 64-bit libgme
|
2018-11-18 18:24:03 -05:00 |
|
Steel Titanium
|
e1f7717f24
|
Statically link stdc++ and libgcc into libgme
Should fix libgme depending on two DLLs externally.
|
2018-11-18 18:09:34 -05:00 |
|
Monster Iestyn
|
b912008c41
|
Merge branch 'master' into next
|
2018-11-18 17:11:57 +00:00 |
|
Monster Iestyn
|
dbb308e284
|
Merge branch 'camera-subsector-crash-fix' into 'master'
Camera subsector crash fix
See merge request STJr/SRB2!318
|
2018-11-18 08:28:38 -05:00 |
|
Steel Titanium
|
db7d3e5513
|
Add example sql file
|
2018-11-15 17:31:42 -05:00 |
|
Steel Titanium
|
15a70109ae
|
Add missing 64-bit libgme dll
|
2018-11-15 13:30:59 -05:00 |
|