Commit graph

1672 commits

Author SHA1 Message Date
Alam Ed Arias
0b572b6eee CMake: split inline AMS code from vid_copy.s code 2017-01-06 15:48:19 -05:00
Monster Iestyn
5e12f3497a Merge branch 'flat-changing-hotfix' into 'next'
Flat changing hotfix

This should fix how Lua scripts that change flats in levels, particularly to flats that don't already exist in the level, cause SRB2 to crash for anyone who joins a netgame afterwards. (I'm not sure if it's a consistent thing or not though)

Probably needs a good test to verify the issue is completely fixed before being merged in. Maybe there are other minor things I didn't account for in this fix? I don't know!

See merge request !141
2017-01-05 19:46:44 -05:00
Monster Iestyn
f2a58a74ef Stupid me 2017-01-03 22:48:06 +00:00
Monster Iestyn
4d8ca41e65 Fix player colors mysteriously turning red if a resynch occurs outside of CTF/Team Match. Not technically a $$$.sav fix, but still netplay related of course
At least, I assume this is how it's happening for some, I haven't been able to get the full info since WHERE IS EVERYBODY?
2017-01-03 22:43:46 +00:00
Monster Iestyn
b768c4b961 Sync sector tags and tag list variables properly
Dunno who thought it was a good idea to lump tag, nexttag and firsttag together in $$$.sav, but that meant changing sector tags caused SRB2 to stop responding since it lead to the tag lists being broken
2017-01-03 20:48:39 +00:00
Monster Iestyn
a0d095e707 Fix sector floordata/ceilingdata/lightingdata pointers not being NULL when they should be
This fixes ERCZ's lava falls not moving after joining a netgame at that stage. Possibly explains other various floor/ceiling related netgame quirks that haven't been noticed until now, maybe even in multiplayer levels.
2017-01-03 18:47:46 +00:00
Monster Iestyn
be21588761 Merge branch 'master' into next 2017-01-03 16:06:50 +00:00
Monster Iestyn
5400707aa7 Merge branch 'remove-secplanes' into 'master'
Remove secplanes

This is just removing SSNTails's old port of ZDoom's secplane code and math, from back when he attempted slopes himself. The slopes we've had since 2.1.15 however do not need these, so we can pretty much toss the code for them out now (nothing uses them anyway).

See merge request !149
2017-01-03 11:05:13 -05:00
Logan-A
40c8328eae Merge pull request #151 from LJSonik/netcode-shit
Netcode shit
2017-01-02 15:54:33 -05:00
Logan-A
eb8f608fd7 Merge branch 'master' into netcode-shit 2017-01-02 15:18:28 -05:00
Monster Iestyn
d5803160dd Remove all traces of SSN's old port of ZDoom's secplanes for slopes, since our slopes do not need them 2017-01-02 19:12:09 +00:00
toasterbabe
a4fe3580e2 Forgot to commit this compiling fix. 2017-01-02 19:07:20 +00:00
toasterbabe
eb22f347f3 Made Eggscalibur use mobj->watertop instead of mobj->spawnpoint->z because that's not netgame-safe.
CEZ3 STILL has some ridiculous inconsistencies, but this is one less to worry about.
2017-01-02 19:04:33 +00:00
Louis-Antoine
04747ff79e Fixed a memory leak on client side 2017-01-02 20:02:49 +01:00
Monster Iestyn
c1392cee25 Merge branch 'master' into next 2017-01-02 18:09:23 +00:00
Monster Iestyn
6d07c6baab Merge branch 'fixedrounding-hotfix' into 'next'
FixedRounding hotfix

Fix the FixedFloor, FixedTrunc, FixedCeil, and FixedRound functions.

See merge request !142
2017-01-02 13:05:30 -05:00
Monster Iestyn
853f1f5a1f Merge branch 'savegame-hotfix' into 'next'
Savegame hotfix

This fixes the first mobj thinker added/read from $$$.sav not being relinked to other objects as their target/tracer/etc properly. In particular, this fixes Brak's electric shield disappearing for anyone joining a netgame playing ERCZ (as Brak happens to be the first object added/read in this case, and Brak is the shield's target).

