Latapostrophe
fc33255db4
Fix stuff and reimplement the kart features that went poof
2019-06-12 21:36:47 +02:00
MascaraSnake
af024f9f53
Merge branch 'acz-hardcode' into new-acz-minecarts
2019-06-12 21:28:39 +02:00
MascaraSnake
1b491f2496
Forgot to hardcode the mobj.valid checks
2019-06-12 21:28:09 +02:00
MascaraSnake
01adbfc495
Hardcoded the saloon door
2019-06-12 21:20:14 +02:00
Steel Titanium
6c1518c1dc
Merge remote-tracking branch 'remotes/origin/master' into levelselect-tweaks
2019-06-11 20:06:02 -04:00
Steel Titanium
b32519a9f2
Update readme.md
2019-06-11 19:11:42 -04:00
Steel Titanium
8e5593c207
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
Latapostrophe
a35cea9243
chaos conflict
2019-06-11 17:02:47 +02:00
Nev3r
0c3f273745
Properly take skybox viewpoint angle into account.
2019-06-11 14:47:58 +02:00
James R
8faff03f31
Index displayplayers correctly
2019-06-10 14:24:11 -07:00
Jaime Passos
2048dbf753
Update r_opengl.c
2019-06-10 16:53:03 -03:00
toaster
81a07293e6
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
Jaime Passos
157b510f2b
Merge remote-tracking branch 'upstream/master' into gl_shaders
2019-06-10 16:21:46 -03:00
MascaraSnake
ff6c8063af
Fixed some angle business in the BASH code
2019-06-10 20:40:12 +02:00
MascaraSnake
67c3d87190
Hardcoded the new Snapper behavior
2019-06-10 20:32:50 +02:00
Nev3r
b0eef242e0
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-10 18:14:03 +02:00
Nev3r
52618bf895
Fix 1 extra column rendering on portal-clipped vissprites.
2019-06-10 17:59:12 +02:00
MascaraSnake
db6b94e7a7
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
Nev3r
c5c4744652
Remove remnants of portalcullsector.
2019-06-10 17:13:04 +02:00
MascaraSnake
dc113269e9
Fixed the bug
2019-06-10 16:19:58 +02:00
MascaraSnake
a2c61983e5
Hardcoded the new BASH behavior (there's still a bug lurking somewhere)
2019-06-10 16:09:15 +02:00
MascaraSnake
4a91af1d59
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
b8aac236f2
Hardcoded the Canarivore
2019-06-10 13:58:16 +02:00
Sryder
4c26589d5c
Add support for Finishline, shortcut, and disabled waypoints.
...
Remove warning that should be impossible to trip, and doesn't describe problem anymore.
2019-06-10 00:02:48 +01:00
James R
6bee5435d2
Merge remote-tracking branch 'james/ms-connectionfail-fix' into HEAD
2019-06-09 14:22:32 -07:00
James R
62b957d348
Revert "Unfuck MS connecting and error reporting"
...
This reverts commit 50ae248b84
2019-06-09 14:21:04 -07:00
James R
a8d1ddd1c2
Revert "Check error on select"
...
This reverts commit 1d77716d7e
2019-06-09 14:20:33 -07:00
James R
154ce80a9b
Revert "Force of habit"
...
This reverts commit 9f0887fafc
2019-06-09 14:20:32 -07:00
Sryder
7efe868c99
Loop through all the waypoint mobjs when setting up waypoints always
...
This means all the mobjs have waypoints setup and debugvisualise can work better.
2019-06-09 21:49:48 +01:00
Nev3r
b7e2b5612c
Made Portal_Add static; move ffloors clip reset from R_RenderPlayerView to r_plane.
2019-06-09 22:48:54 +02:00
Sryder
379ef52c25
Correct no next waypoint warning message.
2019-06-09 20:37:47 +01:00
Monster Iestyn
67392baae0
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
Sryder
e9786fa956
Waypoint pathfinding exists!
...
Includes some small refactoring of older functions - single return is a bit safer and easier to debug.
Still needs doing are: Finish Line Waypoint, Shortcut waypoints, disabled waypoints.
The actual A* method itself is a bit of a monster, but I can't figure out how to refactor it too much more.
2019-06-09 19:49:21 +01:00
Sryder
128d970bad
Turn CONS_Printf to CONS_Alert in waypoint initialisation.
2019-06-09 19:37:24 +01:00
Sryder
773ddd98a8
Add function for freeing binary heap.
2019-06-09 19:36:36 +01:00
Nev3r
d62268ffd0
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
91ecf9c380
Hardcoded train dust and steam spawner
2019-06-09 17:16:07 +02:00
MascaraSnake
6f7b77f650
Hardcoded train cameo
2019-06-09 13:48:07 +02:00
MascaraSnake
4910c213b2
Hardcoded wood debris
2019-06-09 12:27:09 +02:00
MascaraSnake
3653d5b46e
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
Sryder
b1fa5f6d34
Correct compiler issues.
2019-06-08 22:59:13 +01:00
Sryder
3a25bb38fe
Add callback to heapitem to alert data when the heap index is changed.
...
Add K_BHeapContains to give an easy way to find if the heap contains data.
2019-06-08 22:55:02 +01:00
Steel Titanium
605e32004a
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
Sryder
31d76596c0
Binary Heap Implementation
...
Currently untested.
2019-06-08 21:46:23 +01:00
MascaraSnake
65d804e77d
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
MascaraSnake
65bb8c9494
Changed cacti widths
2019-06-08 14:45:01 +02:00
MascaraSnake
50a9a6c0bb
Fixed dust scaling, changed sound captions
2019-06-08 14:12:39 +02:00
MascaraSnake
80f09c35bb
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
Monster Iestyn
c21b9e632a
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
cd1c87ea71
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
