mazmazz
f600c5fee0
Credits update
2018-12-23 14:41:41 -05:00
mazmazz
33434395f7
Add SRB2 Community Contributors to Special Thanks
2018-12-22 23:41:43 -05:00
mazmazz
90832938c9
Re-order Special Thanks -- groups first, then names in ABC order
2018-12-21 11:40:35 -05:00
mazmazz
f66ee8c4cd
Add sirjuddington and CodeImp to Special Thanks credits
2018-12-20 17:27:25 -05:00
Monster Iestyn
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Wolfy
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
Monster Iestyn
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
Digiku
40dfe89273
Merge branch '21-source-copyright' into 'master'
...
Update source copyrights to 2018
See merge request STJr/SRB2!346
2018-11-25 07:36:41 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Digiku
62443c9090
Merge branch '21-credits-update' into 'master'
...
Extra credits update .21
See merge request STJr/SRB2!345
2018-11-25 07:21:31 -05:00
mazmazz
cf8b4a6cb1
Additional 2.1 credits update
2018-11-23 21:57:07 -05:00
Monster Iestyn
4e616f54ad
Merge branch 'master' into next
2018-11-23 21:01:03 +00:00
Digiku
9a3d2d0ee5
Merge branch '21-credits-update' into 'master'
...
2.1.21 credits update
See merge request STJr/SRB2!339
2018-11-23 07:38:28 -05:00
mazmazz
2f7f472ca2
Update credits for 2.1.21
2018-11-23 07:34:23 -05:00
mazmazz
0d4cd35e13
Make the credits pics darker
2018-11-22 20:08:02 -05:00
Monster Iestyn
fced19d291
Merge branch 'master' into next
2018-11-10 19:05:33 +00:00
Monster Iestyn
0bdbdd1b1e
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
Monster Iestyn
29b242a5bd
Merge branch 'endgame-code-refactor-backport' into 'next'
...
Endgame code refactor
See merge request STJr/SRB2!297
2018-10-19 17:31:19 -04:00
Monster Iestyn
31f3f8b8e7
Moved Y_EndGame from y_inter.c/h to g_game.c/h, renamed it to G_EndGame
2018-10-11 21:24:53 +01:00
Monster Iestyn
9c464742b7
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
2018-10-11 20:00:45 +01:00
colette
0a931a1364
Update f_finale.c
2018-07-07 20:20:46 -04:00
Sryder
0aaae501d3
Warnings must die
2018-03-30 18:53:23 +01:00
Sryder
66f220d6ad
Merge branch 'master' into openglquickfixes
2018-03-30 18:09:41 +01:00
Sryder
527df5c248
Fix OpenGL Title Screen Sky
...
My IDE doesn't seem to like Vada's name.
2018-03-17 15:11:32 +00:00
toasterbabe
fee8714109
i suck at the alphabet!
2018-03-14 16:55:33 +00:00
toasterbabe
a5ab9f01bb
oh yeah this guy's name needs changing too
2018-03-14 16:49:10 +00:00
toasterbabe
68cb919205
down with cis
2018-03-14 16:47:19 +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
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
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07: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
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
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
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 025ca413a2a01a8ec7c104748c2f510e350aa457)
# 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
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
