stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-30 08:00:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
8142 commits 173 branches 41 tags 186 MiB
Commit graph

247 commits

Author SHA1 Message Date
toasterbabe
65a202e843 ACTUALLY let's do this better 2017-05-14 19:25:46 +01:00
toasterbabe
b13a9ad9d1 Support for negative scroll speeds on title screen 2017-05-14 19:20:00 +01:00
toasterbabe
ba4275c415 title screen hud hook 2017-05-13 22:38:06 +01:00
toasterbabe
7f83e0d134 * Prevent crash if you go to a map and it doesn't exist. 
* Handle music fix in smarter way.
* Enums!
 2017-05-09 11:09:58 +01:00
toasterbabe
3a4e091ba6 * Fix titlemap music change bug reported by Larztard 
* Clean up titlemapinaction so that it isn't true when you're playing
* Don't print "SPEEDING OFF TO [ZONE] [ACT 1]..." on screen if it's a titlemap - keep a nice and pretty black screen
 2017-05-09 00:48:07 +01:00
toasterbabe
dd57e47574 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into titlemap 
# Conflicts:
#	src/r_main.c
 2017-05-08 23:58:44 +01:00
toasterbabe
f87c7f428d Compiling fixes 2017-05-08 23:51:12 +01:00
yellowtd
fd97fdd683 titlemap - cameraref subsector 
apparently it recalculates without this line, so it should give a tiny performance boost?
 2017-04-20 20:26:32 -04:00
yellowtd
cf454dd6fc titlemap - Fix impending doom (???) camera mobj search 
the last implimentation would have apparently stopped working eventually? Idk
 2017-04-20 20:26:13 -04:00
yellowtd
f70b89b22a titlemap - support for map camera object 
allows a camera thing to be placed for alternate camera placement besides player and DM starts
 2017-04-20 20:25:53 -04:00
yellowtd
b68d1ebdb3 titlemap - fix game crash with skybox point 
game crash on skybox object use fix
 2017-04-18 17:47:20 -04:00
toasterbabe
eea7dc4224 Fixed titlemap wipe lasting too long/happening twice over 2017-04-18 17:46:26 -04:00
yellowtd
217f7ebd38 miru asked me for help and im a smelly toast 
* Fix Crashes With Respect To Switching Between The Normal Title And Her Magic One
* Clean Up A Bit Of Code
 2017-04-18 17:45:43 -04:00
yellowtd
1c93b07c86 Titlemap - Maincfg variables, unplayability crash fixes 2017-04-18 17:36:54 -04:00
yellowtd
7e43272932 begin titlemap 
idk my bff jill
 2017-04-18 17:23:23 -04:00
Monster Iestyn
6f2f244aef Remove "playerdeadview" variable; it's not been used for its stated purpose for who knows how long now 
Besides rankings popping up when you die just sounds weird anyway, maybe I'm just used to SRB2 not doing it I guess
 2017-02-22 21:07:29 +00:00
Monster Iestyn
1935a2ffa6 Merge branch 'public_next' 
# Conflicts:
#	src/d_clisrv.c
#	src/doomdef.h
#	src/p_map.c
 2017-01-19 16:54:47 +00:00
Monster Iestyn
4ac709141a Added LJSonic to credits, altered how my own name + nick is shown in credits 2017-01-15 19:23:25 +00:00
Inuyasha
fa187c5ae7 Merge branch 'unslot-music' into 'master' 
Hardcoded music name switches

Like I said earlier, it's better if all the hardcoded music switches in 2.2 start with an underscore so that it's harder to accidentally overwrite them.

Should be accepted when music.dta is updated.

See merge request !17
 2016-10-23 06:46:33 -04:00
Monster Iestyn
31b9e762e1 Merge branch 'public_next' 
# Conflicts:
#	src/p_mobj.c
 2016-09-05 21:28:43 +01:00
Monster Iestyn
ab3f677e66 F_EndCutScene now sets cutsceneover to true BEFORE running Y_EndGame and the like, not AFTER 2016-08-25 17:58:54 +01:00
toasterbabe
71f5d4ea85 ...completely misunderstood the reasons we weren't merging toast_slopes, mom holy fuck i'm stupid and bad 
Enjoy your slopes without physics, people :D
 2016-06-20 00:20:20 +01:00
