James R
|
39e7f7b10b
|
Merge branch 'rvz1-crashfix' into 'next'
Fix crash on mapload when removing Dragonbomber with Lua
See merge request STJr/SRB2!545
|
2019-12-17 16:16:51 -05:00 |
|
James R
|
eb39e72a10
|
Merge branch 'spawn_z_refactor' into 'next'
(UDMF prereq.) Spawn Z refactor
See merge request STJr/SRB2!536
|
2019-12-16 23:21:07 -05:00 |
|
James R
|
def0123e9a
|
Merge branch 'fix-sector-lines' into 'next'
Fix sector.lines in Lua
See merge request STJr/SRB2!542
|
2019-12-16 23:05:52 -05:00 |
|
Steel Titanium
|
6797e328bb
|
Fix crash on mapload when removing Dragonbomber with Lua
|
2019-12-16 21:25:41 -05:00 |
|
James R
|
f67b370d74
|
Merge branch 'lua-maincfg-vars' into 'next'
Lua MainCfg vars
See merge request STJr/SRB2!543
|
2019-12-16 17:54:01 -05:00 |
|
Monster Iestyn
|
3022d559c8
|
Added a lot of SOC-editable variables to Lua, as well as the tutorialmode boolean
|
2019-12-16 20:26:19 +00:00 |
|
Monster Iestyn
|
b0a42140e6
|
Fix numoflines calculations in sectorlines_* functions by first typecasting seclines (the sector.lines address) to size_t before doing any math on it, then (after the math) typecast the result to size_t * and dereference it.
And yes, this time I tested it to make sure it works :)
|
2019-12-16 17:46:27 +00:00 |
|
Monster Iestyn
|
aac976436d
|
Merge branch 'master' into next
|
2019-12-16 15:41:47 +00:00 |
|
James R
|
f2c27df524
|
Merge branch 'map-command-no-mapheaderinfo' into 'master'
Let the map command warp to maps without a level header
See merge request STJr/SRB2!528
|
2019-12-15 16:59:03 -05:00 |
|
James R
|
6aceb69137
|
Merge branch 'cmake-fixes' into 'master'
Various cmake adjustments
See merge request STJr/SRB2!538
|
2019-12-15 16:58:45 -05:00 |
|
James R
|
7f509c6570
|
Merge branch 'dont-be-mean-to-tails-plz' into 'master'
Don't be mean to Tails plz (Pandora's Box Super cheat fix)
See merge request STJr/SRB2!540
|
2019-12-15 16:58:24 -05:00 |
|
MascaraSnake
|
e1df80adac
|
Set mapthing z in OP_CreateNewMapThing
|
2019-12-15 21:43:50 +01:00 |
|
Monster Iestyn
|
12a38331e8
|
Remove anti-Tails restriction for the Allow super Pandora's Box cheat.
Despite popular belief, this was just some experimenting from 2.2 development that we forgot to remove!
|
2019-12-15 15:40:56 +00:00 |
|
MascaraSnake
|
71767b7d11
|
SpawnEmeraldHunt() -> P_SpawnEmeraldHunt()
|
2019-12-15 09:49:54 +01:00 |
|
Eidolon
|
35d262e853
|
[cmake] Remove srb2dd target
|
2019-12-15 00:47:58 -06:00 |
|
Eidolon
|
de12308eb8
|
[cmake] Use same executable names as Makefile
|
2019-12-15 00:39:04 -06:00 |
|
James R
|
733afcb0d4
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-14 15:28:25 -08:00 |
|
MascaraSnake
|
7fba63d1fa
|
Cleaned up GetMobjSpawnHeight a bit. Ring-likes no longer ignore MF_SPAWNCEILING, because why should they?
|
2019-12-15 00:22:17 +01:00 |
|
James R
|
9248a9b5e3
|
Merge branch 'ripple2' into 'master'
Tilted ripple
See merge request STJr/SRB2!524
|
2019-12-14 17:52:54 -05:00 |
|
Jaime Passos
|
ca3323d19b
|
Move position of R_PlaneRipple in the file so this looks more organised
|
2019-12-14 19:50:40 -03:00 |
|
Jaime Passos
|
96bfc1da8f
|
Merge remote-tracking branch 'origin/master' into ripple2
|
2019-12-14 19:36:54 -03:00 |
|
James R
|
bc939a2211
|
Merge branch 'opengl-is-a-bad-renderer' into 'master'
OpenGL fixes
See merge request STJr/SRB2!519
|
2019-12-14 16:48:50 -05:00 |
|
James R
|
2ce0e4152b
|
Merge branch 'fix-shield-hover' into 'next'
Stop characters from being able to activate their abilities when doing a shield ability!
See merge request STJr/SRB2!522
|
2019-12-14 16:48:12 -05:00 |
|
James R
|
91862da7cc
|
Merge branch 'portalcullsector' into 'master'
Restore portal culling code that went gone by pure accident
See merge request STJr/SRB2!523
|
2019-12-14 16:47:51 -05:00 |
|
James R
|
ac35f96fba
|
Merge branch 'software-drawers-refactor' into 'master'
Optimize Software drawers
See merge request STJr/SRB2!533
|
2019-12-14 16:47:27 -05:00 |
|
James R
|
74091c294d
|
Merge branch 'customexitvars-rework' into 'next'
Rework G_SetCustomExitVars to allow skipstats 2
See merge request STJr/SRB2!534
|
2019-12-14 16:47:18 -05:00 |
|
Steel Titanium
|
12ec2e85cd
|
Merge branch 'master' into next
|
2019-12-14 16:44:56 -05:00 |
|
James R
|
4be9f8eff7
|
Fix C90 error from NOHW
|
2019-12-14 13:30:10 -08:00 |
|
James R
|
e472dd5750
|
Oops C90
|
2019-12-14 12:55:11 -08:00 |
|
Jaime Passos
|
4f0bf05a7f
|
Merge remote-tracking branch 'origin/master' into software-drawers-refactor
|
2019-12-13 19:22:47 -03:00 |
|
Jaime Passos
|
b776352e8e
|
Initialise the variable, obviously
|
2019-12-13 19:04:36 -03:00 |
|
Jaime Passos
|
ea52225869
|
Remove SPANDRAWFUNC_MMX, as it's not needed anymore.
|
2019-12-13 19:02:36 -03:00 |
|
Steel Titanium
|
e3dbbfe34a
|
Rework G_SetCustomExitVars to allow skipstats 2
|
2019-12-13 16:36:33 -05:00 |
|
Jaime Passos
|
b47cc01f50
|
Separate non-powers-of-two draw routines into its own file
|
2019-12-13 13:11:56 -03:00 |
|
Jaime Passos
|
9a5876f9d3
|
stuff
|
2019-12-13 12:26:47 -03:00 |
|
James R
|
e04f775547
|
Merge branch 'tatsuru-amyhugfix' into 'next'
Make Amy only hug players at the same Z height
See merge request STJr/SRB2!521
|
2019-12-13 01:58:32 -05:00 |
|
James R
|
1e1597cafd
|
Merge branch 'dashmode-shader' into 'master'
Add TC_DASHMODE color shader
See merge request STJr/SRB2!526
|
2019-12-13 01:58:18 -05:00 |
|
James R
|
abe4568d4e
|
Merge branch 'toomanyflats-fix' into 'master'
Fix Ploadflat closing the game with "Too many flats in level" error message
See merge request STJr/SRB2!529
|
2019-12-13 01:57:55 -05:00 |
|
Jaime Passos
|
efba75ae01
|
Update v_video.c
|
2019-12-12 23:30:09 -03:00 |
|
Jaime Passos
|
00521d865a
|
FINALLY, COLORCUBIUM
|
2019-12-12 23:18:39 -03:00 |
|
Jaime Passos
|
748f08ef3c
|
HWR_AllowModel
|
2019-12-12 22:53:19 -03:00 |
|
Jaime Passos
|
aa10c6c733
|
Initialise the variable, obviously
|
2019-12-12 22:32:19 -03:00 |
|
Jaime Passos
|
27873ff7bc
|
Merge remote-tracking branch 'origin/dashmode-shader' into opengl-is-a-bad-renderer
|
2019-12-12 22:31:34 -03:00 |
|
Jaime Passos
|
7a753b701f
|
Fix TC_ blending
|
2019-12-12 22:26:28 -03:00 |
|
Jaime Passos
|
3f0cc9a211
|
Update hw_main.c
|
2019-12-12 21:52:59 -03:00 |
|
Jaime Passos
|
749dc9b37b
|
Add missing prototype, ugh
|
2019-12-12 21:43:19 -03:00 |
|
Jaime Passos
|
9e55402932
|
grafik designe is m passion
|
2019-12-12 21:41:13 -03:00 |
|
Jaime Passos
|
1bf3c14c16
|
PU_HWRCACHE_UNLOCKED bmomento bróder
|
2019-12-12 21:23:55 -03:00 |
|
Jaime Passos
|
9560d43063
|
Texture blending port
Co-authored-by: TehRealSalt <tehrealsalt@gmail.com>
|
2019-12-12 21:22:36 -03:00 |
|
Jaime Passos
|
529e5fdc52
|
Stop crashing with models because someone keeps freeing those tags
|
2019-12-12 19:54:47 -03:00 |
|