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 |
|
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 |
|
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 |
|
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
|
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
|
15a70109ae
|
Add missing 64-bit libgme dll
|
2018-11-15 13:30:59 -05:00 |
|
Steel Titanium
|
a84c49d7d6
|
Some small changes
|
2018-11-14 21:01:54 -05:00 |
|
Steel Titanium
|
ae2b331a11
|
Fix up compiling on DD version
|
2018-11-14 18:00:10 -05:00 |
|
Steel Titanium
|
a817c84836
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
|
2018-11-14 17:28:41 -05:00 |
|
Alam Ed Arias
|
8277f32b67
|
fix format-truncation: need bigger string buffers
|
2018-11-14 16:50:52 -05:00 |
|
Monster Iestyn
|
d366ee76b6
|
Merge branch 'master' into next
|
2018-11-14 21:49:11 +00:00 |
|
Monster Iestyn
|
9e3e9a3248
|
Merge branch 'opengl-hud-scale-fix' into 'master'
OpenGL HUD scaling fix
See merge request STJr/SRB2!320
|
2018-11-14 16:48:13 -05:00 |
|
Alam Ed Arias
|
270ec5e2b9
|
Fix stringop-truncation: ‘strncpy’ output truncated before terminating nul copying 8 bytes from a string of the same length
|
2018-11-14 16:32:57 -05:00 |
|
Alam Ed Arias
|
e2249b3f08
|
Fix =sizeof-pointer-memaccess: argument to ‘sizeof’ in ‘strncpy’ call is the same expression as the source; did you mean to use the size of the destination?
|
2018-11-14 16:26:46 -05:00 |
|
Alam Ed Arias
|
f2f02c6095
|
TravisCI: test build on GCC 8.x
|
2018-11-14 15:56:46 -05:00 |
|
Alam Ed Arias
|
aef0d9a421
|
Merge branch 'master' into next
|
2018-11-14 15:45:29 -05:00 |
|
MonsterIestyn
|
0ea835058c
|
Merge pull request #313 from LJSonik/analog-flipcam-synch-fix
Fix desynch when toggling analog mode or flipcam
|
2018-11-14 19:57:47 +00:00 |
|
MonsterIestyn
|
44646db6af
|
Merge branch 'master' into analog-flipcam-synch-fix
|
2018-11-14 19:36:39 +00:00 |
|
Monster Iestyn
|
4e86572285
|
Merge branch 'master' into next
|
2018-11-14 18:01:31 +00:00 |
|
Monster Iestyn
|
a0bec73904
|
Merge branch 'public-sdl2mixer-update' into 'master'
Update SDL Mixer to 2.0.4
See merge request STJr/SRB2!322
|
2018-11-14 12:58:07 -05:00 |
|
Monster Iestyn
|
16451363b9
|
Merge branch 'public-sdl2-update' into 'master'
Update SDL2 to 2.0.9
See merge request STJr/SRB2!321
|
2018-11-14 12:57:54 -05:00 |
|
Digiku
|
b10ae14719
|
Merge branch 'tracer-angle-fix' into 'master'
Line 457 Track Object Angle: Calculate input angle tolerance correctly
See merge request STJr/SRB2Internal!203
|
2018-11-14 11:31:54 -05:00 |
|
Alam Ed Arias
|
525bd219b6
|
Merge branch 'master' into next
|
2018-11-14 11:07:12 -05:00 |
|
Alam Ed Arias
|
05afaa586e
|
Fix misleading indentation
|
2018-11-14 11:06:45 -05:00 |
|
Alam Ed Arias
|
3bd88acf25
|
Merge branch 'vc-xpm-fix' into 'master'
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
|
2018-11-14 11:00:20 -05:00 |
|
Alam Ed Arias
|
fbb28ba1b5
|
Cleanup whitespace
|
2018-11-14 10:54:33 -05:00 |
|
Alam Ed Arias
|
a4726ee0b7
|
Merge branch 'master' into next
|
2018-11-14 10:52:49 -05:00 |
|
Alam Ed Arias
|
45c8920bb1
|
Clean up warnings
|
2018-11-14 10:52:16 -05:00 |
|
mazmazz
|
368b12d6d9
|
Line 457: Calculate input angle tolerance correctly
|
2018-11-14 10:13:39 -05:00 |
|
Marco Z
|
999a03aada
|
Comment context for declaration changes; remove extern terms
|
2018-11-14 08:15:38 -05:00 |
|
Marco Z
|
f5fe8c46fa
|
Remove unnecessary SDLCALL from xpm declarations
|
2018-11-14 08:06:07 -05:00 |
|
Monster Iestyn
|
3350096b2f
|
Fix VC project files to include hw_clip.c/h
|
2018-11-14 12:11:57 +00:00 |
|
Monster Iestyn
|
fabcb3d842
|
Merge branch 'public-winsnd-libgme-fix' into 'master'
Missed #ifdef HAVE_LIBGME in win_snd
See merge request STJr/SRB2!326
|
2018-11-14 06:40:07 -05:00 |
|