See merge request !146
2017-01-02 00:03:51 -05:00
Louis-Antoine
478da43660 Cooked another cookie 2017-01-01 23:52:27 +01:00
Louis-Antoine
4373afcdb2 Cooked a cookie 2017-01-01 23:27:06 +01:00
Louis-Antoine
b347b818e7 -Fixed broken net commands, thus fixing (or at least greatly improving) chat/commands/joins/leaves and possibly other annoying bugs
-Updated packet name list so the debug file no longer shows garbage packet names
-Replaced byte values with actual net command names in the debug file. Only the first net command in a packet will be shown though
-Added a MOBJCONSISTANCY define that makes the game takes all revelant mobjs to be counted in the synch seed
-Added a PACKETDROP define that adds two console commands "drop" and "droprate" to simulate bad internet by dropping packets
-Added/changed comments here in there in the netcode
-Fixed a minor error that would ignore one of the urgent ack slots
-Added a space between the map name and "zone" for the messages shown in a joiner's console
2017-01-01 23:07:34 +01:00
Monster Iestyn
0e6e52eabe Start mobjnums at 1 instead of 0, so that the first found mobj can be relinked as a target etc to other mobjs properly
This fixes Brak's electric barrier disappearing for joiners to ERZC. There seems to be some issues with the lava falls there too I've found, but the electric barrier actually stays around now at least
2017-01-01 17:03:13 +00:00
Monster Iestyn
6ca806a8c0 Fix FOF lighting being stupid with repeating midtextures. 2016-12-31 20:44:16 +00:00
Louis-Antoine
d4f153d3ca Random changes in the netcode lol 2016-12-31 19:26:33 +01:00
Inuyasha
8fb9a3b3d5 Ignore modifier keys in chat
(Fixes LSHIFT typing D repeatedly into chat)
2016-12-26 21:32:35 -08:00
Inuyasha
f4b0591174 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into pub_next 2016-12-22 17:44:28 -08:00
Alam Ed Arias
97f87827f4 hardware: init undef vars in HWR_SortVisSprites 2016-12-22 19:42:00 -05:00
Alam Ed Arias
fca398ae4d Win32 Debugger: no need for Win32 interface code for SDL 2016-12-22 19:40:02 -05:00
Alam Ed Arias
1c16a4e670 m_aatree: add newline 2016-12-22 19:39:37 -05:00
Alam Ed Arias
fc9a86f6d2 Mingw: fixup unsigned/signed compare 2016-12-22 19:39:14 -05:00
Alam Ed Arias
0835c17dfe CB: fixup Mingw target 2016-12-22 19:36:26 -05:00
Alam Ed Arias
8f8724fced CB: added missing C/header files 2016-12-22 19:13:46 -05:00
Alam Ed Arias
a583225d79 CB: disable compiling and linking IMG_xpm.c, it was updated for SDL2 2016-12-22 19:09:08 -05:00
Alam Ed Arias
064650d93c Codeblock: fixup SDL_mixer to SDL2_mixer 2016-12-22 19:07:46 -05:00
Alam Ed Arias
b32be1b9a9 Codeblock: fixup sdl-config to sdl2-config 2016-12-22 19:03:48 -05:00
Alam Ed Arias
5c295d5733 Codeblock: fixup sdl2 to sdl 2016-12-22 18:59:18 -05:00
Alam Arias
fe3916a60d Merge pull request #147 from LJSonik/hook-optimisation
Hook optimisation
2016-12-22 18:26:49 -05:00
Monster Iestyn
d782638da8 Merge branch 'zlib_pkgconfig' into 'master'
Zlib pkgconfig

Linux build to include libgme by default

See merge request !116
2016-12-18 21:44:19 -05:00
Monster Iestyn
02b32b3f65 Merge branch 'master' into next 2016-12-17 20:01:06 +00:00
Monster Iestyn
8e56582728 Created R_CheckTextureCache to make sure midtexture/FOF walls cache their textures before choosing colfunc_2s, for software mode 2016-12-17 19:59:54 +00:00
Monster Iestyn
a9cfd12e04 Created R_GetTextureNum to make sure top/bottom/midtexture texture ids are always valid in rendering code for both software and OpenGL (and also for the Solid Midtexture effect physics code) 2016-12-16 21:38:53 +00:00
Louis-Antoine
db20bfb3c3 Generic mobj hooks are now run before mobjtype-specific mobj hooks, and player/linedef executor hooks now have their own lists 2016-12-15 21:05:54 +01:00
Alam Arias
fa8a673d3b Merge pull request #146 from mdeguzis/patch-1
readme.txt duplicated, also incorrect
2016-12-14 18:13:23 -05:00
Michael T. DeGuzis
78f5dd15b5 readme.txt dupilcated, also incorrect
readme.txt should be README.md
2016-12-14 15:07:48 -05:00
Monster Iestyn
aa82042cf8 Merge branch 'credit_switch' into 'next'
No switching skins mid-credits/custom cutscene in SP

Does what it says on the tin.

See merge request !129
2016-12-13 09:33:53 -05:00
Monster Iestyn
1ec97c242a Merge branch 'smooth_ropes' into 'next'
Smoother ropes and zoom tubes

Makes rope hangs and zoom tubes suck less. Specifically, they handle corners (and vertical height changes, ala sloped rope hangs) a LOT nicer. Ported from internal.

See merge request !139
2016-12-12 14:18:36 -05:00
Sryder
93901847d3 Fix the Fixed Rounding functions 2016-12-12 00:06:48 +00:00
Monster Iestyn
ab423f99c6 Optimising retrieval of sector_floorpic/ceilingpic
As LJSonic has pointed out, there's no need for a for loop in either case; just use sector->floorpic/ceilingpic as a levelflats index directly

(Besides, if that was to stop any out-of-bounds indexes being used, that's hardly the way to do it anyway)
2016-12-09 21:18:06 +00:00
Monster Iestyn
d294c9d15c P_NetUnArchiveWorld now uses P_AddLevelFlatRuntime instead of P_AddLevelFlat.
Also created P_CheckLevelFlat to just return the flat # from a name, since that's all P_NetArchiveWorld really needed from P_AddLevelFlat anyway
2016-12-08 21:45:25 +00:00
Alam Ed Arias
5e74318fb2 Merge branch 'master' into next 2016-12-06 17:29:43 -05:00
Monster Iestyn
64801a1a8e Merge branch 'sdl2-cleanup' into 'master'
SDL2 i_video.c code cleanup

Made some code look a bit neater, removed the need for some SDL2STUBs Fury placed, vid_info console command actually kind of has a use again, etc

See merge request !138
2016-12-06 17:18:47 -05:00