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
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
