Zachary McAlpin
|
652e53c629
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
|
2019-12-19 17:20:31 -06:00 |
|
Zachary McAlpin
|
c1465c5acc
|
Fix CalculateCamera compiling error
|
2019-12-19 17:17:17 -06:00 |
|
Zachary McAlpin
|
9f82cdb401
|
Added CalculateCamera Hook
|
2019-12-19 16:41:25 -06:00 |
|
Zachary McAlpin
|
e82b317451
|
Revert "Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition"
This reverts commit 3fc1069082.
|
2019-12-19 15:07:34 -06:00 |
|
Zachary McAlpin
|
c1815bfe11
|
Revert "Don't execute LUAh_PlayerThink(player) for respawning bots"
This reverts commit fc70164f93.
|
2019-12-19 15:07:28 -06:00 |
|
James R
|
4029167a57
|
Merge branch 'fix-divby0-spindash-crash' into 'next'
Fix a divide by zero crash when mindash and maxdash were the same.
See merge request STJr/SRB2!539
|
2019-12-17 20:42:56 -05:00 |
|
Zachary McAlpin
|
3fc1069082
|
Don't run the LUAh_PlayerThink function if the time ran out in Race or Competition
|
2019-12-17 19:20:46 -06:00 |
|
Zachary McAlpin
|
fc70164f93
|
Don't execute LUAh_PlayerThink(player) for respawning bots
|
2019-12-17 18:41:26 -06:00 |
|
Zachary McAlpin
|
01f11cdca6
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
|
2019-12-17 18:21:17 -06:00 |
|
James R
|
e009d62dc3
|
Merge branch 'hud-toggling' into 'next'
Let Lua toggle Team Match/CTF team scores HUD element
See merge request STJr/SRB2!544
|
2019-12-17 16:17:01 -05:00 |
|
James R
|
184d04e6d5
|
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
|
4da57653eb
|
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
|
4f33476fc0
|
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
|
0e371774c8
|
Fix crash on mapload when removing Dragonbomber with Lua
|
2019-12-16 21:25:41 -05:00 |
|
James R
|
c0b9671c5b
|
Merge branch 'lua-maincfg-vars' into 'next'
Lua MainCfg vars
See merge request STJr/SRB2!543
|
2019-12-16 17:54:01 -05:00 |
|
Tatsuru
|
0ab31b3de0
|
Let Lua toggle Match/CTF team scores HUD element
|
2019-12-16 17:58:00 -03:00 |
|
Monster Iestyn
|
46f431616c
|
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
|
f028bb0219
|
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
|
130794cc4d
|
Merge branch 'master' into next
|
2019-12-16 15:41:47 +00:00 |
|
James R
|
53c7df4818
|
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
|
adc87640d9
|
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
|
00e2c420f6
|
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
|
230006553d
|
Set mapthing z in OP_CreateNewMapThing
|
2019-12-15 21:43:50 +01:00 |
|
Monster Iestyn
|
eb179e4d6a
|
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 |
|
GoldenTails
|
23b3f5a649
|
Fix a divide by zero crash when mindash and maxdash were the same.
Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.
|
2019-12-15 04:09:56 -06:00 |
|
MascaraSnake
|
8a6e244e60
|
SpawnEmeraldHunt() -> P_SpawnEmeraldHunt()
|
2019-12-15 09:49:54 +01:00 |
|
Eidolon
|
d63ad82dc5
|
[cmake] Remove srb2dd target
|
2019-12-15 00:47:58 -06:00 |
|
Eidolon
|
11f5911943
|
[cmake] Use same executable names as Makefile
|
2019-12-15 00:39:04 -06:00 |
|
Zachary McAlpin
|
fce6ea0384
|
Fixed mistake with #endif placement
|
2019-12-14 19:32:49 -06:00 |
|
Zachary McAlpin
|
ee9e72f48b
|
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into new-lua-features
|
2019-12-14 17:59:21 -06:00 |
|
James R
|
1123b5debd
|
Merge remote-tracking branch 'origin/master' into next
|
2019-12-14 15:28:25 -08:00 |
|
MascaraSnake
|
bcfd9fe504
|
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
|
4daf9666a2
|
Merge branch 'ripple2' into 'master'
Tilted ripple
See merge request STJr/SRB2!524
|
2019-12-14 17:52:54 -05:00 |
|
Jaime Passos
|
4d87bcca13
|
Move position of R_PlaneRipple in the file so this looks more organised
|
2019-12-14 19:50:40 -03:00 |
|
Jaime Passos
|
871ebef332
|
Merge remote-tracking branch 'origin/master' into ripple2
|
2019-12-14 19:36:54 -03:00 |
|
James R
|
14674223e8
|
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
|
b121bc2b3b
|
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
|
64eb89fc56
|
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
|
e5714db75c
|
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
|
65a17a8f09
|
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
|
b3d678a252
|
Merge branch 'master' into next
|
2019-12-14 16:44:56 -05:00 |
|
James R
|
c1d54007e4
|
Fix C90 error from NOHW
|
2019-12-14 13:30:10 -08:00 |
|
Zachary McAlpin
|
87b816e408
|
Added PlayerThink hook
|
2019-12-14 15:28:24 -06:00 |
|
James R
|
2a22adaa60
|
Oops C90
|
2019-12-14 12:55:11 -08:00 |
|
Jaime Passos
|
4c13190b48
|
Merge remote-tracking branch 'origin/master' into software-drawers-refactor
|
2019-12-13 19:22:47 -03:00 |
|
Jaime Passos
|
7f092b884b
|
Initialise the variable, obviously
|
2019-12-13 19:04:36 -03:00 |
|
Jaime Passos
|
a27a225a81
|
Remove SPANDRAWFUNC_MMX, as it's not needed anymore.
|
2019-12-13 19:02:36 -03:00 |
|
Steel Titanium
|
ad776e560c
|
Rework G_SetCustomExitVars to allow skipstats 2
|
2019-12-13 16:36:33 -05:00 |
|
Jaime Passos
|
6720279969
|
Separate non-powers-of-two draw routines into its own file
|
2019-12-13 13:11:56 -03:00 |
|
Jaime Passos
|
fa58c1fb26
|
stuff
|
2019-12-13 12:26:47 -03:00 |
|