James R
6f2324d8df
Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place
2019-12-12 21:30:35 -08:00
Steel Titanium
411754451c
Move S_InitMusicDefs call outside of the check.
...
As far as I know, this is competely safe.
2019-12-12 16:32:40 -05:00
Jaime Passos
b093a38ecd
Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!!
2019-12-12 17:30:19 -03:00
Jaime Passos
aa4e3384bb
Merge remote-tracking branch 'origin/master' into wipes2
2019-12-11 12:57:59 -03:00
Jaime Passos
6976b9bf01
Merge remote-tracking branch 'origin/master' into renderswitch
2019-12-10 23:01:10 -03:00
Jaime Passos
44daeb340e
Update d_main.c
2019-12-07 11:55:53 -03:00
MascaraSnake
3ad7f9e445
Merge branch 'master' into nondevelop
2019-12-06 23:23:01 +01:00
MascaraSnake
fffd385151
Merge branch 'datestuff' into 'master'
...
Date stuff
See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
Steel Titanium
a5cdb0a4b3
Update copyright date on source files
2019-12-06 13:49:42 -05:00
toaster
67d8b291bb
* 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
708b4805d1
Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2
2019-12-05 02:03:09 -03:00
Jaime Passos
0fa1525749
Remove unnecessary function parameters from title card code
2019-12-05 01:58:19 -03:00
Jaime Passos
cbe17383e0
Slap colormap fades everywhere
2019-12-04 19:25:39 -03:00
Jaime Passos
9178660d34
Fix stuck closed captioning
2019-11-25 20:16:17 -03:00
MascaraSnake
ab7fe745c6
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
aac5e41f3d
Revert "Render title map on connecting to server screen too"
...
This reverts commit 502c72e975 .
2019-11-25 01:09:00 +01:00
toaster
3f40c7e4a7
* 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
b276366816
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
3a7342e06d
Remove D_ProcessEvents call in G_PreLevelTitleCard
2019-11-21 02:16:09 -03:00
Jaime Passos
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
Jaime Passos
8ad20c1108
Organize
2019-11-18 12:56:41 -03:00
Jaime Passos
f37e0de8c5
stuff
2019-11-18 11:39:54 -03:00
James R
37dc402540
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
bc7686c16a
LEVELWIPES
2019-11-15 18:21:12 -03:00
Jaime Passos
96ce48f4f2
F_WipeColorFill
2019-11-14 21:31:20 -03:00
Jaime Passos
dc7f8bafd5
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-14 19:57:51 -03:00
MascaraSnake
d648a2ad87
Merge branch 'radiomode' into 'master'
...
Radio mode
See merge request STJr/SRB2Internal!443
2019-11-13 04:16:38 -05:00
Jaime Passos
4acdb54d87
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-12 20:36:06 -03:00
Jaime Passos
845b82668b
Merge remote-tracking branch 'origin/master' into renderswitch
2019-11-12 20:25:40 -03:00
MascaraSnake
fae4fb16e9
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
5346d0b9e7
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
135c841056
I guess I'll have to do at least SOMETHING about OpenGL
2019-11-05 17:35:16 -03:00
Jaime Passos
db9a8b4b94
Restore the last gameplay frame while on the intermission screen
2019-11-05 17:04:57 -03:00
toaster
a8169e3844
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
ffc9626355
fix fades for real
2019-11-05 12:10:42 -03:00
toaster
2a16cf539a
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
76a5b60e39
Merge remote-tracking branch 'origin/master' into f_wipes
2019-10-28 23:14:00 -03:00
James R
502c72e975
Render title map on connecting to server screen too
2019-10-26 12:50:49 -07:00
MascaraSnake
04841768e4
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
0073310c39
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
cb5610a86e
Do not start sound system when disabled
2019-10-22 21:39:37 -07:00
James R
35810f9535
Add a "-noaudio" parm to cover "-nomusic" and "-nosound"
2019-10-22 20:09:33 -07:00
James
83c4017993
Another round of small color tweaks
2019-10-21 08:35:17 -04:00
TehRealSalt
c963a49542
Try fixing Auto causing desyncs
...
- Move K_SetPowerLevelScrambles to G_DoCompleted
- Fix wrong gamespeed being displayed in strings
- Add defines for kartspeed values
- Disable Easy scrambles again
- Corrupt gamedata if pwrlv is in invalid range (gets corrected in-game, and doesn't really matter to anyone who knows what you're doing, but it'll stop at least the most basic script kiddie)
Replay menu will still display wrong speed name, but it's fine in the replay itself.
2019-10-17 23:43:06 -04:00
Jaime Passos
09c9714daf
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla-c
2019-10-06 17:40:41 -03:00
TehRealSalt
d10e4aebac
Fix a few messups due to the merged cvars
2019-10-03 11:22:58 -04:00
Sal
eb7f662654
Merge branch 'genesis-wipe' into 'master'
...
Genesis-style wipes
See merge request KartKrew/Kart!164
2019-10-03 01:10:33 -04:00
Steel Titanium
2c7e53f32f
Merge branch 'master' into newmenus
2019-10-01 16:52:31 -04:00
sphere
a225970360
Use zones.pk3 instead of zones.dta.
2019-09-29 05:31:50 +02:00