toaster
0124e248ee
ha ha ha how can i possibly describe this commit
...
Just wait for the MR, it won't be far behind.
2019-07-08 13:26:40 +01:00
MascaraSnake
9f666e125e
Merge branch 'master' into thinkerlists
...
# Conflicts:
# src/f_finale.c
# src/p_enemy.c
2019-07-02 23:08:37 +02:00
toaster
e27a43f976
Improve rain/weather.
...
* Like Kart, remove cv_precipdensity.
* Like Kart, replace "Infinite" draw distance value with "None".
* Better thinker with more return optimisation.
* Better placement of thinking in rendering, to avoid ceiling-mounted sprite glitches.
2019-06-22 16:50:30 +01:00
MascaraSnake
faa43ea92d
Merge branch 'master' into new-acz-minecarts
2019-06-17 20:43:21 +02:00
MascaraSnake
720d84f87f
More incomplete minecart hardcoding
2019-06-13 21:45:30 +02:00
MascaraSnake
01adbfc495
Hardcoded the saloon door
2019-06-12 21:20:14 +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
MascaraSnake
db6b94e7a7
Hardcoded the new Minus behavior
2019-06-10 17:42:37 +02:00
MascaraSnake
b8aac236f2
Hardcoded the Canarivore
2019-06-10 13:58:16 +02: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
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
MascaraSnake
65d804e77d
Hardcoded oil lamp
2019-06-08 15:50:01 +02:00
MascaraSnake
80f09c35bb
Hardcoded dust devil
2019-06-08 09:51:46 +02:00
Nev3r
f92b3cbfdd
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into portals2
2019-06-07 13:11:51 +02:00
Nev3r
ae1e3630f8
Add visplane portal creation functionality and use it to replace the skybox rendering.
...
The skybox rendering process has been replaced with portals instead. Those are generated after the first BSP tree pass by looking for existing sky visplanes at the time, and their windows are used to define new portals.
The skybox portals are still incomplete and cause visual glitches when masked elements are involved.
2019-06-02 00:07:55 +02:00
Steel Titanium
2e8aae5d6a
Merge branch 'next' into jimita-flashpals-on-screenshots
2019-05-25 19:37:17 -04:00
Monster Iestyn
36415b0050
Hardcode the bomb's explosion states, the dust object type and states, and the sprite prefixes for both
2019-05-23 21:51:58 +01:00
Monster Iestyn
a2e0c1998a
Update hw_light.c
...
(though I'm not sure why we bother, since coronas have been disabled for a decade now)
2019-05-23 21:08:27 +01:00
Monster Iestyn
dc5d13da46
Merge branch 'steelt-acz-things-hardcode' into 'master'
...
Hardcode some ACZ things
See merge request STJr/SRB2Internal!220
2019-05-17 12:22:21 -04:00
Monster Iestyn
5e87ab4fa7
Merge branch 'public_flatsprite'
2019-05-16 16:00:24 +01:00
Monster Iestyn
04a8c9a283
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
Steel Titanium
ed6bd64014
Hardcode some ACZ things
2019-05-11 22:56:23 -04:00
Sryder
70ff9be419
No sprite billboarding on papersprites
2019-05-06 20:24:26 +01:00
Sryder
7792b48ea3
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into public_flatsprite
...
# Conflicts:
# src/p_user.c
2019-05-06 20:20:57 +01:00
Sryder
64fb7f90f0
Add a cvar for sprite billboarding, off by default.
2019-05-06 16:57:32 +01:00
Sryder
913d5dd595
OpenGL sprite billboarding
...
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
2019-05-01 20:15:00 +01:00
Nev3r
09ff071656
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
...
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
345984a396
Fix mobj list iteration oversights.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 12:58:22 +02:00
Nev3r
baeda5060c
Basic multiple thinker list implementation
...
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
Monster Iestyn
3d719a5fc3
added support for both horizontal and vertical flipping (not sure if complete or not atm, but I've done enough for tonight I think)
2019-02-13 22:40:48 +00:00
Monster Iestyn
f378ef1451
some more mucking about with function arguments (preparing for alpha/flip support adding particularly), also fixed a slipup I made when I first made HWR_DrawColumnInCache
2019-02-13 20:56:59 +00:00
Monster Iestyn
d097af50a1
split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else
2019-02-13 20:12:10 +00:00
Monster Iestyn
6da3914eca
Turns out the consts ARE needed after all, also fix some other errors the compiler reported
2019-02-13 18:20:26 +00:00
Monster Iestyn
04d1313a8d
blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache
2019-02-13 17:27:20 +00:00
Monster Iestyn
65add2dc60
whoops, removed some variables I shouldn't have, so I've added them back
2019-02-13 16:52:51 +00:00
Monster Iestyn
01fd861deb
Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully.
...
I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though.
(Note: I have not tested if this compiles yet)
2019-02-13 16:39:37 +00:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
Jimita the Cat
6f72f69575
dumb
2019-01-02 01:01:57 -03:00
Jimita the Cat
2cc6a22d12
Add support for flashpals in screenshots
2019-01-02 00:41:52 -03:00
Digiku
1517c16c4d
Merge branch 'MSVC-ARM' into 'master'
...
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
2018-12-28 01:05:40 -05:00
Latapostrophe
1b8be7f1a4
Merge branch 'master' into SRB2-CHAT
2018-12-23 10:26:08 +01:00
Alam Ed Arias
e6cf509a84
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
Alam Arias
5765b3e034
Added ARM/ARM64 to whole vc10 sln
...
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
mazmazz
c4939212dc
Adjust vid.width floating point comparson for CHAT
2018-12-21 11:37:22 -05:00
Digiku
7920dbe4a8
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Digiku
91bed58e6a
Merge branch 'ogl-zfighting-fix' into 'master'
...
OpenGL z-fighting fix [by Azeonus]
Closes #43
See merge request STJr/SRB2!395
2018-12-19 13:05:04 -05:00