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
Jaime Passos
79daafd893
Fix missing "-" prefix on "-software" cmdline parm
2019-12-17 18:04:05 -03:00
Jaime Passos
53885e5ac0
Free PU_HWRMODELTEXTURE tag
2019-12-17 16:28:32 -03:00
Jaime Passos
e359f802fd
Update comments
2019-12-17 16:14:26 -03:00
Jaime Passos
cc54163210
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-17 16:12:44 -03:00
Jaime Passos
a0971d0756
Put loadgame patch loading back in M_ReadSaveStrings
2019-12-17 15:56:56 -03:00
Jaime Passos
c3f0e6aa44
Avoid recreating the color LUT mid-recording-frame
2019-12-17 15:37:43 -03:00
Jaime Passos
0af71fafc5
Don't use the local palette, because OpenGL mixes it into the textures themselves
2019-12-17 15:20:22 -03:00
Jaime Passos
3d08664de4
Merge remote-tracking branch 'sonicteamjuniorheadquarters/master' into gl_gifs
2019-12-17 15:14:22 -03:00
Jaime Passos
141d0376a5
Merge remote-tracking branch 'origin/master' into flats-in-walls
2019-12-17 15:05:16 -03:00
Jaime Passos
e3ab21c85f
opengl
2019-12-17 13:48:48 -03:00
Jaime Passos
aff5b52eba
change ROTANGLES to 72
2019-12-17 13:39:26 -03:00
Jaime Passos
8422c88063
optimise R_CacheRotSprite
2019-12-17 13:25:55 -03:00
Jaime Passos
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -03:00
Jaime Passos
6a5ea548e6
make ROTANGLES be 360
2019-12-17 13:00:50 -03:00
Jaime Passos
7e55dd31f5
fix menu spacing
2019-12-17 12:53:26 -03:00
Jaime Passos
369563ad92
allow models to change colors more than once.
2019-12-17 12:50:41 -03: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
MascaraSnake
79350992df
Some more cleanup of map loading code
2019-12-16 00:17:20 +01:00
MascaraSnake
bb3440d021
Minor cleanup of virtual resources code
2019-12-16 00:04:48 +01: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
fickleheart
1f88c70d6a
Fix RVZ autocam AGAIN
2019-12-15 13:33:21 -06:00
Sryder
a093c76cfb
Merge branch 'master' of git@git.magicalgirl.moe:STJr/SRB2.git into better-deadzone
2019-12-15 15:47:45 +00: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
Sryder
76d59330f7
Port the deadzone cvar stuff from kart.
...
Add menu items for deadzone.
2019-12-15 15:36:13 +00:00
Sryder
b17bf5d836
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
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
fickleheart
a885380e8a
Add analog deadzone option separate from digital deadzones
2019-12-14 19:41:54 -06:00
Zachary McAlpin
fce6ea0384
Fixed mistake with #endif placement
2019-12-14 19:32:49 -06:00
fickleheart
3db7e48c73
[POTENTIALLY RISKY] Show target arrow above lock-on target
...
My judgement on "is this netgame-safe" is "Gunslinger's
targeting spawns this only for the local player, so maybe".
2019-12-14 19:21:11 -06:00
fickleheart
7fd2153c08
Realign camera options menu options
2019-12-14 19:20:19 -06:00
fickleheart
0702e366b6
Allow setting center view to a toggle
2019-12-14 19:17:41 -06:00
fickleheart
a812ddd88e
Fix turn-to-input jerk when braking sideways
2019-12-14 19:04:29 -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
