stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-13 14:20:59 +00:00
Code Issues Projects Releases Packages Wiki Activity
6358 commits 172 branches 41 tags 242 MiB
Commit graph

5384 commits

Author SHA1 Message Date
Monster Iestyn
b205602db6 DO NOT USE FRACUNIT AS A LAZY WAY TO DO UPPER 16 BITS FOR ACTION VARS 2019-05-04 19:43:14 +01:00
Monster Iestyn
a5331f8024 Fix A_LookForBetter to not leave a stray thinker reference lingering potentially forever, as toaster pointed out it might do. 2019-05-04 17:15:59 +01:00
Monster Iestyn
54fea4d0b9 AND I forgot these checks, confound it 2019-05-03 23:16:11 +01:00
Monster Iestyn
ee1fd72f9f ah, forgot to do this 2019-05-03 23:12:03 +01:00
Monster Iestyn
df99e93288 Hardcoded A_Boss5FindWaypoint 
...that took a while x_x
 2019-05-03 22:58:54 +01:00
Monster Iestyn
0d7cd34882 Hardcoded A_Boss5MakeItRain 2019-05-03 20:52:56 +01:00
Monster Iestyn
b03bfbabe4 Hardcode A_DoNPCSkid 2019-05-03 20:00:31 +01:00
Monster Iestyn
b4d8c2fa29 Hardcoded A_Boss5PinchShot 2019-05-03 19:46:41 +01:00
Monster Iestyn
6cd2b73273 Hardcoded A_LookForBetter 2019-05-03 19:14:17 +01:00
Monster Iestyn
a0220454fd Hardcoded A_PrepareRepeat and A_Boss5Calm, added missing prototype for A_Boss5ExtraRepeat (and also fixed its description) 2019-05-03 18:51:17 +01:00
Monster Iestyn
1b2afea091 Merge branch 'public_next' 2019-05-03 16:42:42 +01:00
Monster Iestyn
454306cf86 Merge branch 'master' into next 2019-05-03 16:40:13 +01:00
Monster Iestyn
a5dfbe7eff add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason 
not making a merge request because this is so laughably stupidly simple
 2019-05-03 16:38:59 +01:00
Monster Iestyn
d4ab2837bb Merge branch 'master' into next 2019-05-03 16:00:45 +01:00
mazmazz
904b00e921 Remove song_length tag search 
Because songs without this tag will skiplag when loading.
 2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531 Remove MP3 widechar tag searching 
1. It's slow, 2. It's incorrect
 2019-05-02 19:13:56 -04:00
mazmazz
89ab777c40 Merge remote-tracking branch 'origin/master' into menu-execs 2019-05-02 18:47:43 -04:00
Monster Iestyn
266fa05e15 fix a slipup in A_DoNPCPain I just noticed I made, whoops 2019-05-02 21:34:00 +01:00
Monster Iestyn
61eb05eab2 Hardcoded A_Boss5CheckFalling 2019-05-02 21:32:28 +01:00
Monster Iestyn
953a0c2967 Hardcoded A_Boss5ExtraRepeat 2019-05-02 21:21:15 +01:00
Monster Iestyn
fb17c1ac5a Hardcoded A_Boss5CheckOnGround 2019-05-02 19:09:40 +01:00
Monster Iestyn
3bbc5d0b08 hardcoded A_DoNPCPain 2019-05-02 18:32:43 +01:00
Monster Iestyn
75701294ea Hardcode Fang waypoint object type (turns out no state is needed) 2019-05-02 18:11:44 +01:00
Monster Iestyn
d92ccf6823 Hardcoded all the main Fang-specific object types, states and sprites. 
This cannot be compiled as-is right now for the following reasons:
* Numerous actions still need to be hardcoded.
* MT_FBOMB uses the TNT barrel explosion (and by extention A_TNTExplode) for its death state. This is a pickle, I'll deal with it when I get to it.

Also missing:
* Fang waypoint object type+states.
* Fang's good looks (to be put in the resource files obviously).
* Fang's brain.
 2019-05-02 18:01:18 +01:00
Sryder
4d77ed925e OpenGL sprite billboarding 
Should work on both normal and precipitation sprites.
Sprites that are split by lighting should work correctly.
 2019-05-01 20:15:00 +01:00
Nev3r
a56e8e4f8b Merge branch 'further-mace-advancements' into 'master' 
Further Mace Advancements

See merge request STJr/SRB2Internal!147
 2019-04-30 15:15:35 -04:00
Nev3r
5c240eb9db Add back the p_slopes.h header guard 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 18:05:16 +02:00
Nev3r
62875d6728 Send the slope thinkers list after the mobj list 
Keeping the sector list before the mobj list stops the objects from "entering" or "floating" on slopes. However this induces a new slope adhesion problem in fast-moving slopes, so it is more desirable to leave the "indent/float-on" behavior for now since fixing this one seems like a big can of worms and falls off this branch's scope.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 17:16:35 +02:00
Nev3r
a9110c0645 Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks 
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 16:39:57 +02:00
Nev3r
a3174fb56f Add a temporary limbo list for thinkers that need to be freed, in order to keep other lists clean, especially the mobj list. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 16:17:47 +02:00
Nev3r
fc9e141460 Give precip. its own thinker list 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 14:58:18 +02:00
Monster Iestyn
8cb0f55a90 Rename thinkers.iterate to mobjs.iterate, kill the "mobjs" arg (though you still need the parentheses). Done a bit messily/lazily, I'll clean up if we can confirm this works 
I do wonder whether this library can be extended for all of thlist's lists... but for now it's mobj-only, since we only have the ability to mess with mobjs anyway.
 2019-04-21 13:52:55 +01:00
