stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
7991 commits 172 branches 41 tags 280 MiB
Commit graph

623 commits

Author SHA1 Message Date
mazmazz
c7c72a4892 Merge branch 'master' into new-title 2019-10-25 22:29:29 -04:00
MascaraSnake
03c5b70fc5 Merge branch 'newmenus' into 'master' 
Better looking menus, nametags and much more. (Resolves #245 and #244 and #252)

Closes #245, #244, and #252

See merge request STJr/SRB2Internal!389
 2019-10-25 17:46:16 -04:00
MascaraSnake
4a9eb387f7 Merge branch 'window-focus-music' into 'master' 
Window focus options for playing sounds/music

See merge request STJr/SRB2Internal!407
 2019-10-25 15:37:06 -04:00
MascaraSnake
2a8e5b7bff Merge branch 'james-kart' into 'master' 
My changes to Kart

See merge request STJr/SRB2Internal!406
 2019-10-25 15:36:40 -04:00
MascaraSnake
ff061fb813 Merge branch 'kartport_namedvalues' into 'master' 
Kart-port - Named cvar values + Improved "HELP" command (round 3)

See merge request STJr/SRB2Internal!388
 2019-10-25 15:32:56 -04:00
MascaraSnake
080ff854b8 Merge branch 'be-more-nice-with-levelselect-mp' into 'master' 
Remove level select restrictions in DEVELOP Multiplayer

Closes #238

See merge request STJr/SRB2Internal!399
 2019-10-25 15:26:09 -04:00
James R
48173beb35 Menu options 2019-10-23 17:31:10 -07:00
James R
9162ba87cc Revert sound and music window focus related toggles 
This partially reverts commit 5ac8a26814.
 2019-10-23 15:24:34 -07:00
Steel Titanium
bfce75d5cd
Disable restriction for `DEVELOP` builds only 2019-10-23 16:29:50 -04:00
james
aa9f19512c Use less confusing player sorting key names 2019-10-22 21:41:34 -07:00
James R
5ac8a26814 Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-10-22 21:15:20 -07:00
James R
12540dca32 Make "Focus lost" HUD overlay optional 2019-10-22 20:30:05 -07:00
Steel Titanium
b219be6f5e
Remove level select restrictions in Multiplayer 2019-10-19 21:37:03 -04:00
James R
fc97ccd7d4 Fix item selection not returning to "Specify IPv4 Address" 2019-10-19 13:07:20 -07:00
James R
4a15e2d1d8 Fix "You must specify an IP address" message returning to title instead of MP menu 2019-10-19 13:01:06 -07:00
James R
dfdbc0afe3 Don't fade to character select from secret level select 2019-10-19 12:42:53 -07:00
James R
25d8b7d5ea Don't fade to Server Options 2019-10-19 12:25:02 -07:00
Steel Titanium
3e0a9cf742
Revert my old attempt of making the level music fade out before game over jingle 2019-10-19 14:36:30 -04:00
toaster
bf761a26d6 * Implement fixes/tweaks as written on the gitlab. 
* `SPR2_NTAG` last vestiges removal.
    * Removed need for `getskinfromdescription()` by calculating it once, at Menu load, and storing in `description_t`.
    * Fixed nametag colour issues.
    * Support widescreen with nametags.

* Fix a metric SHITTON of compiler errors.
    * Redefining `x` and `y` within scope of previous `x` and `y` (`M_DrawSetupChoosePlayerMenu`)
    * GCC straight up will not let you cast a `const char*` to a `char` (`V_DrawNameTag`)
    * Redefining `lines` within the scope of the global.
    * Redefining `string` within the function-specific `string`.
    * It would be recommended for y'alls to turn ERRORMODE on!
 2019-10-19 18:15:54 +01:00
Steel Titanium
28607a81b5
Kill off SPR2_NTAG 2019-10-16 18:25:20 -04:00
Steel Titanium
edea290b0f
Show "Press ESC to exit" string on NiGHTS Attack menu too 2019-10-16 18:00:54 -04:00
Steel Titanium
dc0a1899ec
Fix ifselectvalnextmapnobrace indentation 2019-10-16 17:49:21 -04:00
Steel Titanium
38d044e475
Seperate name tag sprite into SPR2_NTAG 2019-10-16 00:22:05 -04:00
Steel Titanium
9c33f160a6
Lots of changes 
* Show emblem requirement on record attack menu
* Use bigger emblems on the menu.
* Display your best number of collected rings in yellow if reached perfect bonus.
* Adjusted XTRA frames (again)
 2019-10-15 22:54:21 -04:00
toaster
8f3e59b43d Improved "HELP" command! 
Ported from Kart, original commit also by me (toaster).
 2019-10-15 13:36:04 +01:00
toaster
aa9bc574da * Fix cv_pointlimit's weird behaviour in match mode by standardising the switching between "named" and "range" values in CV_AddValue. 
* Optimise M_ChangeCvar.
 2019-10-15 12:24:31 +01:00
toaster
910df54fb5 Added some examples of cvars that can use named values. 
* Pandora's box now has infinite lives show up as "Infinite" instead of "-1".
* `pointlimit None`
* `timelimit None`
* Ported `basenumlaps` (with "Map default" value) from Kart to replace `usemaplaps`, for if Circuit ever gets shown any love ever again.
* `respawndelay Off`
* `resynchattempts Don't`
 2019-10-15 11:49:37 +01:00
Steel Titanium
313b534911
More record attack stuff. 
Show emblem requirements.

Committed because I need sleep...
 2019-10-15 01:55:50 -04:00
toaster
2f26cfad01 Prevent wraparound on Level platter when there are less than 3 rows. 
Addresses #251 - I wanted to keep the scrolling because it looks nice and because I don't want to fuck with these drawers too bad.
 2019-10-14 17:17:00 +01:00
Jaime Passos
edd016690d A bunch of stuff 2019-10-14 02:24:44 -03:00
Steel Titanium
9e9a40cadb
Merge branch 'master' into newmenus 2019-10-13 20:12:48 -04:00
MascaraSnake
8af715eb36 Merge branch 'left-right-ra-level-select' into 'master' 
Left and Right Arrow keys also select level in Record Attack

See merge request STJr/SRB2Internal!363
 2019-10-12 09:53:05 -04:00
toaster
a2a5983256 Prevent Time Attack level handler always beeping. 2019-10-12 09:42:03 -04:00
MascaraSnake
68599ccc63 Only apply NiGHTS draw distance to hoops, because it turns out they're pretty much the sole cause of NiGHTS lag 2019-10-11 21:02:11 +02:00
Steel Titanium
4af432e658
Basic outline color support. 
This is a huge hack as it requires another font set, with each character's offset manually being set using SLADE.
 2019-10-10 02:00:52 -04:00
Steel Titanium
18bf8aa6e4
WIP: New character select name font 2019-10-09 00:28:01 -04:00
James R
6fd645ef27 A-arrows on Record Attack level select 
Menu code sucks, did you know?
 2019-10-06 14:45:42 -07:00
James R
0be3743450 Key handler to allow selecting map by arrow keys in Record Attack 
Enter still goes to the platter.
 2019-10-06 14:11:16 -07:00
Jaime Passos
1750ed5383 nights attack 2019-10-02 22:02:13 -03:00
Jaime Passos
a7dcf534ca character select 2019-10-02 21:57:04 -03:00
Jaime Passos
a0e9fbfffe test 2019-10-02 21:28:02 -03:00
Jaime Passos
6a8539c8f1 test 2019-10-02 20:00:43 -03:00
Steel Titanium
625de1f4f6
Some changes. 
Restore the menu headers for record attack and character select menu.
Attempt to optimize the NiGHTS mode menu. (Help getting the scrolling to work in an efficient way would be nice).
 2019-10-01 23:40:59 -04:00
Steel Titanium
6b10ffb88f
Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
toaster
ff8c43664a Merge branch 'addons-menu-cleanup' into 'master' 
Addons menu cleanup

See merge request STJr/SRB2Internal!316
 2019-09-27 08:55:36 -04:00
James R
e69dd9bd75 Automate the silly joystick menu items definition 2019-09-23 20:54:53 -07:00
James R
5cdbde25c1 All for a cvar... 2019-09-23 20:23:40 -07:00
Steel Titanium
6a870b4467
Various of changes 
Changed any instance of "joystick" in strings to "gamepad"
Renamed some cvars
Added a define for MAX_JOYSTICK
Added back the missing command line params.
 2019-09-23 22:46:44 -04:00
Steel Titanium
dfee7efd33
Merge branch 'master' into internal-hotplug-stableid 2019-09-23 00:44:34 -04:00
Alam Ed Arias
8d3d5566b8 Undo file mode change on menu files 2019-09-20 12:18:57 -04:00
toaster
7da89e3bc9 Merge branch 'camerafix' into 'master' 
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
 2019-09-20 11:51:30 -04:00
toaster
880c2cdada Merge branch 'playerfixes' into 'master' 
Some Player fixes and enhancements

Closes #216, #219, #222, and #224

See merge request STJr/SRB2Internal!334
 2019-09-20 11:39:32 -04:00
toaster
20d098de8f Merge branch 'betterdirs' into 'master' 
Better directory structure

See merge request STJr/SRB2Internal!321
 2019-09-20 11:36:56 -04:00
lachwright
5015f8e142 Added Camera Options submenu (provided my files aren't broken again (please D:)) 2019-09-19 17:34:04 +08:00
toaster
45a99ce318 Change startchar's default value to 0 (Resolves #222). 2019-09-18 12:26:34 +01:00
Nev3r
777e7f8760 Merge branch 'deathstuff' into 'master' 
Lots of death stuff

Closes #207

See merge request STJr/SRB2Internal!306
 2019-09-16 16:32:45 -04:00
toaster
71cc09c8c2 Merge branch 'luabanks' into 'master' 
Lua save-banks!

See merge request STJr/SRB2Internal!295
 2019-09-16 07:56:49 -04:00
Jaime Passos
9b0e2b8991 Make nametags compatible with current player.dta 
(again)
 2019-09-11 22:18:03 -03:00
Jaime Passos
f2915817a7 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-11 22:17:42 -03:00
toaster
440b63ef13 Merge branch 'musicplus-resetmusic-followup' into 'master' 
Follow-up fixes for reset-upon-dying music

See merge request STJr/SRB2Internal!284
 2019-09-11 14:14:09 -04:00
toaster
fe7e374e3b Fix the Save Select platter drawing for the new player signpost art. 
This might LOOK like an unrelated change, but it needs a new player.dta, so might as well keep that all localised!
 2019-09-11 13:32:12 +01:00
Jaime Passos
f0788598c9 Better fades 2019-09-09 23:31:48 -03:00
toaster
2b0344a22f Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into deathstuff 2019-09-09 15:25:48 +01:00
Monster Iestyn
c696063260 Merge branch 'mprelated-tweaks' into 'master' 
Various improvements and changes to multiplayer menu

See merge request STJr/SRB2Internal!300
 2019-09-08 16:45:14 -04:00
Steel Titanium
995ab1c84d
Merge branch 'master' into internal-hotplug-stableid 
Just merged in known working code, note that I haven't tested it, so I have no idea if it compiles still.
 2019-09-08 01:55:36 -04:00
Steel Titanium
8ee0a9309b
Better directory structure 2019-09-08 01:29:09 -04:00
Steel Titanium
807614d02d
Add _ to the record and nights attack tracks for organization 2019-09-07 22:57:20 -04:00
mazmazz
b7c9f15225 Fix NiGHTS attack menu not drawing correct background 2019-09-07 22:00:38 -04:00
Jaime Passos
f3cf3ca453 Cleanup. 2019-09-06 16:05:46 -03:00
Jaime Passos
56abc63c29 Ignore key held events. 2019-09-06 15:25:11 -03:00
toaster
5bc034bc3e [slightly off-topic commit] don't allow MP Special Stages to be selectable via the MP level platter 2019-09-04 15:52:25 +01:00
mazmazz
57974168c8 WIP 2.2 title screen (Alacroix) 2019-09-02 22:40:28 -04:00
James
577a8fd387 Merge branch 'camorbit-sev' into camerafix 2019-08-31 14:53:43 -04:00
Steel Titanium
8167a88bec
Rename private mode to unlisted mode 2019-08-30 00:38:58 -04:00
Steel Titanium
5c295d285b
Capitalize the 'if' 2019-08-30 00:36:10 -04:00
Steel Titanium
7e47117afa
Add warning message when attempting to use the master server browser while modifiedgame is true. 2019-08-28 20:24:30 -04:00
Steel Titanium
b4d8126675
Rename offline mode to private mode 2019-08-27 18:05:30 -04:00
Steel Titanium
a98862b3ed
Allow letters to be used on ipv4 address field 2019-08-26 22:00:07 -04:00
Steel Titanium
b2712af2d0
Reorder the main multiplayer menu 2019-08-26 21:49:12 -04:00
Jaime Passos
015216b9ac Don't draw borders or patches if not necessary. 2019-08-26 20:49:04 -03:00
toaster
4e256b73b2 Lua save-banks! 
* Array of 8 INT32's natively embedded into savedata (net and SP)!
* Initialised to zero whenever a new save (or equivalent) is started, otherwise untouched by the base game.
* Requires reservation to avoid clobber-conflicts.
    * Access via `reserveLuabanks()` - returns a read-write userdata.
    * Assign userdata to local variable or global rawset to use later.

Mostly for future SUGOIlikes, but I'm sure someone could figure out an unrelated usage eventually.
 2019-08-24 18:25:27 +01:00
Jaime Passos
f90a6540d6 NiGHTS Attack menu: Let patch offsets control the alignment of the top border. 2019-08-20 21:45:55 -03:00
James R
c6c0a9dd1a Old string drawing functions are dumb 2019-08-20 16:33:39 -07:00
Jaime Passos
1a1f4136e8 Fix character select menu to use the new Color_Opposite array. 2019-08-20 19:08:45 -03:00
Jaime Passos
403eafb003 Merge remote-tracking branch 'origin/master' into newmenus 2019-08-20 19:07:34 -03:00
Steel Titanium
5ef4b938be
Draw record attack foreground even if a message is currently on-screen. 2019-08-20 00:15:35 -04:00
Jaime Passos
12a6479521 Unlock all cached patches, fix accidental merge conflict. 2019-08-20 00:41:06 -03:00
Jaime Passos
d59febb5aa Merge branch 'newmenus' of https://git.magicalgirl.moe/STJr/SRB2Internal into newmenus 2019-08-20 00:21:28 -03:00
Jaime Passos
e4e3af7be0 Remove new character select screen transitions. 
I should not have implemented it in the first place.
 2019-08-20 00:18:34 -03:00
Jaime Passos
61866f326a New Record Attack menu. 2019-08-20 00:12:22 -03:00
Steel Titanium
15b363773f
Fix record attack foreground not appearing. 
I'm not sure why it suddenly broke when the same condition worked before.
 2019-08-19 22:10:52 -04:00
Jaime Passos
e2dde4412d Fix character description text rendering. 2019-08-19 18:49:23 -03:00
Jaime Passos
5290f4c80b Cool defines 2019-08-19 16:19:25 -03:00
Jaime Passos
15957bf13f hghdfhdjhdhkdlfh 2019-08-19 15:34:12 -03:00
Jaime Passos
94e21c7b03 slight cleanup 2019-08-19 15:27:20 -03:00
Jaime Passos
29dc1119e5 uh 2019-08-19 14:43:48 -03:00
Jaime Passos
85499040d3 did The Thing 2019-08-19 14:23:03 -03:00
Jaime Passos
381258883e More character select work 2019-08-18 22:26:52 -03:00
Jaime Passos
f13a014c4c Tweak Record Attack screen just a little bit 2019-08-18 20:35:16 -03:00
Jaime Passos
6a66057a60 how do i code 2019-08-18 19:46:55 -03:00