Jaime Passos
c75d0efce9
Make NUMGAMETYPEFREESLOTS lower because netcode
2019-12-18 12:36:54 -03:00
Jaime Passos
b6b98cd464
Rankings tweaks
2019-12-18 12:36:02 -03:00
Jaime Passos
30be9e29e5
NUMGAMETYPES vs gametypecount
2019-12-18 12:30:01 -03:00
Jaime Passos
164c1b15e7
Spectator HUD tweaks
2019-12-18 12:28:01 -03:00
Jaime Passos
c11865e7e9
G_NewGametype
2019-12-18 12:23:42 -03:00
Jaime Passos
ecf9bdda4e
There are only so many bits
2019-12-18 12:14:18 -03:00
Jaime Passos
31f3299bc2
GTR_DEATHPENALTY
2019-12-18 12:13:24 -03:00
Jaime Passos
29d316fd74
GTR_PITYSHIELD
2019-12-18 12:09:44 -03:00
Jaime Passos
48852f5140
sike
2019-12-18 11:47:26 -03:00
Jaime Passos
789e881abc
GTR_TEAMFLAGS
2019-12-18 11:43:50 -03:00
Jaime Passos
45d67e8ae9
Update comments
2019-12-18 11:33:56 -03:00
Jaime Passos
448494e19b
More gametype rules yay!!
2019-12-18 01:54:45 -03:00
James R
bd3b96f5cb
bleh
2019-12-17 20:54:44 -08:00
Jaime Passos
d7cb14d38e
Gametype rules draft, mind the debug command
2019-12-18 01:25:57 -03:00
Jaime Passos
d0f86284ce
Freeslot moment!
2019-12-18 00:52:50 -03:00
Jaime Passos
607d066c01
More customisable title card
...
Add TitleCardZigZag, TitleCardZigZagText and TitleCardActDiamond fields to SOC.
Add the same fields to Lua under their internal names.
Turn map header level flags into an UINT16, so that NoTitleCard works. (NOBODY caught this, I'm actually disappointed.)
2019-12-18 00:28:58 -03:00
James R
ebcd9923b1
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
James R
132dd278ca
Fix "SRB2" SOC directive, though its usefulness is debatable
2019-12-17 14:11:45 -08:00
James R
230cb95335
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
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
Jaime Passos
a02ddd65f7
Avoid recreating the color LUT mid-recording-frame
2019-12-17 15:37:43 -03:00
Jaime Passos
e9c1898877
Don't use the local palette, because OpenGL mixes it into the textures themselves
2019-12-17 15:20:22 -03:00
Jaime Passos
db7242c240
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-17 15:14:22 -03:00
Jaime Passos
da81238610
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-17 15:05:16 -03:00
Jaime Passos
a91077278b
opengl
2019-12-17 13:48:48 -03:00
Jaime Passos
9916c88baa
change ROTANGLES to 72
2019-12-17 13:39:26 -03:00
Jaime Passos
44ae8fdb6a
optimise R_CacheRotSprite
2019-12-17 13:25:55 -03:00
Jaime Passos
be227cc58c
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
Jaime Passos
889bbdf96d
make ROTANGLES be 360
2019-12-17 13:00:50 -03:00
Jaime Passos
21ab966bee
fix menu spacing
2019-12-17 12:53:26 -03:00
Jaime Passos
c63c8041ab
allow models to change colors more than once.
2019-12-17 12:50:41 -03: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
Tatsuru
06f02e81dd
Let Lua toggle Match/CTF team scores HUD element
2019-12-16 17:58:00 -03: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
MascaraSnake
a144523a42
Some more cleanup of map loading code
2019-12-16 00:17:20 +01:00
MascaraSnake
3c9354991e
Minor cleanup of virtual resources code
2019-12-16 00:04:48 +01: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
Sryder
16489b7514
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone
2019-12-15 15:47:45 +00: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
Sryder
b4e8f71acb
Port the deadzone cvar stuff from kart.
...
Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
Sryder
a026bfd24c
Use Scaled Radial Deadzones, instead of Axial deadzones.
...
Additionally fixes some weird padscale 0 stuff that was flipped.
This does have gameplay implications in both NiGHTS and regular gameplay. Notably you won't feel like you're locked into up/down left/right when you want to turn, but this can make running perfectly straight a little bit more tricky.
2019-12-15 14:37:30 +00:00
GoldenTails
f223446e2e
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