Nev3r
696ccbd943 Fix mobj list iteration oversights. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 12:58:22 +02:00
Nev3r
aad78d4985 Give slope thinkers their own list right before mobjs'. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 12:00:10 +02:00
Nev3r
11dba34f43 Remove dynamic slope queue list due to now being unnecessary. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 11:52:18 +02:00
Nev3r
d264d06879 Merge branch 'slopethinkers' into thinkerlists 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 11:47:34 +02:00
Nev3r
134679c287 Fix some of the polyobject thinkers being removed via P_RemoveThinkerDelayed() directly 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-21 11:08:24 +02:00
Nev3r
b60c66325c Added a mobj-only list entry for mobj thinkers 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 23:29:20 +02:00
Nev3r
39ba20be6b Basic multiple thinker list implementation 
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 22:39:22 +02:00
Nev3r
7c17ed0aa6 Things spawning over copied slopes now properly align on the new plane 
While I believe the opposite behavior was intentional at first, it has proven to be problematic and makes alignment a tedious task for copied planes.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 19:03:50 +02:00
Nev3r
b3ac590e5e Add a slope thinker queue. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-20 13:06:06 +02:00
Nev3r
83001a5bc9 Fix line-based slopes' normals. 
The game never uses the normals directly yet so it's been left unnoticed ever since.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-19 20:34:22 +02:00
Nev3r
8a2e11ffa9 Small code cleanup 
- Removed unused vars from the slope struct. I'm pretty sure they were meant for something at some point, but right now there's nothing using them and frankly I find it hard to understand what they were meant for.
- Removed unused slope flags.
- Flipped dynamic slope flag naming convention.


Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-19 20:30:13 +02:00
Nev3r
5401e9560f Dynamic slopes now use thinkers. 
* Moved dynamic slope-related data into its own thinker.
* Vertex slopes no longer use the mapthings directly.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-19 14:14:43 +02:00
Nev3r
f7d1515888 Perform dynamic slope thinking before other thinkers. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-18 14:43:34 +02:00
Monster Iestyn
3203dc5d4b Remove old code altogether at Nev3r's request 2019-04-17 16:46:32 +01:00
Monster Iestyn
6bddd131da Undefine toaster's old define to flip full-brightness default status for planes 2019-04-17 14:51:48 +01:00
Steel Titanium
26fdee8217 Don't enable UPnP support if NONET is defined. 2019-04-16 15:05:09 -04:00
James R
36e678b292 Don't count down wait timer when executing a command 2019-04-14 15:17:47 -07:00
Monster Iestyn
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
Monster Iestyn
8a2f8a441b Merge branch 'master' into opengl-new-patch-features-support 2019-04-11 20:09:57 +01:00
Monster Iestyn
212be85655 added "checkmobjs" boolean to both Polyobj_moveXY and Polyobj_rotate, so we can disable interaction with mobjs for netgames 2019-04-05 12:03:03 +01:00
Nev3r
1d401d8481 Merge branch '144-scrolltweaks' into 'master' 
Resolve "Let scrollers and wind/current affect front sector if untagged, and use texture offsets as parameters if different from 0"

Closes #144

See merge request STJr/SRB2Internal!213
 2019-04-05 06:41:11 -04:00
Nev3r
fec991dedb Implement displacement-based polyobject rotation. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-04-05 11:50:59 +02:00
Monster Iestyn
07a66e5355 Merge branch 'public_next' 2019-04-02 15:49:15 +01:00
Monster Iestyn
ab0fe6b164 Merge branch 'master' into next 2019-04-02 15:47:07 +01:00
James R
42d25f67ca Merge remote-tracking branch 'origin/master' into less-obtuse-console-fixes 2019-03-31 12:29:55 -07:00
Monster Iestyn
7ae6d5ee8c Merge branch 'public_next' 
# Conflicts:
#	src/doomstat.h
#	src/g_game.c
 2019-03-28 14:19:02 +00:00
James R
917edf720d Don't close console when starting title screen 2019-03-26 13:05:19 -07:00
James R
9a350eb879 Don't close console when changing map 2019-03-26 13:04:11 -07:00
James R
69d7e98f34 Remove redundant CON_ClearHUD calls 2019-03-26 12:59:13 -07:00
James R
e8071e66e4 Resize console upon resolution change 
Basically, changing to a lower resolution won't cause your console to extend
past the screen anymore.
 2019-03-26 12:30:02 -07:00
jameds
b9b36a44a8 Keep color across wrapped lines 
And this works by inserting the same color code on each wrapped line.
 2019-03-26 12:07:11 -07:00
jameds
587586f4bb Scroll console immediately upon pressing PageUp 2019-03-26 12:05:23 -07:00
Monster Iestyn
a01a0a3dc3 Merge branch 'master' into next 2019-03-26 13:46:15 +00:00
Monster Iestyn
9ef98471a4 Merge branch 'buildbot' into 'master' 
Buildbot changes

See merge request STJr/SRB2!477
 2019-03-26 09:44:56 -04:00
Monster Iestyn
8e78369f83 Merge branch 'dedicated-server-credits-fix' into 'master' 
Dedicated server credits fix

See merge request STJr/SRB2!476
 2019-03-26 09:44:21 -04:00
Monster Iestyn
67874180b2 Merge branch 'gametype-strings-backport' into 'next' 
Gametype strings backport

See merge request STJr/SRB2!473
 2019-03-26 09:42:52 -04:00
James R
d00cc7cddb Prevent just anyone from skipping credits but allow admins 
exitlevel works too
 2019-03-25 16:19:40 -07:00
Monster Iestyn
8c1c0875a2 Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way 2019-03-25 21:35:04 +00:00
Alam Ed Arias
fe22fdc5a3 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Monster Iestyn
147221cf6e R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
Monster Iestyn
7441dd7d9b Merge branch 'master' into next 2019-03-25 18:08:36 +00:00
James R
ed0f8fd967 Actually allow connecting to "localhost" 
Because IPv6 doesn't seem to work anyway.
 2019-03-20 20:37:00 -07:00
James R
f139ffd1dc Let localhost connections 2019-03-20 20:37:00 -07:00
Monster Iestyn
ecb6322a52 Merge branch 'sdl-noxinput-nohidapi' into 'master' 
-noxinput and -nohidapi command line parameters.

See merge request STJr/SRB2!468
 2019-03-20 17:33:04 -04:00
Monster Iestyn
2fb569857a Added the Gametype_Names array and G_GetGametypeByName for ease in converting gametype nums to strings and vice versa 
gametype_cons_t is now initialised using the Gametype_Names array, like how Color_cons_t is initialised using Color_Names

# Conflicts:
#	src/doomstat.h
#	src/m_menu.c
 2019-03-18 22:00:23 +00:00
Nev3r
aa43f8b3bf Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into 144-scrolltweaks 2019-03-16 08:14:29 +01:00
Steel Titanium
6d751ff302 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Steel Titanium
67a80ba311 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into banip-command 2019-03-15 16:13:31 -04:00
Jimita
6e4b42fc97
Merge branch 'next' into flashpals-on-screenshots 2019-03-15 16:38:33 -03:00
mazmazz
f18103a473 Declare exitfadestarted properly 2019-03-15 11:01:41 -04:00
mazmazz
ad50fa4d9e Fix MIDI crash bug when changing music between levels 
This happened when the old music was ERZ2 native midi, then warping to any other level.
 2019-03-15 10:02:50 -04:00
mazmazz
7346684bd8 Fade out music upon dying or level change: 2.1 frontport 2019-03-15 04:21:17 -04:00
mazmazz
587a51a957 Fix end-of-level fading for cv_playersforexit 
(Code in p_user.c was from 2.2, where cv_playersforexit has different values so that the player exit check works differently)
 2019-03-15 03:47:30 -04:00
