James R
fc8c0f8a9a
Merge remote-tracking branch 'origin/master' into next
2019-12-30 13:16:53 -08:00
Jaime Passos
7676f11112
Merge remote-tracking branch 'origin/next' into respawndelaygametyperule
2019-12-30 12:09:45 -03:00
James R
802ef0aba1
COM_LOCAL makes your commands NetXCmd free, FUCK NetXCmd
2019-12-29 21:07:28 -08:00
James R
dc757f3086
Fuck magic numbers; COM_ flags for Lua commands!
2019-12-29 21:00:38 -08:00
James R
0237dc8ca2
Add MFE_TOUCHLAVA and MFE_TRACERANGLE to Lua and SOC
2019-12-28 17:52:22 -08:00
Jaime Passos
2166571920
Add GTR_CUTSCENES. And I ran out of rule slots. Cool.
2019-12-28 20:33:28 -03:00
Jaime Passos
ae0acfba0f
Organise gametype ruleset again.
2019-12-28 20:18:21 -03:00
Jaime Passos
7a00b3a331
Add GTR_FRIENDLY.
2019-12-28 19:56:18 -03:00
Jaime Passos
45af6d8899
Rename GTR_MATCHEMERALDS to GTR_POWERSTONES.
2019-12-28 19:49:34 -03:00
Jaime Passos
4b604328d5
Rename GTR_HIDETIME to GTR_STARTCOUNTDOWN.
2019-12-28 19:47:03 -03:00
Jaime Passos
51404130af
Respawn delay gametype rule
2019-12-27 01:44:27 -03:00
James R
cb29a9dd0a
CV_NOLUA for when a cvar should not be changed via Lua
2019-12-26 18:15:19 -08:00
Jaime Passos
c0390f5186
Merge remote-tracking branch 'origin/next' into rotsprite2
2019-12-26 20:27:29 -03:00
Jaime Passos
3622829504
Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery
2019-12-24 17:55:46 -03:00
James R
02779cb6ef
Merge remote-tracking branch 'origin/master' into next
2019-12-24 11:53:49 -08:00
James R
0780e48f86
Merge branch 'titlecard2' into 'next'
...
More customisable title card
See merge request STJr/SRB2!552
2019-12-24 14:47:55 -05:00
Jaime Passos
c61c1e2514
Turn the babysitting deterrent into its own rule.
2019-12-24 16:30:18 -03:00
Jaime Passos
b740daf5bf
GTR_HURTMESSAGES
2019-12-24 16:09:00 -03:00
Jaime Passos
40b0c853b7
Add IDENTIFIER to gametype DeHackEd.
2019-12-23 23:19:48 -03:00
Jaime Passos
630c06b7b0
Turn GTR_CHASECAM into GTR_FIRSTPERSON.
2019-12-23 19:24:06 -03:00
Jaime Passos
5ebd84c3e7
Move ALL the Lua global variable stuff into lua_script.c.
2019-12-23 18:49:23 -03:00
Jaime Passos
7425591815
Add pointlimit and timelimit to Lua.
2019-12-23 18:37:38 -03:00
Jaime Passos
6d7bdf8fdb
Lua gametyperules
2019-12-19 18:27:11 -03:00
Jaime Passos
9b2b526eb4
Removing commented out code
2019-12-19 16:22:55 -03:00
Steel Titanium
a39b6a1286
Allow access to bluescore and redscore
2019-12-19 16:17:08 -03:00
Jaime Passos
7efd9662d1
Remove GTR_NOGAMEEND
2019-12-19 16:13:27 -03:00
Jaime Passos
f4bb618f93
Organise rules
2019-12-19 16:12:10 -03:00
Jaime Passos
6d7262e985
Remove GTR_PLATFORM
2019-12-19 16:05:03 -03:00
Jaime Passos
768080977f
Remove GTR_ROUNDENDMESSAGE
2019-12-19 15:47:37 -03:00
Jaime Passos
ce0e4201b8
GTR_DEATHMATCHSTARTS
2019-12-19 02:26:17 -03:00
Jaime Passos
0accadf02f
Merge remote-tracking branch 'origin/next' into gametype-clownery
2019-12-19 02:15:45 -03:00
Jaime Passos
fb6f2fc9b0
Lua! Lua! Lua!
...
Expecting the buildbot to complain
2019-12-19 02:13:09 -03:00
Jaime Passos
b496cc0d62
Whoops
2019-12-18 23:02:07 -03:00
Jaime Passos
5daedc70e7
Special Stages/token stuff
2019-12-18 22:46:17 -03:00
Jaime Passos
5e818e1dab
Custom gametype rankings
2019-12-18 22:02:37 -03:00
Jaime Passos
d0e18444fb
GTR_FRIENDLYFIRE, renamed GTR_HIDETIMEFROZEN, fixed other mistakes
2019-12-18 20:12:52 -03:00
Jaime Passos
04ee98a1a1
point limit/time limit
2019-12-18 19:43:12 -03:00
Jaime Passos
396106829a
Ringslinger tweaks
2019-12-18 19:26:45 -03:00
Jaime Passos
eadb3dec9e
Limits checking
2019-12-18 18:59:47 -03:00
Jaime Passos
74d69f3731
Fix comment
2019-12-18 18:52:10 -03:00
Jaime Passos
b8d47dbc60
Accept gametype rules in SOC by just their names as parameters.
2019-12-18 18:50:04 -03:00
Jaime Passos
ec8682b2af
GTR_NOTITLECARD
2019-12-18 18:39:59 -03:00
Jaime Passos
61cad09505
Fix lib_getenum. Also, adding gametypes also creates constant names for them.
2019-12-18 18:30:24 -03:00
Jaime Passos
5f73d48614
Some sort of intermission tally support.
2019-12-18 17:13:05 -03:00
Jaime Passos
e3584e8230
GTR_ALLOWEXIT
2019-12-18 16:52:05 -03:00
Jaime Passos
5b0a094f67
TOL stuff
2019-12-18 16:00:02 -03:00
Jaime Passos
94f2b8f970
Fix warnings
2019-12-18 15:41:03 -03:00
Jaime Passos
d3d91726f5
GTR_EMERALDHUNT and GTR_SPAWNENEMIES
2019-12-18 14:57:42 -03:00
Jaime Passos
0577cec01b
GTR_NOSPECTATORSPAWN
2019-12-18 14:47:39 -03:00
Jaime Passos
1e2331d672
SOC stuff
2019-12-18 14:37:48 -03:00
Jaime Passos
79d5192b7c
TOL/Level platter stuff
2019-12-18 13:24:10 -03:00
Jaime Passos
b759ebf622
Death of TOL_CUSTOM
2019-12-18 12:40:46 -03:00
Jaime Passos
254d812901
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
d1b944121a
Fix "SRB2" SOC directive, though its usefulness is debatable
2019-12-17 14:11:45 -08:00
Jaime Passos
c6f36fc470
un-ROTSPRITE rollangle and spriteinfo
2019-12-17 13:09:25 -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
James R
55f3f27b55
Fix NOHW warnings
2019-12-12 14:00:13 -08:00
Steel Titanium
d415cd5c6d
Update copyright date on source files
2019-12-06 13:49:42 -05:00
toaster
7f6c98f046
Fix clearing maps making the Tutorial option on the SP menu crash.
2019-12-05 13:42:08 +00:00
MascaraSnake
8adcea56c3
Merge branch 'minusflip' into 'master'
...
Have Minus rotate in mid-air
Closes #326
See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
toaster
f602e5bfb7
"showconditionset" option for Unlockables and Extra Emblems. See merge request (coming shortly) for full description/prompt.
2019-11-24 14:35:31 +00:00
lachwright
9a7979d841
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
toaster
508feaad9d
Enable lowercase text for Statistics and Unlockable Checklist menus ( resolves #339 ).
2019-11-24 13:51:53 +00:00
MascaraSnake
a24949cfa6
Merge branch 'menu-reordering' into 'master'
...
Menu reordering (also renaming secrets to extras)
See merge request STJr/SRB2Internal!511
2019-11-23 17:51:46 -05:00
MascaraSnake
2c85aa9f69
Merge branch 'drtminus' into 'master'
...
drt minus
See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
sphere
9608021824
Rename "secrets" to "extras".
2019-11-21 01:34:32 +01:00
lachwright
ac3924c9c8
Add GFZ debris; reorganize wood debris index
2019-11-21 01:05:22 +08:00
MascaraSnake
2418e33a00
Merge branch 'cobalt-ai' into 'master'
...
CobaltBW's Tails AI
See merge request STJr/SRB2Internal!358
2019-11-18 17:26:28 -05:00
MascaraSnake
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
toaster
ab70512253
As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite.
2019-11-18 22:05:05 +00:00
toaster
1fdcc270d8
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai
...
# Conflicts:
# src/p_map.c
2019-11-18 21:33:51 +00:00
MascaraSnake
8adc5bd876
Merge branch 'titlecards' into 'master'
...
Titlecards
See merge request STJr/SRB2Internal!492
2019-11-18 16:22:32 -05:00
MascaraSnake
1365ef49b3
Merge branch 'jester-fireball' into 'master'
...
Mario fireball by Jester (resolves #296 )
Closes #296
See merge request STJr/SRB2Internal!487
2019-11-18 15:56:33 -05:00
Jaime Passos
aa659836ee
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
MascaraSnake
1210545a8e
Merge branch 'fhzenemytweaks' into 'master'
...
Hardcode DrT's FHZ improvements (resolves #295 ).
Closes #295
See merge request STJr/SRB2Internal!483
2019-11-18 15:21:59 -05:00
MascaraSnake
7a48a8d72d
Merge branch 'poledance' into 'master'
...
Make ACZ3's slapstick signpost taller (resolves #267 ).
Closes #267
See merge request STJr/SRB2Internal!473
2019-11-18 15:14:48 -05:00
MascaraSnake
233ff8bd27
Merge branch 'exit-move-lj' into 'master'
...
Post-exit movement
See merge request STJr/SRB2Internal!486
2019-11-18 15:10:15 -05:00
Jaime Passos
85f1b847e9
LF_WARNINGTITLE
2019-11-18 15:04:40 -03:00
Jaime Passos
6920d20a0f
map header option
2019-11-18 14:08:47 -03:00
lachwright
bb67b24143
Add flight indicator
2019-11-18 15:17:27 +08:00
lachwright
ac7d07c9da
Prevent mines from sliding upon touching the ground
2019-11-18 10:35:56 +08:00
Jaime Passos
64939816fb
Fireball
2019-11-17 21:25:17 -03:00
lachwright
b721c035f8
Add Dragonbomber enemy
2019-11-18 05:23:59 +08:00
toaster
ef5558af97
Hardcode DrT's FHZ improvements. Puttin' the FREEZE in feature freeze amirite haha
2019-11-17 20:34:25 +00:00
Nev3r
5dc494da16
Mapname lowercase support ( #146 )
...
* Moved levelname parsing to before where uppercase conversion occurs.
* Extended titlecard font range.
* Replaced misc. "ZONE" strings with "Zone" for titlecard purposes.
* Don't convert to uppercase when rendering the titlecard name.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-11-16 20:36:25 -05:00
Louis-Antoine
29501a992b
Merge branch 'master' into exit-move-lj
2019-11-15 19:35:47 +01:00
toaster
892f6eca27
Make ACZ3's slapstick signpost taller ( resolves #267 ).
2019-11-15 14:52:34 +00:00
Louis-Antoine
ff62a0732a
Let players move after completing the level
...
This only takes effect in co-op,
and can be disabled with "exitmove off"
2019-11-15 15:35:28 +01:00
MascaraSnake
6c6d89ca57
Merge branch 'flickies_not_in_walls' into 'master'
...
Flickies not in walls
See merge request STJr/SRB2Internal!461
2019-11-14 18:07:19 -05:00
MascaraSnake
8f6890025c
Merge branch 'secretstuff' into 'master'
...
The letter
See merge request STJr/SRB2Internal!438
2019-11-14 17:49:23 -05:00
toaster
278ddcf770
Merge branch 'rotsprite_i' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into rotsprite_toast
2019-11-14 17:15:34 +00:00
Jaime Passos
8506d420a6
Optimise
2019-11-14 14:12:36 -03:00
toaster
afe28b0a0a
* Remove the 22(!!) NiGHTS sprite2s that no longer get used in ROTSPRITE builds (which should be our main builds going forward).
...
* Rename `SPR2_NGT0` to `SPR2_NFLY`, and `SPR2_DRL0` to `SPR2_NDRL` to account for this. (requires modifying player.dta)
2019-11-14 17:03:02 +00:00
Jaime Passos
10d1b63ff2
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-14 12:49:03 -03:00
Jaime Passos
4292c5fc0b
Other things I missed. Also added SF_NONIGHTSROTATION. Do I even have to keep the old behaviour? I have no idea.
2019-11-14 12:27:22 -03:00
toaster
a3de6d21c4
* Add a "moveforward" param to P_InternalFlickySpawn, which controls whether to spawn the flicky a little in front or behind of the object making it.
...
* Expose this via additional upper-16-bits flags of A_FlickySpawn.
* Use this to make Snailers not spawn their flicky inside the wall they're attached to.
* Make the behaviour of Egg Capsules more consistent mechanically regarding the flicky spawning, using the above as one relevant element.
2019-11-13 20:14:08 +00:00
Jaime Passos
a9183b474b
rename rollaxis to rotaxis
2019-11-13 12:47:30 -03:00
Jaime Passos
b54f6181c3
Rotation axis (will rename internally later)
2019-11-13 12:36:44 -03:00
MascaraSnake
d591554a5d
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
Jaime Passos
245881ec55
Merge remote-tracking branch 'origin/master' into rotsprite_i
2019-11-12 21:38:02 -03:00