Monster Iestyn
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
e4f157786c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
2da335a1c4
Place limit on the amount of alias recursion allowed, to prevent cycles or otherwise excessive recursion
2018-11-10 13:08:26 +00:00
Monster Iestyn
23d28e6b8c
Gutted the GP2X
2017-09-29 22:27:08 +01:00
Monster Iestyn
41ae71db4a
postponed PSP
2017-09-29 20:34:16 +01:00
Monster Iestyn
49542cdaa1
Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them
2017-09-29 19:46:23 +01:00
Alam Ed Arias
f1a347e55f
Merge branch 'public_next' into master
2017-09-28 11:01:20 -04:00
Monster Iestyn
bae55a3af4
Don't display "x set to y" messages twice in the debugfile for consvars with CV_SHOWMODIFONETIME/CV_SHOWMODIF
...
(can't think offhand when those flags are actually used, but oh well)
2017-06-10 16:36:52 +01:00
toasterbabe
3efa66d537
Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2Internal.git into charabilities_mk3
...
# Conflicts:
# src/m_menu.c
2017-04-04 21:03:35 +01:00
toasterbabe
842c27e78b
Let's not use terms like this so plainly, right?
2017-03-18 14:20:42 +00:00
toasterbabe
87ba3411a4
* Fixes forceskin causing desynchronisations, baby! Checks only when attempting to send.
...
* Makes the forceskin print more consistent with the skin print.
* Disabled the printing of availabilities.
2017-03-18 00:41:40 +00:00
toasterbabe
0060caaf1a
Fixed synchronisation of skin changes and forceskin.
...
There's an outstanding issue - you can set forceskin to whatever you want to as the host. This needs to be fixed, but I'm commiting my successes first.
2017-03-17 23:11:32 +00:00
toasterbabe
60a2e26569
First attempt at making skin availabilities netgame-synchronised. However, I am completely unable to test this right now, since I'm on uni internet which is super locked down; in order to have it not get tangled up with anything else, I'm committing it now in a potentially broken state so that it can be reverted at a later date if necessary.
2017-03-16 18:57:42 +00:00
toasterbabe
9fc757f388
Inuyasha: You were right.
...
* Changed the order of Record/Nights Attack and its level select menu option so that you go from the main menu to the map page to level select, rather than main menu to level select to map page.
* Cleaned up a lot of code.
2017-02-10 14:54:05 +00:00
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
