James R
7bcf2c2f01
Purge _WINDOWS from Makefile
2020-01-11 16:01:40 -08:00
James R
892be79206
Purge _WINDOWS
2020-01-11 16:00:27 -08:00
James R
dd2dc7eb4f
Clean up project files
2020-01-11 15:51:26 -08:00
James R
f77e620f9d
Kill FMOD library files
2020-01-11 15:44:09 -08:00
James R
ba7e42fea5
Kill fmod
2020-01-11 15:19:17 -08:00
James R
5ec326972c
Merge remote-tracking branch 'origin/next' into more-cleanup
2020-01-11 15:07:23 -08:00
Monster Iestyn
c7ab065b0a
Merge branch 'master' into next
2020-01-11 18:38:09 +00:00
MascaraSnake
661c44b260
Merge branch 'udmf-vslopes' into 'next'
...
Add textmap vertex slope support
See merge request STJr/SRB2!633
2020-01-11 10:02:51 -05:00
Nev3r
afcaa94cd0
Clarify ambiguity regarding mapthing-based vertex slopes.
2020-01-11 08:53:29 +01:00
James R
fef72c6009
Merge branch 'unsigned-bruh' into 'next'
...
Fix incorrect cast
See merge request STJr/SRB2!669
2020-01-11 02:26:52 -05:00
MascaraSnake
2046f524c7
Fix incorrect cast
2020-01-10 23:32:31 +01:00
James R
0345a32c37
Merge branch 'brickblockbustin' into 'next'
...
Brick Block Bustin
See merge request STJr/SRB2!666
2020-01-10 16:02:59 -05:00
James R
e1303a2b5c
Merge branch 'orbital-flickering' into 'master'
...
Don't give player translucency when looking down with the orbital camera
See merge request STJr/SRB2!659
2020-01-10 16:02:44 -05:00
James R
dc151fc7a4
Merge branch 'accurate-papersprites' into 'master'
...
Accurate papersprite projection
See merge request STJr/SRB2!657
2020-01-10 16:02:23 -05:00
James R
407b00b22b
Merge branch 'showconditionset' into 'next'
...
Showconditionset
See merge request STJr/SRB2!651
2020-01-10 15:59:37 -05:00
James R
2491046bc2
Merge branch 'morehints' into 'next'
...
Allow for 10 emblem hints on a map by poking the drawer a bit.
See merge request STJr/SRB2!650
2020-01-10 15:59:22 -05:00
James R
a16c444166
Merge branch 'playerthink-hook' into 'next'
...
PlayerThink Hook
See merge request STJr/SRB2!557
2020-01-10 15:58:30 -05:00
MascaraSnake
ba7a1c0375
Some minor cleanup
2020-01-10 19:56:29 +01:00
MascaraSnake
e532efa5d0
Merge branch 'stars-fix' into 'next'
...
Add MT_FLINGNIGHTSSTAR mobj type
See merge request STJr/SRB2!663
2020-01-10 13:34:43 -05:00
MascaraSnake
023624ebb7
Merge branch 'minor-ogl-improvements' into 'next'
...
Minor OpenGL improvements
See merge request STJr/SRB2!661
2020-01-10 13:32:37 -05:00
MascaraSnake
f691b2255b
Merge branch 'extratextoffs' into 'next'
...
Fix snapping of extra multiplayer text. (Resolves #101 )
See merge request STJr/SRB2!667
2020-01-10 13:31:57 -05:00
toaster
cbbc76b673
Fix snapping of extra multiplayer text. ( Resolves #101 )
2020-01-10 12:50:58 +00:00
toaster
80b801e91e
Mario brick blocks are likely to always have square sectors dividing seperate bricks, so allow them to be busted individually.
2020-01-10 11:43:41 +00:00
James R
2459ca255f
Factor z distance into camera translucency
2020-01-10 00:04:17 -08:00
James R
5c60f8b529
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request STJr/SRB2!662
2020-01-10 00:33:24 -05:00
James R
feb0fc2ee9
Merge branch 'orbital-disappearing' into 'master'
...
Don't clip player MD2 when looking straight down with the orbital camera
See merge request STJr/SRB2!658
2020-01-10 00:33:14 -05:00
James R
ced5ca81a4
Merge branch 'rollout_consistency' into 'next'
...
Rollout Rockonsistency
See merge request STJr/SRB2!655
2020-01-09 16:20:34 -05:00
Alam Ed Arias
71c2ee3850
whitespace cleanup
2020-01-09 16:19:12 -05:00
James R
57a31077e7
Merge branch 'public_hexang' into 'next'
...
Hexafaceted sprite angle support.
See merge request STJr/SRB2!652
2020-01-09 16:14:49 -05:00
MascaraSnake
682e683a71
Merge branch 'fakeplanes-colormap' into 'next'
...
Don't create colormap data out of sidedef text for fake planes linedef
See merge request STJr/SRB2!648
2020-01-09 15:04:33 -05:00
Tatsuru
10e9dd2c23
*bends over seductively to pick up whitespace*
2020-01-09 16:16:24 -03:00
Tatsuru
3e3cb48feb
This is stupid
2020-01-09 12:15:26 -03:00
Sally Cochenour
487e1b02f1
Remove smooth setting
...
It got denied before for Software so I won't include it in the merge request :(
2020-01-09 01:28:14 -05:00
James R
66cf1be0d8
Don't clip player MD2 either!
2020-01-08 20:52:34 -08:00
James R
0f8c736188
Don't make player transparent if the orbital camera is looking straight down
2020-01-08 20:49:38 -08:00
fickleheart
ccc473917e
Check for papersprites per-sprite instead of per-row
...
In theory, should be a performance improvement. In practice idk
2020-01-08 21:14:11 -06:00
fickleheart
1790891fd8
Reduce disappearance of vissprites close to the camera
2020-01-08 21:14:09 -06:00
fickleheart
c0380a3052
Make papersprite projection completely correct in software
...
I heard properpaper had some weird crashes? I couldn't reproduce
them no matter how hard I tried, but I added some bounds checking
to this version too just in case. Gotta get other people's help
to try to reproduce those.
2020-01-08 21:14:07 -06:00
Zachary McAlpin
11d21dd950
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into playerthink-hook
2020-01-08 18:52:56 -06:00
toaster
004cfb45aa
Allow Rollout Rocks that are being ridden to:
...
* Break bustable FOFs like pushables.
* Activate pushable-counting executor activators.
* Get pushed by currents/wind.
This takes advantage of the previously-existing hack relating to objects with MF_PUSHABLE infotable (but not active) flags and a nonzero fuse, which is used as the condition to group this under (rather than MT_ROLLOUTROCK specific fuckery).
Thanks to the bug report submitted by our kirbs pal for getting me off my ass this evening.
2020-01-08 22:36:29 +00:00
toaster
d89050f073
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into public_hexang
...
# Conflicts:
# src/r_defs.h
2020-01-08 21:47:47 +00:00
James R
f650ccf81c
Merge remote-tracking branch 'origin/next' into more-cleanup
2020-01-08 13:35:26 -08:00
James R
7deb18bdc9
Merge remote-tracking branch 'origin/master' into next
2020-01-08 13:27:14 -08:00
James R
4d8c916ca1
Merge branch 'names-update' into 'master'
...
Update copyright statements for changed names
See merge request STJr/SRB2!644
2020-01-08 16:16:41 -05:00
James R
551df5f93a
Merge branch 'state-fix' into 'next'
...
Fix S_HAMMER being off by one
See merge request STJr/SRB2!654
2020-01-08 16:15:55 -05:00
James R
a63bd720b9
Merge branch 'next-newcontrols' into 'next'
...
fcam simple controls but slightly less hacky
See merge request STJr/SRB2!647
2020-01-08 16:15:47 -05:00
James R
117d5ab66f
Merge branch 'highresscale-continue' into 'master'
...
Apply skin's highresscale to continue screen
See merge request STJr/SRB2!645
2020-01-08 16:15:15 -05:00
James R
6870492cf2
Merge branch 'more-opengl-fixes' into 'master'
...
More OpenGL fixes plus masked PNG conversion
See merge request STJr/SRB2!619
2020-01-08 16:14:51 -05:00
James R
3b90571987
Merge branch 'local-lua-commands' into 'next'
...
Local Lua commands + no magic numbers
See merge request STJr/SRB2!602
2020-01-08 16:14:30 -05:00
Steel Titanium
07dfc5cce7
Fix S_HAMMER being off by one
2020-01-08 16:00:02 -05:00
