stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-04 02:02:06 +00:00
Code Issues Projects Releases Packages Wiki Activity
8248 commits 174 branches 41 tags 203 MiB
Commit graph

233 commits

Author SHA1 Message Date
Jaime Passos
69c08f93bb Update d_main.c 2019-12-07 11:55:53 -03:00
MascaraSnake
bf477c6ed4 Merge branch 'master' into nondevelop 2019-12-06 23:23:01 +01:00
MascaraSnake
a3549cc8f2 Merge branch 'datestuff' into 'master' 
Date stuff

See merge request STJr/SRB2Internal!618
 2019-12-06 16:10:36 -05:00
Steel Titanium
d415cd5c6d
Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
9e38af7421 * Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). 
* Update md5s.
* Update modversion.

TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?
 2019-12-06 17:14:51 +00:00
Jaime Passos
c0cc742fb8 Remove unnecessary function parameters from title card code 2019-12-05 01:58:19 -03:00
Jaime Passos
67d0499903 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
MascaraSnake
858df0c704 Merge branch 'charlock' into 'master' 
Charlock (resolves #345).

Closes #345

See merge request STJr/SRB2Internal!528
 2019-11-25 16:44:38 -05:00
Louis-Antoine
a187460865 Revert "Render title map on connecting to server screen too" 
This reverts commit b6e145f0c5.
 2019-11-25 01:09:00 +01:00
toaster
6cc2ca7542 * Resolve #345. 
* Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.
 2019-11-24 13:24:37 +00:00
MascaraSnake
a3a7dc6bed Merge branch 'remove-unused-levelwipes' into 'master' 
(Cleanup) Remove unused levelwipes

See merge request STJr/SRB2Internal!507
 2019-11-22 09:21:17 -05:00
Jaime Passos
248306ccb0 Remove D_ProcessEvents call in G_PreLevelTitleCard 2019-11-21 02:16:09 -03:00
Jaime Passos
1e4060af8c remove unused levelwipes 2019-11-18 19:22:46 -03:00
Jaime Passos
8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
Jaime Passos
4ea3513076 Organize 2019-11-18 12:56:41 -03:00
Jaime Passos
6c98dde736 stuff 2019-11-18 11:39:54 -03:00
James R
6595d20709 Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start 2019-11-15 17:31:53 -08:00
Jaime Passos
c15ee65015 LEVELWIPES 2019-11-15 18:21:12 -03:00
Jaime Passos
76488d835f F_WipeColorFill 2019-11-14 21:31:20 -03:00
Jaime Passos
d95a93b537 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-14 19:57:51 -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
3354169769 Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-12 20:36:06 -03:00
MascaraSnake
66123b8165 Merge branch 'internal-md3-vanilla-c' into 'master' 
Internal MD3 merge 2 good riddance glBegin

See merge request STJr/SRB2Internal!362
 2019-11-12 15:44:20 -05:00
MascaraSnake
bffa281d91 Merge branch 'titlemap-on-connect' into 'master' 
Render title map on connecting to server screen too (closes #166)

Closes #166

See merge request STJr/SRB2Internal!416
 2019-11-12 15:41:07 -05:00
Jaime Passos
6d024b7124 I guess I'll have to do at least SOMETHING about OpenGL 2019-11-05 17:35:16 -03:00
Jaime Passos
ed967f077c Restore the last gameplay frame while on the intermission screen 2019-11-05 17:04:57 -03:00
toaster
5f8671b100 Sound test is cool now! 
https://cdn.discordapp.com/attachments/405336003239477249/641295998395613224/srb20042.gif

* Port MUSICDEFs from Kart.
    * Safe to modify without modifying game, so we can put it in music.dta eventually.
    * "Title", "AltTitle", "Authors" fields are self-evident.
    * "Soundtestpage" and "Soundtestcond" are used to determine which sound test unlockable can play them (set with Unlockable's variable, just like Level Select).
    * "Stoppingtime" and "BPM" both accept floats, and are used for presentation stuff on the sound test.
    * Ironically, we don't share a single field name with them. Such is the case of differing foci, though, and I expect they'll change their implementation to match (since this is necessary for a sound test).
* Change how S_AddSoundFx works to avoid iterating through all of them, and to allow cv_soundtest to only scroll through defined slots (instead of the infinite wall of thok sounds when scrolling to the left).
* Change V_DrawFixedPatch to allow scaling on two seperate axes.
    * Now called "V_DrawStretchyFixedPatch".
    * "V_DrawFixedPatch" is a macro to V_DrawStretchyFixedPatch now (same scale on both axes).
    * Available to Lua under v.drawStretched!
    * Even works in GL!
* Bugfix: Add SR_PLAYER to SOC's menutypes_list.

Stay tuned for the merge request, where I put the onus on the Music Team to finish this off...
 2019-11-05 16:23:46 +00:00
Jaime Passos
00d76bd9ef fix fades for real 2019-11-05 12:10:42 -03:00
toaster
915e50a1e4 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into internal-md3-vanilla-c 
Merge seems fine, but won't compile for some reason.
 2019-11-02 18:34:12 +00:00
Jaime Passos
94ab276508 Merge remote-tracking branch 'origin/master' into f_wipes 2019-10-28 23:14:00 -03:00
James R
b6e145f0c5 Render title map on connecting to server screen too 2019-10-26 12:50:49 -07:00
MascaraSnake
801e83aef6 Merge branch 'use-zones-pk3' into 'master' 
Use zones.pk3 instead of zones.dta.

See merge request STJr/SRB2Internal!352
 2019-10-26 15:33:13 -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
james
39baca89d3 Do not start sound system when disabled 2019-10-22 21:39:37 -07:00
James R
a24814c2fc Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-10-22 20:09:33 -07:00
Jaime Passos
7746767735 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-10-06 17:40:41 -03:00
Steel Titanium
6b10ffb88f
Merge branch 'master' into newmenus 2019-10-01 16:52:31 -04:00
sphere
bea7224ebf Use zones.pk3 instead of zones.dta. 2019-09-29 05:31:50 +02: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
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
db979845e0 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c 2019-09-15 16:24:24 -03:00
Jaime Passos
f2915817a7 Merge remote-tracking branch 'origin/master' into newmenus 2019-09-11 22:17:42 -03:00
Jaime Passos
f0788598c9 Better fades 2019-09-09 23:31:48 -03:00
Alam Ed Arias
9d64ee88a0 Be clear on what FALLTHRU we really want 2019-09-09 15:02:13 -04:00
Steel Titanium
8ee0a9309b
Better directory structure 2019-09-08 01:29:09 -04: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
29dc1119e5 uh 2019-08-19 14:43:48 -03:00
mazmazz
84c9633579 Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-b 2019-08-04 21:33:13 -04:00
toaster
384dc0674e Revert "Revert "Merge branch 'musicplus-aug2019-b' into 'master'"" 
This reverts commit 603d5805f7.
 2019-08-04 12:03:57 +01:00
toaster
603d5805f7 Revert "Merge branch 'musicplus-aug2019-b' into 'master'" 
This reverts commit 56bfdb7113, reversing
changes made to c29cfbef9b.
 2019-08-04 11:32:55 +01:00