4248 commits

Author	SHA1	Message	Date
Sal	900c6df765	Merge branch 'mobjscale-global' into 'next' ... Add a global for mobjscale See merge request KartKrew/Kart-Public!10	2019-01-08 17:00:34 -05:00
TehRealSalt	ab76725038	Merge remote-tracking branch 'master' into next	2019-01-08 16:29:14 -05:00
Sal	875f5eb28a	Merge branch 'merge-srb2' into 'next' ... Merge SRB2 master & next (round 1) See merge request KartKrew/Kart-Public!16	2019-01-08 15:56:41 -05:00
wolfy852	934b199705	Compile flag for DEVELOP	2019-01-06 20:47:13 -06:00
wolfy852	8baa538d43	Cast animtimer to int before negating ... Stops a Visual Studio compile error.	2019-01-06 03:02:12 -06:00
Sal	02f49b2b8b	Merge branch 'kill-facefreed' into 'next' ... Remove facefreed/iconfreed See merge request KartKrew/Kart-Public!15	2019-01-06 02:02:54 -05:00
SeventhSentinel	716ce5c343	Merge remote-tracking branch 'next' into merge-srb2	2019-01-06 02:02:33 -05:00
SeventhSentinel	3fe7856ba3	Keep execversion stuff on, just dummied out ... Had issues with skin values not changing from the menu, this seemed to fix it	2019-01-06 01:41:42 -05:00
SeventhSentinel	046d66d803	Fix errors from merge	2019-01-06 01:00:30 -05:00
wolfy852	600cf37c88	Remove facefreed/iconfreed ... Caused an issue where having more than 16 characters loaded would crash the game when compiled with MSVC.	2019-01-05 20:40:47 -06:00
SeventhSentinel	e70d98d7a6	Merge remote-tracking branch 'srb2public/master' into merge-srb2	2019-01-05 18:42:58 -05:00
SeventhSentinel	1d58c6b8c2	merge srb2 next	2019-01-05 15:59:23 -05:00
SeventhSentinel	b9ea18c030	turn these signed before abs-ing em	2019-01-05 00:42:36 -05:00
SeventhSentinel	a595d0ba00	Load sounds.kart after patch.kart	2019-01-05 00:33:24 -05:00
Steel Titanium	a57626f828	Clean up the comments a bit	2019-01-04 19:55:05 -05:00
Digiku	031e234d86	Merge branch 'changecontrol-text-overflow-fix' into 'master' ... Resolve buffer overflow crash when configuring System Menu and GIF controls See merge request STJr/SRB2!445	2019-01-04 19:39:17 -05:00
Digiku	e42e1178ed	Increase M_ChangecontrolResponse message buffer by 25 chars	2019-01-04 19:38:36 -05:00
Steel Titanium	d2da1db6c8	Don't increment mainwads for sounds or music.kart	2019-01-04 00:32:01 -05:00
Sal	b69013a4f1	Merge branch 'bump-fixes' into 'next' ... Push bouncing players backwards if they get stuck in a wall See merge request KartKrew/Kart-Public!3	2019-01-03 12:27:14 -05:00
Sal	1b02805445	Merge branch 'map-palette-titlefix' into 'next' ... Fix per-map palette not being reset properly when it should. See merge request KartKrew/Kart-Public!9	2019-01-03 01:08:42 -05:00
Sal	5c1267d2e6	Merge branch 'waypoint-lap-option' into 'next' ... Add waypoint lap field via Parameter field See merge request KartKrew/Kart-Public!4	2019-01-03 00:58:09 -05:00
Steel Titanium	4e0f4ed709	Remove double brackets	2019-01-02 13:04:56 -05:00
Alam Ed Arias	13e3a975d8	Merge branch 'master' into next	2019-01-01 23:00:39 -05:00
Digiku	764e6e7659	Merge branch 'expanded-nmuslist' into 'next' ... Expand NMUSList to include HUD changes See merge request STJr/SRB2!388	2019-01-01 15:06:04 -05:00
Digiku	4560b4cb41	Merge branch 'caps-lock-consistency-fix' into 'master' ... Update capslock state on window re-focus See merge request STJr/SRB2!436	2019-01-01 15:05:20 -05:00
Digiku	80dc98624b	Merge branch 'mingw-64bit-cpu-target-revise' into 'master' ... MinGW64:Target nocona for 64-bit builds [revision] See merge request STJr/SRB2!440	2019-01-01 11:15:34 -05:00
Steel Titanium	b63f4a66e8	Comment this out again. ... How did this even get reverted...	2018-12-31 18:34:04 -05:00
Steel Titanium	26a257eda7	Better attempt at fixing this	2018-12-31 18:19:18 -05:00
SeventhSentinel	998374d603	This would probably be fine, but lets make it consistent like every other instance of this.	2018-12-31 17:59:42 -05:00
SeventhSentinel	c24f53f2f8	Remove accidental DEVELOP commit	2018-12-31 17:55:27 -05:00
Steel Titanium	de6c2a84f3	Attempt 1 to properly fix	2018-12-31 14:18:00 -05:00
Steel Titanium	fddd6fb0d5	Revert "Fix per-map palette not being reset properly on title" ... This reverts commit b63e6ab325.	2018-12-31 13:35:38 -05:00
mazmazz	61e8685713	Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config	2018-12-31 01:43:47 -05:00
Steel Titanium	b63e6ab325	Fix per-map palette not being reset properly on title	2018-12-30 23:38:38 -05:00
mazmazz	deec4550d3	Rename M5 to ARCHOPTS; allow override by command line	2018-12-29 21:55:35 -05:00
mazmazz	44d2340a5b	Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile	2018-12-29 21:14:50 -05:00
Digiku	1517c16c4d	Merge branch 'MSVC-ARM' into 'master' ... ARM and ARM64 support with MSVC toolchain See merge request STJr/SRB2!412	2018-12-28 01:05:40 -05:00
Steel Titanium	f61c8fa279	Don't set if LINUX64 is defined	2018-12-27 21:17:02 -05:00
Steel Titanium	46d3e06576	Stupid restrictions	2018-12-27 19:00:18 -05:00
Steel Titanium	3ca95acc56	More explict check	2018-12-27 18:54:10 -05:00
fickleheart	e5f2f39b46	Use waypoint extrainfo to determine lap it works on ... This can be useful to improve waypoint tracking on sprint maps.	2018-12-27 17:11:16 -06:00
SeventhSentinel	68525de00a	Merge branch 'master' into mobj-scale-global	2018-12-27 13:58:42 -05:00
Steel Titanium	faaf298c4f	Target nocona for 64-bit builds	2018-12-27 00:56:33 -05:00
james	77a5a31135	Update capslock state on window re-focus	2018-12-26 15:49:57 -08:00
Digiku	1358a8dd8f	Merge branch '2123-version' into 'master' ... Update code versions to 2.1.23 See merge request STJr/SRB2!435	2018-12-26 17:14:58 -05:00
Digiku	7e923333b9	Merge branch 'srb2-chat-nonet' into 'master' ... Hide SRB2-CHAT behind #ifndef NONET See merge request STJr/SRB2!434	2018-12-26 17:13:23 -05:00
mazmazz	a25c755a6b	Also hide Chat Options if NONET	2018-12-26 16:41:39 -05:00
mazmazz	7deac7e603	Update code versions to 2.1.23	2018-12-26 16:31:43 -05:00
fickleheart	55e0dcb2e3	oops forgot this	2018-12-26 15:31:19 -06:00
mazmazz	bd4874aa53	Hide SRB2-CHAT behind #ifndef NONET	2018-12-26 16:20:17 -05:00