toasterbabe
|
d8065fa525
|
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into s_skinprovements
# Conflicts:
# src/d_player.h
# src/dehacked.c
# src/info.c
# src/p_user.c
|
2016-07-16 17:23:25 +01:00 |
|
toasterbabe
|
c5f6ae8aaa
|
Fixed forceskin to not always allow due to bad logic.
|
2016-07-14 13:24:57 +01:00 |
|
toasterbabe
|
80a3d79d4d
|
Some hacks added to forceskin to:
* support hidden characters
* take the skin->name, not the number
* display the skin->name in the menu
Also, minor tweaks to other things.
|
2016-07-12 14:40:20 +01:00 |
|
Alam Ed Arias
|
2c8008e11e
|
NULL checks
|
2016-06-13 10:07:10 -04:00 |
|
Inuyasha
|
f07585191b
|
copyright dates/statements updated and such
(no actual SLOC changes)
|
2016-05-17 17:42:11 -07:00 |
|
Alam Ed Arias
|
73b3287b19
|
SRB2 2.1.14 release
|
2015-01-01 14:50:31 -05:00 |
|
Alam Ed Arias
|
404b5f666c
|
SRB2 2.1.12 release
|
2014-11-11 19:55:07 -05:00 |
|
Alam Ed Arias
|
7cb77075d1
|
SRB2 2.1.11 release
|
2014-08-26 23:56:30 -04:00 |
|
Alam Ed Arias
|
d6c29e19ab
|
SRB2 2.1.10 release
|
2014-08-05 19:59:40 -04:00 |
|
Alam Ed Arias
|
02a3b0776c
|
SRB2 2.1.7 release
|
2014-04-14 01:14:58 -04:00 |
|
Alam Ed Arias
|
b93cb1b65a
|
SRB2 2.1 release
|
2014-03-15 13:11:35 -04:00 |
|