MascaraSnake
018fb9b461
"Finished" minecart hardcoding (still untested and buggy)
2019-06-14 21:19:52 +02:00
Monster Iestyn
96b12f098b
Merge branch 'apng-opengl' into 'master'
...
opengl apng fix
See merge request STJr/SRB2!497
2019-06-14 13:29:13 -04:00
Jaime Passos
c591633733
Update m_misc.c
2019-06-14 14:13:41 -03:00
MascaraSnake
db66f58f2b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-13 21:52:08 +02:00
MascaraSnake
43f28b8f56
Set tracers via P_SetTarget and not directly
2019-06-13 21:51:31 +02:00
MascaraSnake
ba9c7d9310
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
MascaraSnake
1ff64baf8b
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-12 21:28:39 +02:00
MascaraSnake
fae4dc3f21
Forgot to hardcode the mobj.valid checks
2019-06-12 21:28:09 +02:00
MascaraSnake
fafabaae2b
Hardcoded the saloon door
2019-06-12 21:20:14 +02:00
Steel Titanium
5ee6c5095d
Merge remote-tracking branch 'remotes/origin/master' into levelselect-tweaks
2019-06-11 20:06:02 -04:00
Steel Titanium
2069f2be56
Update readme.md
2019-06-11 19:11:42 -04:00
Steel Titanium
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
Nev3r
a1b2a0a344
Properly take skybox viewpoint angle into account.
2019-06-11 14:47:58 +02:00
toaster
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
MascaraSnake
6a46fc76b8
Fixed some angle business in the BASH code
2019-06-10 20:40:12 +02:00
MascaraSnake
068e07974d
Hardcoded the new Snapper behavior
2019-06-10 20:32:50 +02:00
Nev3r
ae6997621d
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-10 18:14:03 +02:00
Nev3r
c014235ad3
Fix 1 extra column rendering on portal-clipped vissprites.
2019-06-10 17:59:12 +02:00
MascaraSnake
0e80d2ec5d
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
Nev3r
d2605e0314
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
MascaraSnake
85eece29d3
Fixed the bug
2019-06-10 16:19:58 +02:00
MascaraSnake
b98de5d362
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 16:09:15 +02:00
MascaraSnake
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
MascaraSnake
98ea229680
Hardcoded the Canarivore
2019-06-10 13:58:16 +02:00
Nev3r
581e80ed69
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02:00
Monster Iestyn
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
Nev3r
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
MascaraSnake
3a16a7d7d4
Hardcoded train dust and steam spawner
2019-06-09 17:16:07 +02:00
MascaraSnake
6df14492a5
Hardcoded train cameo
2019-06-09 13:48:07 +02:00
MascaraSnake
ca4ab06abf
Hardcoded wood debris
2019-06-09 12:27:09 +02:00
MascaraSnake
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
Steel Titanium
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
MascaraSnake
546af19c82
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
MascaraSnake
3d65ec7426
Changed cacti widths
2019-06-08 14:45:01 +02:00
MascaraSnake
5ac594abf5
Fixed dust scaling, changed sound captions
2019-06-08 14:12:39 +02:00
MascaraSnake
1aaccfcd5c
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
Monster Iestyn
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
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
Steel Titanium
c0c1e5416f
Merge branch 'next' into 2.1.24-prep
2019-06-07 18:02:09 -04:00
Alam Ed Arias
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
Steel Titanium
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Steel Titanium
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
Steel Titanium
eb99ad0437
Merge branch 'more-limits' into 2.1.24-prep
2019-06-07 11:28:43 -04:00
Monster Iestyn
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Nev3r
0795c7811a
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-07 13:11:51 +02:00
Nev3r
8c3ddd61d5
Refactored a bit of code regarding visplane bound trimming for portals; reset ffloor's f_clip/c_clip so that FOFs on portals don't interfere with previously acquired bounds.
2019-06-07 13:10:12 +02:00
Nev3r
d2692ddd24
viewx/viewy also need to be stored/restored.
2019-06-06 13:31:48 +02:00
Nev3r
0d77e8afaf
Add pad checks for visplanes; invalidate invalid columns from visplanes (visplane renderer and column renderers don't speak exactly the same language).
...
The visplane portal top boundary offset has been restored since all known bugs involving it have been fixed.
2019-06-06 11:26:13 +02:00
Nev3r
5284817259
Fix sigsegv when there is no main skybox viewpoint.
2019-06-05 18:45:36 +02:00