mazmazz
8afaaa80a1 lclear -> _clear typo 2019-03-15 03:15:20 -04:00
mazmazz
a1ccb8512d Merge branch 'public-gl-next' into public-musicplus-feature-endoflevel 2019-03-15 02:07:53 -04:00
mazmazz
f163633591 Merge branch 'public_next' 2019-03-15 01:43:03 -04:00
mazmazz
6b93ca9221 Intermission: Don't fade out level music when using win32 midi volume hack 2019-03-15 01:26:13 -04:00
mazmazz
e098d6a8b8 Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel 2019-03-15 01:09:12 -04:00
mazmazz
6cf05a4613 Implement MUSICINTERFADEOUT level header 2019-03-15 01:05:52 -04:00
mazmazz
ba77dfd546 Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel 2019-03-15 01:01:24 -04:00
mazmazz
b5fc27c545 Implement MUSICINTERFADEOUT level header 2019-03-15 01:00:50 -04:00
mazmazz
773f9dc2ba Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel 2019-03-15 00:39:26 -04:00
mazmazz
9064a0b33a Merge remote-tracking branch 'origin/master' 2019-03-15 00:33:12 -04:00
mazmazz
4377386153 Merge branch 'public_next' 2019-03-15 00:33:06 -04:00
mazmazz
bd9e42ce6e Merge branch 'public-gl-next' into public-musicplus-inter 2019-03-14 23:42:16 -04:00
mazmazz
3b6be9b419 Remove redundant music reset block for MIXNIGHTSCOUNTDOWN 2019-03-14 23:21:52 -04:00
mazmazz
469ed9cbe3 Implement MIXNIGHTSCOUNTDOWN 
An alternate mode to NiGHTS countdown jingle: play it as an SFX while fading down the music.
 2019-03-14 23:10:14 -04:00
mazmazz
9ec98c588f Merge branch 'public_next' 2019-03-14 22:15:34 -04:00
mazmazz
fdde5f13c5 When resetting volume on same music, make it fade instead of a hard change 2019-03-13 23:55:30 -04:00
mazmazz
67e2857303 When changing to same music, reset the internal volume 2019-03-13 23:41:35 -04:00
mazmazz
c021e29835 Restore MUSIC_RELOADRESET if block in g_game 2019-03-13 21:18:23 -04:00
mazmazz
2c75d4da69 Fix custom fade source bug for Change Music linedef 2019-03-13 19:53:16 -04:00
mazmazz
aea18f36ba Remove MP3 warning 2019-03-13 19:51:45 -04:00
mazmazz
93626c2293 Merge remote-tracking branch 'public-gl/next' into public-musicplus-core 2019-03-13 19:45:07 -04:00
Nev3r
ae9f8856ac Override vectorial magnitude with front X offset, if provided; takes the line's lengths into account otherwise, as usual. 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-13 12:24:47 +01:00
Nev3r
cd3ea897c3 Dealt with no-tag business: 
* Wind/current pushers affect front sector if left untagged.
* Plane scrollers affect front sector if left untagged.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-13 11:13:54 +01:00
Alam Ed Arias
08784ce58d Merge branch 'master' into next 2019-03-09 20:37:17 -05:00
Alam Ed Arias
60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
Nev3r
83f953edb8 Make FOFs extend to infinity when in contact with a horizon line. 
Make FOFs extend to infinity when in contact with a horizon line.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-03-07 19:01:02 +01:00
Jimita the Cat
0186f6784b a 2019-03-06 21:40:38 -03:00
Alam Ed Arias
747995ae6a Merge branch 'master' into next 2019-03-04 17:15:04 -05:00
Alam Ed Arias
67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias
145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Steel Titanium
9542a47f7f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
Steel Titanium
15323328c5 Check using memcmp() 2019-03-03 22:43:21 -05:00
Steel Titanium
3d5d02fc15 Error if the lump is a PNG lump 2019-03-03 19:58:01 -05:00
Monster Iestyn
a93e96c75b Merge branch 'public_next' 
# Conflicts:
#	src/sdl12/Srb2SDL-vc10.vcxproj
#	src/sdl12/Srb2SDL-vc9.vcproj
#	src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
#	src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
 2019-03-02 20:51:15 +00:00
Alam Ed Arias
c2618fd987 Merge branch 'master' into next 2019-03-01 17:32:17 -05:00
Alam Ed Arias
f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn
008b0bf560 Merge branch 'master' into next 2019-03-01 16:23:51 +00:00
Monster Iestyn
67e721e983 Merge branch 'need-more-time' into 'master' 
Stop Linux servers from hanging every 34 hours

See merge request STJr/SRB2!465
 2019-03-01 11:22:32 -05:00
Monster Iestyn
4459ecdd90 Merge branch 'master' into next 2019-03-01 16:05:49 +00:00
wolfy852
97de2ae4f6 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
Alam Ed Arias
7cd60a544a Merge branch 'apng-oh-shit-fixes' into 'master' 
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
 2019-02-28 12:00:58 -08:00
wolfs
5620d0188e Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-28 12:00:58 -08:00
Monster Iestyn
ae244d2af3 Fix goofup with addonsp patch unlock for loop from 2.1.13 merge 2019-02-28 15:48:27 +00:00
Monster Iestyn
7a0d8b408e Merge branch 'public_next' 
# Conflicts:
#	src/d_main.c
#	src/dehacked.c
#	src/m_menu.c
#	src/m_menu.h
 2019-02-27 22:36:01 +00:00
Steel Titanium
fa990e8603 Remove double define 2019-02-27 16:05:43 -05:00
Steel Titanium
e71977fe6a Merge branch 'next' into banip-command 2019-02-27 16:03:01 -05:00
Steel Titanium
15b27bb7d7 Upped MAXNETNODES 2019-02-27 15:59:50 -05:00
Monster Iestyn
0340eb0b99 Merge branch 'master' into next 2019-02-27 20:35:07 +00:00
Monster Iestyn
d76e946b3e Merge branch 'sdl-new-windowicon' into 'master' 
SDL:Update XPM icon

See merge request STJr/SRB2!441
 2019-02-27 13:34:24 -05:00
Monster Iestyn
a25f4b8194 Make sure that B_CheckRespawn can be called even if Tails is dead 2019-02-26 21:14:22 +00:00
Alam Ed Arias
e36193e44e Merge branch 'hide-error-devmode' into 'next' 
Show line number on error, also hide under devmode

See merge request STJr/SRB2!458
 2019-02-21 23:05:09 -05:00
Alam Ed Arias
2f8eadd211 Merge branch 'master' into next 2019-02-21 22:42:26 -05:00
Steel Titanium
bfbb83df23 Save when quitting the game. 
Also use default reason if not custom reason is given.
 2019-02-21 19:48:15 -05:00