toasterbabe
9e87f6d85d i did so much in this branch, so UPGRADE ME TO PROGRAMMER 
note: once this is merged into internal, you should probably remove me from "programming assistance" so i'm not duplicated for no clear reason. unless you want me to slowly take over every section in the credits >:3c
 2016-06-10 22:45:42 +01:00
Alam Ed Arias
032313260a Merge branch 'public_next' into master 2016-05-20 17:58:57 -04:00
Inuyasha
f07585191b copyright dates/statements updated and such 
(no actual SLOC changes)
 2016-05-17 17:42:11 -07:00
toasterbabe
a0766fa1ec One line through selfish methods. Probably works in both Next and Internal. 2016-05-05 20:11:11 -05:00
Wolfy
0549ac270b Merge branch 'toast_credits' into 'next' 
One more name in the credits

I probably messed up by making toast_credits based on master instead of next. If that's blocking, just delete this branch and I'll re-do it. It's a single line, though - shouldn't exactly matter so much.

Could probably stand to be merged into Internal as well, since I hadn't actually worked on any textures when we'd updated the credits there.

See merge request !69
 2016-05-04 16:25:16 -04:00
toasterbabe
a4a5ac161f One line through selfish methods. Probably works in both Next and Internal. 2016-05-04 20:14:24 +01:00
Inuyasha
e0f5312d13 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal into unslot-music 
# Conflicts:
#	src/dehacked.c
#	src/f_finale.c
#	src/lua_baselib.c
#	src/lua_maplib.c
#	src/m_menu.c
#	src/p_enemy.c
#	src/p_inter.c
#	src/p_setup.c
#	src/p_user.c
#	src/s_sound.c
#	src/y_inter.c
 2016-03-03 22:09:24 -08:00
Inuyasha
c956b498c8 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 
# Conflicts:
#	src/p_user.c
 2016-03-03 21:48:32 -08:00
Inuyasha
a8bca89dbd Merge branch 'backport_unslot-music' into 'next' 
BACKPORT: removal of music slots

Relevant commits cherry-picked. Basically everything except the internal music track name switches.

See merge request !43
 2016-03-03 22:31:21 -05:00
wolfy852
b96de77050 Fix sorting on toaster's name 2016-03-03 20:54:19 -06:00
Inuyasha
e2b3adc04f Randy Heit -> Randi Heit 2016-02-28 18:21:37 -08:00
wolfy852
c3166e40b0 Update names in credits 
Same as the commit in internal, minus toaster's name (by request, of course.)
 2016-02-27 14:27:14 -06:00
wolfy852
753ee4e42a Update names in credits 
Add me and toaster's names, change Shane's by request, and fix Randi Heit's name
 2016-02-27 14:13:49 -06:00
Alam Ed Arias
2b12e5ff20 Merge branch 'next' into backport_unslot-music 2016-02-26 02:11:29 -05:00
Alam Ed Arias
6000b5c980 Merge branch 'master' into next 2016-02-09 14:13:50 -05:00
Inuyasha
8c17dac589 The concept of "music slots" doesn't exist anymore. 
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.

(cherry picked from commit 025ca413a2)

# Conflicts:
#	src/p_user.c
 2016-02-09 02:48:33 -08:00
Alam Ed Arias
68054a49e3 clang: cleanup 2016-02-05 22:32:14 -05:00
Inuyasha
577afbc693 All internal music changes use new lump names 
... that all start with _ for reasons specified in the music topic
 2016-02-04 01:17:27 -08:00
Inuyasha
025ca413a2 The concept of "music slots" doesn't exist anymore. 
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
 2016-01-07 19:48:20 -08:00
RedEnchilada
d5884a6957 Add Chee to credits 
(she helped port important drawing code!)
 2015-08-21 18:23:37 -05:00
Alam Ed Arias
404b5f666c SRB2 2.1.12 release 2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235 SRB2 2.1.9 release 2014-08-03 23:49:33 -04:00
Alam Ed Arias
02a3b0776c SRB2 2.1.7 release 2014-04-14 01:14:58 -04:00
Alam Ed Arias
32de698f5e SRB2 2.1.6 release 2014-03-24 22:17:59 -04:00
Alam Ed Arias
b93cb1b65a SRB2 2.1 release 2014-03-15 13:11:35 -04:00