943ddeeabf
You can now jump onto tracks that are running antiparallel to yours
2019-06-15 13:49:30 +02:00
cede95fc21
Some more bugfixes
2019-06-15 00:59:13 +02:00
981443c826
Another bugfix
2019-06-15 00:12:58 +02:00
cc9d7bee80
A bunch of bugfixes
2019-06-15 00:04:50 +02:00
018fb9b461
"Finished" minecart hardcoding (still untested and buggy)
2019-06-14 21:19:52 +02:00
96b12f098b
Merge branch 'apng-opengl' into 'master'
...
opengl apng fix
See merge request STJr/SRB2!497
2019-06-14 13:29:13 -04:00
c591633733
Update m_misc.c
2019-06-14 14:13:41 -03:00
db66f58f2b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-13 21:52:08 +02:00
43f28b8f56
Set tracers via P_SetTarget and not directly
2019-06-13 21:51:31 +02:00
ba9c7d9310
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
1ff64baf8b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-12 21:28:39 +02:00
fae4dc3f21
Forgot to hardcode the mobj.valid checks
2019-06-12 21:28:09 +02:00
fafabaae2b
Hardcoded the saloon door
2019-06-12 21:20:14 +02:00
5ee6c5095d
Merge remote-tracking branch 'remotes/origin/master' into levelselect-tweaks
2019-06-11 20:06:02 -04:00
2069f2be56
Update readme.md
2019-06-11 19:11:42 -04:00
58bb05be00
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
...
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
a1b2a0a344
Properly take skybox viewpoint angle into account.
2019-06-11 14:47:58 +02:00
6c6ed6a349
Fix Titlemap with mazmazz's fancy menu stuff
...
Handled by changing some defaults.
Untested, experimenting with Gitlab Web IDE as reconfiguring my build environment is likely to be a pain and I'd like to put that off as long as possible please
2019-06-10 15:43:47 -04:00
6a46fc76b8
Fixed some angle business in the BASH code
2019-06-10 20:40:12 +02:00
068e07974d
Hardcoded the new Snapper behavior
2019-06-10 20:32:50 +02:00
ae6997621d
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-10 18:14:03 +02:00
c014235ad3
Fix 1 extra column rendering on portal-clipped vissprites.
2019-06-10 17:59:12 +02:00
0e80d2ec5d
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
d2605e0314
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
85eece29d3
Fixed the bug
2019-06-10 16:19:58 +02:00
b98de5d362
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 16:09:15 +02:00
4d0b0f84b1
Pushables that are also vulnerable no longer block crushers (because they die anyway). This allows us to make TNT barrels pushable again.
2019-06-10 14:10:37 +02:00
98ea229680
Hardcoded the Canarivore
2019-06-10 13:58:16 +02:00
581e80ed69
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02:00
e7e3b0ef38
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
f536ab3467
Fixed crash regarding opening reallocating. A thousand thanks go for MonsterIestyn for figuring this out.
...
I carelessly changed the line's drawsegs to curdrawsegs without researching what that piece of code did.
2019-06-09 20:04:07 +02:00
3a16a7d7d4
Hardcoded train dust and steam spawner
2019-06-09 17:16:07 +02:00
6df14492a5
Hardcoded train cameo
2019-06-09 13:48:07 +02:00
ca4ab06abf
Hardcoded wood debris
2019-06-09 12:27:09 +02:00
7b603f4ac8
Hardcoded the TNT barrels and proximity shell (using mazmazz's A_TNTExplode implementation from the minecart branch)
2019-06-09 10:51:33 +02:00
bfa7325295
Merge branch '2.1.24-prep' into 'next'
...
Update version to 2.1.24
See merge request STJr/SRB2!495
2019-06-08 17:08:34 -04:00
546af19c82
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
3d65ec7426
Changed cacti widths
2019-06-08 14:45:01 +02:00
5ac594abf5
Fixed dust scaling, changed sound captions
2019-06-08 14:12:39 +02:00
1aaccfcd5c
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
83b8a98df4
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
c0c1e5416f
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
3edf73f181
Merge branch 'travis-deployer' into 'master'
...
Deploy OS X and Debian packages from Travis-CI
See merge request STJr/SRB2!449
2019-06-07 17:57:29 -04:00
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
e1d025cd2b
Merge branch 'jimita-flashpals-on-screenshots' into 'next'
...
Flashpals on screenshots
See merge request STJr/SRB2!492
2019-06-07 16:37:59 -04:00
eb99ad0437
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
0795c7811a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-07 13:11:51 +02:00
MascaraSnake