Steel Titanium
bf2f6ebc09 Save ban list right after banning. 2019-02-21 19:47:00 -05:00
Steel Titanium
c9d90f7688 Add command to ban an IP address. 2019-02-21 19:44:18 -05:00
Steel Titanium
c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Monster Iestyn
cb986bf1c0 added support for both horizontal and vertical flipping (not sure if complete or not atm, but I've done enough for tonight I think) 2019-02-13 22:40:48 +00:00
Monster Iestyn
7321df8015 some more mucking about with function arguments (preparing for alpha/flip support adding particularly), also fixed a slipup I made when I first made HWR_DrawColumnInCache 2019-02-13 20:56:59 +00:00
Monster Iestyn
d2c6b995d3 split HWR_DrawPatchInCache into two functions: one for texture patches and one for everything else 2019-02-13 20:12:10 +00:00
Monster Iestyn
497e79d1de Turns out the consts ARE needed after all, also fix some other errors the compiler reported 2019-02-13 18:20:26 +00:00
Monster Iestyn
55e3e99a94 Merge branch 'master' into opengl-new-patch-features-support 2019-02-13 18:08:17 +00:00
Monster Iestyn
8f667906eb Fix compiler warnings 2019-02-13 18:06:56 +00:00
Monster Iestyn
ff2ebf20fb blockmodulo and bpp do not need to be args of HWR_DrawPatchInCache 2019-02-13 17:27:20 +00:00
Monster Iestyn
efa042a995 whoops, removed some variables I shouldn't have, so I've added them back 2019-02-13 16:52:51 +00:00
Monster Iestyn
30a00c812c Split the column caching code of HWR_DrawPatchInCache into a new function, HWR_DrawColumnInCache. This should make modifying the OpenGL caching code look a little less daunting, hopefully. 
I also removed some "const"s for now, since I wasn't sure if they were needed or even correct to use or not here... if they're fine I could add them back later though.

(Note: I have not tested if this compiles yet)
 2019-02-13 16:39:37 +00:00
Steel Titanium
76724c9c13
Show line number on error, also hide under devmode 2019-02-11 16:39:58 -05:00
Monster Iestyn
e6cb47e2f2 Merge branch 'fix_skins_overflow' into 'next' 
Fix skin overflow error

See merge request STJr/SRB2!455
 2019-02-11 15:05:00 -05:00
MascaraSnake
5eb089cc14 Forgot the continue statements 2019-02-03 17:07:13 +01:00
MascaraSnake
00cad05550 Emblem number in emblem definition is optional. If none is supplied, place in first free slot. 2019-02-03 17:03:33 +01:00
MascaraSnake
bc30bd06df In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC 2019-02-03 14:32:07 +01:00
MascaraSnake
8c345b87ca Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD 2019-02-03 11:05:22 +01:00
MascaraSnake
0dd8779b91 Hardcoded emblems of the first four special stages 2019-01-30 23:01:58 +01:00
MascaraSnake
88a6dbae9b Spring Hill -> Christmas Chime 2019-01-29 22:26:15 +01:00
MascaraSnake
f6dd521fd0 Updated/added emblem locations for GFZ, THZ, DSZ1, CEZ1, FHZ2 and HHZ 2019-01-28 21:28:38 +01:00
Steel Titanium
0aa965c59f How did I forget about this 2019-01-26 23:22:30 -05:00
Steel Titanium
bce093fd06 Setup the tables even eariler. 
I really hate that PlayerMenu status hack, but that's really the only
way I could think off to show the entires for Tails, Knuckles and the
Sonic&Tails pair.
 2019-01-26 23:16:49 -05:00
Steel Titanium
74bf3164f8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
TehRealSalt
0d1c501664 Update the SP menu stuff to use MAXSKINS 
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
 2019-01-26 00:22:05 -05:00
Alam Ed Arias
74850fea17 Merge branch 'master' into next 2019-01-20 17:01:01 -05:00
Sryder
b18a8dbc8d Disable the APNG code if the version of libpng is greater than 1.4. 
Since supposedly the current code *can't* work with newer versions of libpng that have the apng patch, it won't compile if that's what people have.
It seems like some distros are adding the apng patch to libpng and that'll make things annoying to compile for people.
I think it goes without saying, but if there's ever a fix to make newer libpng versions work with the APNG code then this can be reverted.
 2019-01-20 18:50:28 +00:00
james
356249dade Set modifiers in a non-reactive manner 2019-01-17 16:47:01 -08:00
Jimita
424b2b1aaf
Merge branch 'next' into flashpals-on-screenshots 2019-01-16 05:59:05 -02:00
Steel Titanium
fad341b0e9 Fix skins overflow 2019-01-15 14:29:43 -05:00
fickleheart
7e026824a4 Fix rendering gaps on polys with upper/lower textures 2019-01-12 20:15:58 -05:00
Monster Iestyn
f3796dc7f6 revert to LF_SAVEGAME system code, removing all traces of saveoverride 
(I believe Sal wanted us to do this anyway, so...)
 2019-01-08 17:14:21 +00:00
mazmazz
a050ed956a Fixed Addons Menu icons for search bar 2019-01-08 01:31:44 -05:00
mazmazz
47bd042a7e Misssed alwaysfreelook defaults (first person) 2019-01-08 01:29:12 -05:00
mazmazz
d5de5e9f49 Fix player.dta SIGNA0 overwriting regular end sign frame 2019-01-08 00:19:42 -05:00
mazmazz
e02fd489a7 GCC 7 fallthru bypasses (-Werror-implicit-fallthrough) 2019-01-07 23:06:47 -05:00
mazmazz
8ea8bf2587 Chat arrow offsets 2019-01-07 22:34:48 -05:00
mazmazz
5066e340f4 Update SRB2-CHAT nickname colors to 2.2 skincolors 2019-01-07 22:26:39 -05:00
mazmazz
e403d1bacc Correct addons menu back color 2019-01-07 21:58:42 -05:00
mazmazz
dfc427e81a Dummy out SRB2-CHAT console colors 
Pending translation to 2.2 palette indexes
 2019-01-07 21:54:38 -05:00
mazmazz
411b1b4f54 Addons menu merge fixes 2019-01-07 21:45:41 -05:00
mazmazz
a775a63dfd WIP hu_stuff merge fixes 2019-01-07 17:56:55 -05:00
mazmazz
875aee60a0 Menu merge fixes 2019-01-07 17:56:43 -05:00
mazmazz
b3f7b169b2 Merge errors for compile 2019-01-07 17:05:20 -05:00
Digiku
4f0be1b064 Update f_finale.c - Small credits update 2019-01-07 16:50:59 -05:00
mazmazz
7aa55f24f5 Resolve r_data.c colormap conflict 2019-01-07 15:29:37 -05:00
Nev3r
7d09149b04 Solved conflicts related to PK3s 
Signed-off-by: Nev3r <apophycens@gmail.com>
 2019-01-07 19:00:31 +01:00
Monster Iestyn
9effa134d2 resolve the conflict in p_spec.c 2019-01-07 17:02:05 +00:00
Monster Iestyn
96ad8dd81a resolve conflict in r_main.c 2019-01-07 16:52:46 +00:00
Digiku
1c1331199d Update f_finale.c - Remove Torgo's real name by request 2019-01-07 03:41:25 -05:00
mazmazz
015e7b9862 Resolve p_setup and d_netcmd conflicts (20190101 public merge) 2019-01-07 03:07:24 -05:00
mazmazz
e18eb69a0b Resolved filesrch.c conflicts (20190101 public merge) 2019-01-07 02:54:26 -05:00
mazmazz
e9150b6645 Resolve m_menu.c conflicts (20190101 public merge) 2019-01-07 02:31:45 -05:00
Steel Titanium
7d1e59d4ba Some few changes 2019-01-05 23:42:25 -05:00
mazmazz
578a4fe80d Merge remote-tracking branch 'public-gl/master' into travis-deployer 2019-01-05 09:08:34 -05:00
Marco Z
882355d24b Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC 2019-01-04 21:18:55 -05:00
Marco Z
09ed8bd046 Add LibGME to DD vc10 project 2019-01-04 20:43:45 -05:00
Marco Z
88c4a54cea Add GME to VC10 SRB2SDL project 2019-01-04 20:43:42 -05:00
Digiku
d5870e6f8a 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
c97dc5d3c4 Increase M_ChangecontrolResponse message buffer by 25 chars 2019-01-04 19:38:36 -05:00
mazmazz
87c015e340 MUS_MODPLUG fix 2019-01-04 18:39:09 -05:00
mazmazz
69965b8d98 Flip HAVE_OPENMPT on by default for non-Windows makefile 2019-01-04 01:48:04 -05:00
mazmazz
1bfc4c02e4 CMake fixes for OpenMPT 2019-01-03 21:17:18 -05:00
mazmazz
4a17e9ed9b Remove dynamic openmpt loading 2019-01-03 20:52:09 -05:00
Marco Z
caab60e9f0 Fix MSVC compile errors 2019-01-03 20:34:10 -05:00
Marco Z
6d2ef74b21 Add libopenmpt to VC10 project 2019-01-03 20:28:00 -05:00
mazmazz
d1534257dd Add mingw-compiled libopenmpt 0.4.0 DLLs 2019-01-03 16:07:32 -05:00
mazmazz
2e4c139551 DD Compile fixes 2019-01-02 06:48:06 -05:00
mazmazz
2bd794c006 Remove S_MusicExists lua 2019-01-02 06:26:18 -05:00
Steel Titanium
827461cc36 Support for per-map intermission music 2019-01-02 05:15:23 -05:00
mazmazz
dd856a8c89 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 05:06:09 -05:00
mazmazz
e2e345988a Add safe lua music functions 
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
 2019-01-02 04:58:03 -05:00
mazmazz
c8d338ca35 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 04:02:13 -05:00
mazmazz
1aacfee80c Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core 2019-01-02 03:47:51 -05:00
mazmazz
a851c5d7da Add libopenmpt to cmake 2019-01-02 03:45:40 -05:00
mazmazz
08812b1501 Revised MinGW Makefile logic for OpenMPT 2019-01-02 02:37:48 -05:00
mazmazz
953f5b6297 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:15:29 -05:00
mazmazz
109dd70a53 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-02 02:15:16 -05:00
mazmazz
6166fad045 Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt 2019-01-02 02:14:49 -05:00
mazmazz
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
Jimita the Cat
c3d69a8a04 Merge branch 'flashpals-on-screenshots' of https://github.com/monster-psychic-cat/SRB2 into flashpals-on-screenshots 2019-01-02 01:02:14 -03:00
Jimita the Cat
892e650712 dumb 2019-01-02 01:01:57 -03:00
Alam Ed Arias
819e4ef2ae Merge branch 'master' into next 2019-01-01 23:00:39 -05:00
Jimita
8fdff96733
Merge branch 'next' into flashpals-on-screenshots 2019-01-02 01:55:59 -02:00
Jimita the Cat
e765b9400c Add support for flashpals in screenshots 2019-01-02 00:41:52 -03:00
Digiku
393c64b8bc 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
5278d1ca20 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
bbd878e520 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
mazmazz
7916e020d2 Fix loop_point and song_length floating point comparisons 2019-01-01 10:47:16 -05:00
mazmazz
b7bb570f97 Merge remote-tracking branch 'public-gl/master' into public-musicplus-core 2019-01-01 10:41:40 -05:00
mazmazz
d61eb7edee Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config 2018-12-31 01:43:47 -05:00
mazmazz
78fa72514f Implement deployer scripts for Travis -- OSX and Linux package building 2018-12-30 15:22:50 -05:00
Steel Titanium
0ebe5b258c Inclue PNG file 2018-12-29 23:10:45 -05:00
Steel Titanium
a7b96ab83d Update XPM icon 2018-12-29 22:52:04 -05:00
mazmazz
3d2e58861d Rename M5 to ARCHOPTS; allow override by command line 2018-12-29 21:55:35 -05:00
mazmazz
4cfacf5cde 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
80e30c6aaa 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
d048e7cbec Don't set if LINUX64 is defined 2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876 Stupid restrictions 2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26 More explict check 2018-12-27 18:54:10 -05:00
Steel Titanium
6dddf61265 Target nocona for 64-bit builds 2018-12-27 00:56:33 -05:00
james
0b857f127f Update capslock state on window re-focus 2018-12-26 15:49:57 -08:00
Digiku
da9447342c 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
ebb4c65d92 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
60bdc056f8 Also hide Chat Options if NONET 2018-12-26 16:41:39 -05:00
mazmazz
894c139bf1 Update code versions to 2.1.23 2018-12-26 16:31:43 -05:00
mazmazz
814db7e371 Hide SRB2-CHAT behind #ifndef NONET 2018-12-26 16:20:17 -05:00
Steel Titanium
4f18ec60bc Fix saving progress on vanilia 2018-12-26 15:47:12 -05:00
mazmazz
fa6f791ec3 Fix -ANGLE_180 because MSVC complains 
-ANGLE_180 evaluates equal to ANGLE_180.
 2018-12-25 01:14:05 -05:00
mazmazz
73a67fc9f5 Merge branch 'ctf-enemy-flag-sound' into 2122-version 2018-12-25 00:27:08 -05:00
mazmazz
842bcfc8a0 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-25 00:19:45 -05:00
mazmazz
a626660564 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-25 00:19:42 -05:00
mazmazz
0b81debf94 Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix 2018-12-25 00:09:24 -05:00
mazmazz
82a40f0dba Support Look Up/Down keys for NiGHTS movement 2018-12-24 23:48:03 -05:00
mazmazz
b7edc7f870 Revert "Merge branch 'side-discolor-fix' into 'master'" 
This reverts commit e721a3d882, reversing
changes made to 4656a0d02c.
 2018-12-24 20:58:26 -05:00
mazmazz
bfc501a271 Revert default console backcolor to green; changed from CHAT commit 2018-12-24 20:57:11 -05:00
Digiku
cb42702e6b Merge branch 'float-compare-colormap-fix' into 'master' 
Fix float comparison for colormap maskamt

See merge request STJr/SRB2!428
 2018-12-24 20:55:06 -05:00
mazmazz
10a3e3fec9 Define EPSILONs only if not already defined 
Fixes OSX buildbot
 2018-12-24 20:36:28 -05:00
mazmazz
c65f44e805 Remove log message 2018-12-24 20:33:59 -05:00
mazmazz
e9e5128754 Use DBL_EPSILON for colormap comparison 2018-12-24 20:22:10 -05:00
Alam Ed Arias
4651eddc36 Merge branch 'master' into next 2018-12-24 20:15:45 -05:00
mazmazz
58728ec358 Fix float comparison for colormap maskamt 2018-12-24 19:58:05 -05:00
mazmazz
32697ddf61 Fix gcc 8 compile by using strcpy instead of memcpy for PM 2018-12-24 18:51:11 -05:00
mazmazz
7fc79f0b88 Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-24 17:31:03 -05:00
mazmazz
c2dc5788bf Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-24 17:30:59 -05:00
Jimita
4c6334f459 cleanup 2018-12-24 17:21:33 -05:00
Digiku
f06fd4149d Merge branch 'polyobject-crush-fix-waypoint' into 'next' 
Polyobject crush fix by waypoints [by TehRealSalt]

See merge request STJr/SRB2!426
 2018-12-24 17:01:06 -05:00
Alam Ed Arias
c8f4d125b4 Merge branch 'master' into next 2018-12-24 16:56:29 -05:00
Digiku
be9a04e489 Merge branch 'disablespeedadjust-fix' into 'next' 
Disablespeedadjust fix

See merge request STJr/SRB2!425
 2018-12-24 16:31:19 -05:00
TehRealSalt
878b1b2d16 Fix move by waypoints not checking for sector changes 
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.

If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
 2018-12-24 14:39:07 -05:00
Monster Iestyn
31c6b6ef77 remove these unnecessary typedefs for assignments to variables that are actually already boolean to begin with, since the rhs resolves to a boolean anyway 2018-12-24 19:37:52 +00:00
Monster Iestyn
936b9ecebc Fix disablespeedajdust in SOCs being set like an integer value instead of a boolean 2018-12-24 19:29:54 +00:00
Monster Iestyn
01588ea967 Fix bot players using the respawning code meant only for real players to use 2018-12-24 17:59:12 +00:00
Nev3r
caaacf3f76 Fixed the shield spawn/special hook cases on the hook add switch. 
They basically work now.

Signed-off-by: Nev3r <apophycens@gmail.com>
 2018-12-24 17:31:00 +01:00
Digiku
47a810decb Merge branch 'EOL' into 'master' 
fix EOL on src/p_enemy.c

See merge request STJr/SRB2Internal!208
 2018-12-24 01:33:03 -05:00
mazmazz
e708f750a0 Remove inline from ST_drawWeaponSelect() to fix 32-bit compile 
large-function-growth limit reached
 2018-12-24 01:26:22 -05:00
mazmazz
ac9cb59de9 Do not increment mainwads for music.dta 2018-12-23 23:54:26 -05:00
mazmazz
9d1bc3063f Play flag-returned SFX for the opposing team 2018-12-23 22:57:14 -05:00
Steel Titanium
cb13ace77e Merge branch 'master' into sdl-autograb 2018-12-23 22:35:44 -05:00
mazmazz
ed410575d6 Only SetWindowGrab if !disable_mouse; toggle cursor visibility 2018-12-23 22:09:16 -05:00
Steel Titanium
46d1a866d8 Another attempt to lock the mouse 2018-12-23 18:54:15 -05:00
mazmazz
cb01ebebed Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-23 18:09:54 -05:00
mazmazz
83a6f5d6ae Merge remote-tracking branch 'public-gl/master' into 2122-version 2018-12-23 18:09:17 -05:00
mazmazz
c0a0c5ac5d Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-23 18:09:14 -05:00
Digiku
d72e3fe71c Merge branch '2122-patch-dta-update' into '2122-version' 
Changes related to 2.1.22 patch.dta update

See merge request STJr/SRB2!417
 2018-12-23 18:08:38 -05:00
Digiku
8d56c2f486 Merge branch 'addons-backport' into '2122-version' 
Addons Menu backport to vanilla

See merge request STJr/SRB2!384
 2018-12-23 18:08:06 -05:00
Digiku
fa36b8f5a2 Merge branch 'menu-mpjoy-fix' into '2122-version' 
Menu: Fix joystick events causing the player to move during multiplayer system menu [2122-version]

See merge request STJr/SRB2!420
 2018-12-23 18:06:27 -05:00
mazmazz
2b8cdc0381 Revert "Revert "Merge branch 'menu-mpjoy-fix' into 'next'"" 
This reverts commit c0c05043e6.
 2018-12-23 18:04:01 -05:00
mazmazz
c0c05043e6 Revert "Merge branch 'menu-mpjoy-fix' into 'next'" 
This reverts commit b5d4bb3530, reversing
changes made to 2d675750cf.
 2018-12-23 17:57:50 -05:00
Digiku
b5d4bb3530 Merge branch 'menu-mpjoy-fix' into 'next' 
Menu: Fix joystick events causing the player to move during multiplayer system menu

See merge request STJr/SRB2!414
 2018-12-23 17:55:02 -05:00
Digiku
7a64e3d1a8 Merge branch 'SRB2-CHAT' into '2122-version' 
Chat and other multiplayer quality of life improvements.

See merge request STJr/SRB2!398
 2018-12-23 17:53:54 -05:00
Digiku
402860dc06 Merge branch 'loadconfig-defaultcontrols' into 'master' 
Reset default controls for LOADCONFIG command

See merge request STJr/SRB2!403
 2018-12-23 17:14:34 -05:00
Latapostrophe
b7d7472a88 Merge branch 'next' into SRB2-CHAT 2018-12-23 22:53:24 +01:00
Monster Iestyn
2d675750cf fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c 2018-12-23 21:52:49 +00:00
mazmazz
f55623ef9c Clear all control keys before loading defaults in LoadConfig 2018-12-23 14:59:26 -05:00
Steel Titanium
40a037f603 A more through out attempt to lock the mouse 2018-12-23 14:54:14 -05:00
mazmazz
f600c5fee0 Credits update 2018-12-23 14:41:41 -05:00
mazmazz
8f596376a9 Merge branch '2122-version' into execversion-filtercontrols 2018-12-23 14:30:24 -05:00
mazmazz
3277cf6976 Add JOY10 default to gc_centerview 2018-12-23 14:29:54 -05:00
mazmazz
dd4c7b539f Fix joy button default override when filling keynum2 with default 2018-12-23 14:29:10 -05:00
Latapostrophe
db8e1c0393 Fix the chat being displayed in singleplayer if there are stillmessages 2018-12-23 10:50:36 +01:00
Latapostrophe
11f44f7ce9 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-23 10:30:37 +01:00
Latapostrophe
1b61e15b1b Merge branch 'master' into SRB2-CHAT 2018-12-23 10:26:08 +01:00
mazmazz
3703a032f0 Buildbot fixes 2018-12-23 03:39:27 -05:00
mazmazz
7fb73cf2da New patch.dta hash for 2.1.22 2018-12-23 03:22:32 -05:00
mazmazz
aa77038dfc Add chat_on to non-key move event checks 2018-12-23 03:21:32 -05:00
mazmazz
6ebc41a554 Check target < MAXPLAYERS before PM 2018-12-23 02:25:58 -05:00
mazmazz
ec53032310 Fix mainwads check in d_main 2018-12-23 00:29:59 -05:00
mazmazz
31cfa255f2 Merge branch '2122-version' into 2122-patch-dta-update 2018-12-22 23:50:31 -05:00
mazmazz
e3d106d527 Merge remote-tracking branch 'public-gl/2122-version' into 2122-version 2018-12-22 23:42:25 -05:00
mazmazz
b49cf11fb6 Merge remote-tracking branch 'public-gl/next' into 2122-version 2018-12-22 23:41:55 -05:00
mazmazz
33434395f7 Add SRB2 Community Contributors to Special Thanks 2018-12-22 23:41:43 -05:00
mazmazz
8723eb9aa2 Merge remote-tracking branch 'public-gl/next' into 2122-patch-dta-update 2018-12-22 23:34:24 -05:00
Steel Titanium
66e13cf1cc SDL:Auto grab input 2018-12-22 23:28:59 -05:00
mazmazz
94858aedfe Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 23:20:01 -05:00
mazmazz
a9fb17dab1 Revert "Extend HU_FONTSTART to STCFN022 (from 2.2)" 
This reverts commit 6400729034.
 2018-12-22 22:40:58 -05:00
mazmazz
56320a35ce Use TinyFont for chat arrows 2018-12-22 22:40:04 -05:00
mazmazz
6400729034 Extend HU_FONTSTART to STCFN022 (from 2.2) 2018-12-22 21:48:24 -05:00
mazmazz
e0176670f4 Correct splitscreen check in OLDCHAT 2018-12-22 21:30:39 -05:00
mazmazz
7e9411f320 Minor code cleanup, CHAT 2018-12-22 21:17:01 -05:00
Alam Ed Arias
7285f9ff1d Netcode: handle NULL in addrinfo lookup 2018-12-22 21:06:13 -05:00
mazmazz
a66a2021ba Draw up and down arrows by string 2018-12-22 20:57:53 -05:00
mazmazz
fb3722a6f3 Accommodate Kart splitscreen code for CHAT via #define NETSPLITSCREEN 2018-12-22 20:52:32 -05:00
Alam Ed Arias
0ed9665a79 Added static library of SDL2 and SDL2_mixer for ARM systems 2018-12-22 20:48:15 -05:00
mazmazz
0f0e30924f One more free(nodenum) 2018-12-22 20:35:12 -05:00
mazmazz
5badc11159 Fix integer overflow on for loop decrements 2018-12-22 20:18:25 -05:00
Alam Ed Arias
102fd11cb4 More work to cleanup the ARM builds 2018-12-22 19:50:32 -05:00
Alam Arias
c5ec1e30a4
Merge pull request #391 from monster-psychic-cat/sw_largeroomfix 
Large room fix
 2018-12-22 19:48:08 -05:00
Alam Ed Arias
4265be776c Merge branch 'master' into next 2018-12-22 19:36:32 -05:00
Alam Arias
194f9ea8c0
Merge branch 'next' into sw_largeroomfix 2018-12-22 19:34:22 -05:00
Latapostrophe
c7060aa5ad Remove mute boolean from playermsg hook, fix username stuff still being there, potential memory leaks, and added back the ip message. 2018-12-22 16:44:58 +01:00
Latapostrophe
619dd9d08a Fixed various issues: added some free()s, lua_optboolean, other things, and also made sure chat can't send empty messages. 2018-12-22 12:34:17 +01:00
mazmazz
8707b2f40a Center window on current monitor during vidmode change 2018-12-22 01:43:58 -05:00
mazmazz
cb619e0353 Don't create movement events from joy or mouse when menu is active 2018-12-22 01:20:24 -05:00
TehRealSalt
1291d35e08 Don't allow non-keyboard keys to screenshot/gif in menus 2018-12-22 00:39:32 -05:00
Steel Titanium
10521d161c Fix various bugs with the chat. 2018-12-21 22:28:28 -05:00
Steel Titanium
e42bcd5b68 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into latsrb2chat 2018-12-21 20:29:33 -05:00
Alam Arias
b6a917cda1 Added ARM/ARM64 to whole vc10 sln 
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
 2018-12-21 16:47:10 -05:00
Monster Iestyn
a72d79da54 Merge branch 'master' into next 2018-12-21 17:41:19 +00:00
mazmazz
90832938c9 Re-order Special Thanks -- groups first, then names in ABC order 2018-12-21 11:40:35 -05:00
mazmazz
06ff171e19 Adjust vid.width floating point comparson for CHAT 2018-12-21 11:37:22 -05:00
mazmazz
e20c70d5fb Skip setting control if keynum is -1 (for KEY_PAUSE) handling 2018-12-20 18:27:44 -05:00
Digiku
41a25a68c9 Merge branch '2122-credits-update' into 'next' 
Add sirjuddington and CodeImp to Special Thanks credits

See merge request STJr/SRB2!409
 2018-12-20 18:06:08 -05:00
mazmazz
f1fea30045 Properly restrict EXECVERSION from cvar updates 2018-12-20 17:56:51 -05:00
mazmazz
f66ee8c4cd Add sirjuddington and CodeImp to Special Thanks credits 2018-12-20 17:27:25 -05:00
mazmazz
9be1ee4ac7 Hardcode define MAJOREXECVERSION to MODVERSION 2018-12-20 17:16:04 -05:00
mazmazz
6affe807e8 Merge branch '2122-version' into 2122-execversion 2018-12-20 17:14:53 -05:00
Digiku
58a2cec70f Merge branch 'float_equal' into 'master' 
Clear Float equal warnings

See merge request STJr/SRB2!383
 2018-12-20 16:58:37 -05:00
Jimita
2b59cfa63f
Merge branch 'next' into sw_largeroomfix 2018-12-20 19:58:16 -02:00
Jimita
b68e01cb2b
Merge branch 'next' into sw_largeroomfix 2018-12-20 19:57:38 -02:00
Digiku
9525de2d83 Merge branch 'camera-backport' into 'next' 
Suggestion: 2.2 camera changes backport

See merge request STJr/SRB2!393
 2018-12-20 16:57:23 -05:00
Digiku
28c8ad3dbb Merge branch 'jump-spin-axes' into 'next' 
Feature: Jump/Spin axes

See merge request STJr/SRB2!389
 2018-12-20 16:57:05 -05:00
Digiku
75e570f2b4 Merge branch 'joy-jump-defaults' into 'next' 
Assign joy button defaults for 1 and 2 player

See merge request STJr/SRB2!400
 2018-12-20 16:56:09 -05:00
Digiku
50221c47e9 Merge branch 'menu-2pcontrols-fix' into 'master' 
Fix 2p control menu graying out

See merge request STJr/SRB2!407
 2018-12-20 16:54:52 -05:00
Jimita
2bdf56804c
Merge branch 'next' into sw_largeroomfix 2018-12-20 19:53:24 -02:00
Digiku
f405f1ae30 Merge branch 'cmake-dllpath-fix' into 'master' 
Update CMake paths for Windows DLLs

See merge request STJr/SRB2!406
 2018-12-20 16:53:06 -05:00
MPC
9d93f54b67 bland 2018-12-20 18:52:51 -03:00
mazmazz
0519d8c52d Update CMake paths for Windows DLLs 2018-12-20 16:46:40 -05:00
mazmazz
fe5001a38a Dummy out 2p pause, system menu, talk, and scores buttons because grayed out in-menu 2018-12-20 16:40:59 -05:00
mazmazz
b57204fc12 Fix 2p control menu graying out 2018-12-20 16:38:58 -05:00
mazmazz
6f8b126586 Add G_FilterKeyByVersion() to setcontrol 2018-12-20 16:30:37 -05:00
MPC
fcb65951b8 change implementation of square root 2018-12-20 17:37:06 -03:00
Jimita
5b285a60a2
Update r_segs.c 2018-12-20 16:15:19 -03:00
Jimita
ffd5061531
Merge branch 'next' into sw_largeroomfix 2018-12-20 16:56:05 -02:00
Monster Iestyn
76fe78571e fix ffloor.toppic/bottompic to be consistent in behavior with sector.floorpic/ceilingpic 2018-12-20 16:47:17 +00:00
Monster Iestyn
dfbbab35f4 Merge branch 'master' into next 2018-12-20 16:41:21 +00:00
mazmazz
e2b8ff26db Fix lua_pop -> lua_remove use in G_SetCustomExitVars lua 2018-12-20 10:56:36 -05:00
Digiku
dd107724de Merge branch 'lua-nextmapoverride' into 'next' 
Lua: nextmapoverride & skipstats changing outside of G_ExitLevel

See merge request STJr/SRB2!396
 2018-12-20 10:55:30 -05:00
mazmazz
71da6836c0 Reset default controls for LOADCONFIG command 2018-12-20 10:13:43 -05:00
mazmazz
04916edc07 Update EXECVERSION to MODVERSION 27 2018-12-20 04:03:35 -05:00
mazmazz
9d212b340b Update code versions to 2.1.22 2018-12-20 02:35:27 -05:00
Digiku
25f0dc7eae Merge branch 'version-string-develop' into 'master' 
Add DEVELOP build flag to version string

See merge request STJr/SRB2!401
 2018-12-20 02:28:21 -05:00
mazmazz
7f8d16d3cd Add DEVELOP build flag to version string 2018-12-20 02:27:30 -05:00
mazmazz
60bcf92525 Adjust execversion retrieval in CV_FilterVarByVersion 2018-12-20 02:18:59 -05:00
mazmazz
969960a1eb Adjust EXECVERSION define scheme* MAJOREXECVERSION and MINOREXECVERSION* GETEXECVERSION(major, minor) macro 2018-12-20 02:18:11 -05:00
mazmazz
ed7178bca4 Assign joy button defaults for 1 and 2 player 2018-12-20 01:47:35 -05:00
Digiku
722ceb5285 Merge branch 'pk3-stray-blockmap-msg' into 'master' 
Comment out stray PK3 blockmap message

See merge request STJr/SRB2!399
 2018-12-20 01:11:44 -05:00
mazmazz
78501dcd0c Comment out stray PK3 blockmap message 2018-12-20 01:11:07 -05:00
Digiku
223257e237 Merge branch 'using-offsetof' into 'next' 
Use the `offsetof` function

See merge request STJr/SRB2!394
 2018-12-19 21:53:37 -05:00
Alam Ed Arias
e5e978f8bd Merge branch 'master' into next 2018-12-19 13:20:54 -05:00
Digiku
7982b1695a Merge branch 'ogl-zfighting-fix' into 'master' 
OpenGL z-fighting fix [by Azeonus]

Closes #43

See merge request STJr/SRB2!395
 2018-12-19 13:05:04 -05:00
Digiku
bea76aa4bf Merge branch 'save-override' into 'next' 
Feature: Save override for level header

See merge request STJr/SRB2!392
 2018-12-19 13:04:41 -05:00
Digiku
4c69fe23f6 Merge branch 'kart-luatextures-backport' into 'next' 
Lua: Kart textures backport (non-foolish vers)

See merge request STJr/SRB2!391
 2018-12-19 13:04:24 -05:00
Latapostrophe
387173ea89 Merge branch 'SRB2-CHAT' of https://git.magicalgirl.moe/SinnamonLat/SRB2 into SRB2-CHAT 2018-12-19 16:50:49 +01:00
Latapostrophe
a31b85e124 Some messages relevant to discussions now go in the chat. 2018-12-19 16:44:57 +01:00
mazmazz
96cad09db6 Change 0.05 to 0.05f 2018-12-18 16:59:59 -05:00
Azeonus
67cd6dcdd2 dispoffset OGL fix [by Azeonus] 2018-12-18 16:50:03 -05:00
TehRealSalt
42a9e66883 Let lib_gExitLevel call lib_gSetCustomExitVars, for reduced code duplication. 2018-12-18 15:03:54 -05:00
TehRealSalt
0e34e7f32f G_SetCustomExitVars for setting nextmapoverride & skipstats 
This is desparately needed for KIMOKAWAIII, since there's many instances I need to change nextlevel but still want to use the existing player exit stuff.
 2018-12-18 14:48:04 -05:00
Alam Arias
b62e6ee909
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 14:11:43 -05:00
Alam Ed Arias
d5c7ca1d23 Merge branch 'master' into next 2018-12-18 14:05:07 -05:00
Alam Arias
056cfe71a4
Merge pull request #373 from monster-psychic-cat/sw_planefixes 
Software plane fixes
 2018-12-18 14:02:21 -05:00
Alam Arias
afecb2fc85
Merge branch 'next' into the_second_remote_view_camera_fix 2018-12-18 13:57:48 -05:00
TehRealSalt
03a4bd8f53 Revert default changes 
Digiku said they'd handle the new button defaults so \m/
 2018-12-18 12:55:05 -05:00
Latapostrophe
9f17039e2e Merge branch 'srb2chat' into 'SRB2-CHAT' 
fix my fucking code

See merge request SinnamonLat/SRB2!1
 2018-12-18 11:51:18 -05:00
mazmazz
1fcf607b41 Fix strncpy nodenum length overflow 2018-12-17 21:31:00 -05:00
mazmazz
876ddd48f1 Change int to INT32 2018-12-17 19:09:05 -05:00
mazmazz
bf21b7c483 Mixed D&C fixes for HU_DrawTeamTabRankings 2018-12-17 19:03:09 -05:00
mazmazz
7a92c9d3d0 Mixed D&C fixes; replace a couple int's with INT32 2018-12-17 19:02:22 -05:00
mazmazz
245a125551 Fix compile errors 2018-12-17 18:55:21 -05:00
Monster Iestyn
bd58ff8c49 Merge branch 'frame-backslash-fix' into 'next' 
Accept '+' as substitute for '\' for sprite frames (PK3)

See merge request STJr/SRB2!380
 2018-12-17 17:34:41 -05:00