Alam Ed Arias
|
0c2a93f750
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:36:00 -05:00 |
|
|
Alam Ed Arias
|
993c0831fc
|
Merge branch 'EOL-7' into EOL
|
2018-11-27 20:28:25 -05:00 |
|
|
Alam Ed Arias
|
1cbda4b3c2
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:26:42 -05:00 |
|
|
Alam Ed Arias
|
a9249937e4
|
Merge branch 'EOL-6' into EOL
|
2018-11-27 20:25:29 -05:00 |
|
|
Alam Ed Arias
|
a958a80a61
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:24:05 -05:00 |
|
|
Alam Ed Arias
|
816bc0d146
|
Merge branch 'EOL-5' into EOL
|
2018-11-27 20:22:22 -05:00 |
|
|
Alam Ed Arias
|
7a70c0e748
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:19:50 -05:00 |
|
|
Alam Ed Arias
|
ab1af1c0af
|
Merge branch 'EOL-4' into EOL
|
2018-11-27 20:17:52 -05:00 |
|
|
Alam Ed Arias
|
761ff7cc6c
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:12:53 -05:00 |
|
|
Alam Ed Arias
|
69114a5374
|
Merge branch 'EOL-3' into EOL
|
2018-11-27 20:12:21 -05:00 |
|
|
Alam Ed Arias
|
b2012b0771
|
fix EOL on src/p_enemy.c
|
2018-11-27 20:08:23 -05:00 |
|
|
Alam Ed Arias
|
76c6de01c4
|
Merge branch 'EOL-2' into EOL
|
2018-11-27 20:05:07 -05:00 |
|
|
Alam Ed Arias
|
dfc142c1d5
|
fix EOL on p_enemy.c
|
2018-11-27 17:21:18 -05:00 |
|
|
Alam Ed Arias
|
f2a4656bd6
|
fix EOL on p_enemy.c
|
2018-11-27 17:15:55 -05:00 |
|
|
mazmazz
|
97ea4086a5
|
Redundant type 1800 check for MT_COIN
|
2018-11-27 14:10:55 -05:00 |
|
|
mazmazz
|
146dd52d24
|
Smarter pause/break rejection for setcontrol
|
2018-11-22 14:48:33 -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 |
|
|
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 |
|