276 commits

Author	SHA1	Message	Date
Alam Ed Arias	282abfd4ac	Merge branch 'master' into next	2020-01-16 12:08:36 -05:00
James R	77501f8d52	Merge branch 'locale-liberation' into 'master' ... Locale liberation Closes #113 See merge request STJr/SRB2!677	2020-01-15 23:38:40 -05:00
James R	7daf24fcb8	Merge remote-tracking branch 'origin/master' into next	2020-01-12 14:17:52 -08:00
Monster Iestyn	9c1b15c986	Don't make locale code dependent on GETTEXT, save that for the actual gettext related stuff!	2020-01-11 18:48:47 +00:00
James R	3a9cc8db92	Let the console open in menus	2020-01-09 22:42:00 -08:00
fickleheart	067b132eb1	Merge remote-tracking branch 'origin/next' into next-newcontrols	2020-01-04 09:57:09 -06:00
fickleheart	ce0c42a767	Merge branch 'newcontrols' into next-newcontrols	2020-01-04 09:56:24 -06:00
James R	b342301373	Merge remote-tracking branch 'origin/master' into next	2020-01-01 15:39:05 -08:00
James R	b8f465408b	Merge branch 'warp-by-name' into 'master' ... Properly fix the issue that !528 tried to; let the -warp parameter work with map name See merge request STJr/SRB2!596	2020-01-01 17:51:21 -05:00
fickleheart	77ba835f4f	Merge branch 'next' into next-newcontrols ... # Conflicts: # src/g_game.c # src/p_setup.c	2019-12-31 12:58:36 -06:00
Jaime Passos	585db9fe2d	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-30 18:39:31 -03:00
James R	67ca512120	Merge remote-tracking branch 'origin/master' into next	2019-12-30 13:16:53 -08:00
fickleheart	61a8f715ac	Convert analog/directionchar cvars into 2-long arrays	2019-12-30 14:01:14 -06:00
James R	d9e9a2e1ce	If we move the -warp code down, map searching can be used	2019-12-29 02:31:48 -08:00
Jaime Passos	bd28daea02	Merge remote-tracking branch 'origin/next' into respawndelaygametyperule	2019-12-28 21:39:38 -03:00
Jaime Passos	e5e4b4891a	Add GTR_CUTSCENES. And I ran out of rule slots. Cool.	2019-12-28 20:33:28 -03:00
MascaraSnake	f67ff6d97e	Rename P_SetupLevel to the more accurate P_LoadLevel and separate out some of its content into subfunctions	2019-12-28 11:30:39 +01:00
Jaime Passos	f55b4bf6ad	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-25 05:43:46 -03:00
Jaime Passos	31eeb90056	Merge remote-tracking branch 'aaaaaaaa/next' into gametype-clownery	2019-12-24 17:55:46 -03:00
James R	27e251e7fc	Merge branch 'wipes2' into 'master' ... Wipe styles cleanup See merge request STJr/SRB2!525	2019-12-24 14:47:14 -05:00
James R	975f1e5f83	Merge branch 'soundtest-fix' into 'master' ... Init MUSICDEFs regardless of music state See merge request STJr/SRB2!532	2019-12-24 14:44:08 -05:00
James R	7db16e230b	Merge branch 'fixsignalhandler' into 'master' ... Handle signals correctly on linux See merge request STJr/SRB2!530	2019-12-24 02:54:44 -05:00
Jaime Passos	30be9e29e5	NUMGAMETYPES vs gametypecount	2019-12-18 12:30:01 -03:00
Jaime Passos	d7cb14d38e	Gametype rules draft, mind the debug command	2019-12-18 01:25:57 -03:00
Jaime Passos	11dc6801dc	Update comments	2019-12-17 16:14:26 -03:00
Jaime Passos	1002c47407	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-17 16:12:44 -03:00
James R	6f2324d8df	Rename I_StartupKeyboard to I_RegisterSignals and call it in a sane place	2019-12-12 21:30:35 -08:00
Steel Titanium	411754451c	Move S_InitMusicDefs call outside of the check. ... As far as I know, this is competely safe.	2019-12-12 16:32:40 -05:00
Jaime Passos	b093a38ecd	Please, for the love of God, Jesus and Bastet, ADD EVERY OPENGL COMMAND REGARDLESS OF THE FREAKING RENDERER!!!!!!!!!!!!!!!!!!!!!!!!!!!	2019-12-12 17:30:19 -03:00
Jaime Passos	aa4e3384bb	Merge remote-tracking branch 'origin/master' into wipes2	2019-12-11 12:57:59 -03:00
Jaime Passos	6976b9bf01	Merge remote-tracking branch 'origin/master' into renderswitch	2019-12-10 23:01:10 -03:00
Jaime Passos	44daeb340e	Update d_main.c	2019-12-07 11:55:53 -03:00
MascaraSnake	3ad7f9e445	Merge branch 'master' into nondevelop	2019-12-06 23:23:01 +01:00
MascaraSnake	fffd385151	Merge branch 'datestuff' into 'master' ... Date stuff See merge request STJr/SRB2Internal!618	2019-12-06 16:10:36 -05:00
Steel Titanium	a5cdb0a4b3	Update copyright date on source files	2019-12-06 13:49:42 -05:00
toaster	67d8b291bb	* Fix unintentional order-of-operations crash with non-DEVELOP executables (resolves #461). ... * Update md5s. * Update modversion. TODO: Should we change MODID, given 2.0 apparently had a different MODID to 2.1?	2019-12-06 17:14:51 +00:00
Jaime Passos	708b4805d1	Merge remote-tracking branch 'origin/lt-extraneous-parameters' into wipes2	2019-12-05 02:03:09 -03:00
Jaime Passos	0fa1525749	Remove unnecessary function parameters from title card code	2019-12-05 01:58:19 -03:00
Jaime Passos	cbe17383e0	Slap colormap fades everywhere	2019-12-04 19:25:39 -03:00
Jaime Passos	9178660d34	Fix stuck closed captioning	2019-11-25 20:16:17 -03:00
MascaraSnake	ab7fe745c6	Merge branch 'charlock' into 'master' ... Charlock (resolves #345). Closes #345 See merge request STJr/SRB2Internal!528	2019-11-25 16:44:38 -05:00
Louis-Antoine	aac5e41f3d	Revert "Render title map on connecting to server screen too" ... This reverts commit 502c72e975.	2019-11-25 01:09:00 +01:00
toaster	3f40c7e4a7	* Resolve #345. ... * Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.	2019-11-24 13:24:37 +00:00
MascaraSnake	b276366816	Merge branch 'remove-unused-levelwipes' into 'master' ... (Cleanup) Remove unused levelwipes See merge request STJr/SRB2Internal!507	2019-11-22 09:21:17 -05:00
Jaime Passos	3a7342e06d	Remove D_ProcessEvents call in G_PreLevelTitleCard	2019-11-21 02:16:09 -03:00
Jaime Passos	3ed8470b58	remove unused levelwipes	2019-11-18 19:22:46 -03:00
Jaime Passos	925940b44e	Merge remote-tracking branch 'origin/master' into f_wipes	2019-11-18 18:48:19 -03:00
Jaime Passos	8ad20c1108	Organize	2019-11-18 12:56:41 -03:00
Jaime Passos	f37e0de8c5	stuff	2019-11-18 11:39:54 -03:00
James R	37dc402540	Move setting from defaults to M_FirstLoadConfig, so it triggers even when the title screen doesn't start	2019-11-15 17:31:53 -08:00