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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Monster Iestyn
|
b2c3a39a2f
|
I forgot to do this earlier, welp
|
2018-11-20 21:17:46 +00:00 |
|
Monster Iestyn
|
224c0fccdb
|
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
|
66900c70ee
|
Merge branch 'master' into next
|
2018-11-20 13:55:36 +00:00 |
|
Monster Iestyn
|
948466658f
|
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
|
2d1f927a17
|
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
|
f34e1edb4d
|
Travis-CI: allow GCC 8.x to fail
|
2018-11-18 21:25:33 -05:00 |
|
Alam Ed Arias
|
a290c4727b
|
Merge branch 'master' into Travis_CI-gcc8
|
2018-11-18 21:23:27 -05:00 |
|
Alam Ed Arias
|
42afd3532d
|
Merge branch 'master' into next
|
2018-11-18 20:22:40 -05:00 |
|
Alam Ed Arias
|
0b5069f36c
|
We need to include the NUL char
|
2018-11-18 20:21:32 -05:00 |
|
Alam Ed Arias
|
5a09d44fd2
|
Merge remote-tracking branch 'public/master' into Travis_CI-gcc8
|
2018-11-18 19:59:21 -05:00 |
|
Monster Iestyn
|
ab39534ef6
|
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
|
243f4eedd8
|
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
|
8c71cd0b90
|
Merge branch 'master' into next
|
2018-11-18 17:11:57 +00:00 |
|
Monster Iestyn
|
a400bb9ef6
|
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
|
c26c850f5d
|
Add missing 64-bit libgme dll
|
2018-11-15 13:30:59 -05:00 |
|
Steel Titanium
|
02c08a3e10
|
Some small changes
|
2018-11-14 21:01:54 -05:00 |
|
Steel Titanium
|
f02105732e
|
Fix up compiling on DD version
|
2018-11-14 18:00:10 -05:00 |
|
Steel Titanium
|
c5a97dcfe6
|
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
|
2018-11-14 17:28:41 -05:00 |
|
Alam Ed Arias
|
4695841b8d
|
fix format-truncation: need bigger string buffers
|
2018-11-14 16:50:52 -05:00 |
|
Monster Iestyn
|
09f9572a8f
|
Merge branch 'master' into next
|
2018-11-14 21:49:11 +00:00 |
|
Monster Iestyn
|
3e6fcf1b8b
|
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
|
fb08950c19
|
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
|
4e9fc881a2
|
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
|
6fa063375d
|
TravisCI: test build on GCC 8.x
|
2018-11-14 15:56:46 -05:00 |
|
Alam Ed Arias
|
d4cb81cb28
|
Merge branch 'master' into next
|
2018-11-14 15:45:29 -05:00 |
|
MonsterIestyn
|
a4f8411ae7
|
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
|
772c072064
|
Merge branch 'master' into analog-flipcam-synch-fix
|
2018-11-14 19:36:39 +00:00 |
|
Monster Iestyn
|
9c70c87f8e
|
Merge branch 'master' into next
|
2018-11-14 18:01:31 +00:00 |
|
Monster Iestyn
|
8c95ef8a1d
|
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
|
fc4bb83c3e
|
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 |