03ce0adef8
Remove references to old console ports that slipped in from the 2.1 source code a while back
2019-08-20 14:13:38 +01:00
66bc287688
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
8ea9d0e95c
Merge branch 'alias_recursion_hotfix_2' into 'master'
...
Alias recursion hotfix 2
See merge request STJr/SRB2!482
2019-05-08 11:25:15 -04:00
36e678b292
Don't count down wait timer when executing a command
2019-04-14 15:17:47 -07:00
797ca99f42
Detect infinite alias self-recursion mixed with other commands, such as in the case of `alias a "echo test; a"; a`.
...
(Unfortunately, this does not work if "wait" is used instead of "echo", but oh well)
2019-04-14 16:39:14 +01:00
075f28b7c8
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -05:00
e3d106d527
Merge remote-tracking branch 'public-gl/2122-version' into 2122-version
2018-12-22 23:42:25 -05:00
f1fea30045
Properly restrict EXECVERSION from cvar updates
2018-12-20 17:56:51 -05:00
60bcf92525
Adjust execversion retrieval in CV_FilterVarByVersion
2018-12-20 02:18:59 -05:00
657e7321f6
Decouple execversion from MODVERSION; add scheme for MINORMODVERSION
2018-12-17 13:38:23 -05:00
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
93eda4e7c9
EXEC: Search for CFG by file path
2018-12-13 13:11:25 -05:00
3ceeb6a205
Register execversion and remove CV_SAVE because we write manually
2018-12-06 12:28:30 -05:00
0be61e8830
a stray if block
2018-12-06 12:03:53 -05:00
a5eb62b73e
alwaysfreelook -> alwaysmlook string
2018-12-06 12:02:45 -05:00
70aa4ce18e
Add alwaysfreelook2 and mousemove2 to config versioning
...
* Change alwaysfreelook2 to be consistent with alwaysfreelook (the only one that wasn't the same)
2018-12-06 11:59:34 -05:00
5b3a1e0c55
Implement EXECVERSION consvar to invalidate previous versions' default config values
2018-12-06 06:28:34 -05:00
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
b8ce51bff2
Multiple admins
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
2018-11-29 06:46:59 -06:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
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
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
23d28e6b8c
Gutted the GP2X
2017-09-29 22:27:08 +01:00
41ae71db4a
postponed PSP
2017-09-29 20:34:16 +01:00
49542cdaa1
Remove XBOXSTATIC and FILESTAMP, since only the XBOX port needed them
2017-09-29 19:46:23 +01:00
f1a347e55f
Merge branch 'public_next' into master
2017-09-28 11:01:20 -04:00
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
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
842c27e78b
Let's not use terms like this so plainly, right?
2017-03-18 14:20:42 +00:00
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
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
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
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
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
c5f6ae8aaa
Fixed forceskin to not always allow due to bad logic.
2016-07-14 13:24:57 +01:00
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
2c8008e11e
NULL checks
2016-06-13 10:07:10 -04:00
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
7cb77075d1
SRB2 2.1.11 release
2014-08-26 23:56:30 -04:00
d6c29e19ab
SRB2 2.1.10 release
2014-08-05 19:59:40 -04:00
02a3b0776c
SRB2 2.1.7 release
2014-04-14 01:14:58 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
Monster Iestyn