lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
2497 commits 1 branch 29 tags 122 MiB
Commit graph

2497 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
toasterbabe 0d49d4ba3f Fixed seed spawning not properly accounting for reverse gravity. 2017-01-02 14:00:03 +00: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
toasterbabe 3f92a2305a * Modified MT_SEED to have aesthetically nicer behaviour. 
* Removed Soniccd command, as flicky selection involves a P_RandomKey call - this messes with replays and demos.
 2017-01-01 21:54:30 +00:00
toasterbabe df88d888e6 Prevented Mario mode from bailing out P_InternalFlickySpawn. What's the point? Goombas don't call A_FlickySpawn... 2017-01-01 18:16:21 +00: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
toasterbabe 6ed8d99b48 * Added "Flickylist = DEMO" option, creating the five species of flicky similar enough in appearance to the Freed Animals from the days of yore. 
* Set the default flicky group to be equivalent to Flickylist = Demo.
* Refactored a little. (This also removed a crash-causing typo in a Z_Free in P_ClearSingleMapHeaderInfo.)
 2017-01-01 16:57:07 +00:00
toasterbabe 21b316e9a4 Made the flicky turning-around-when-hitting-walls work better and not take up another struct variable which a user of A_FlickyCheck might not want taken. 2017-01-01 16:42:39 +00:00
toasterbabe f8d37e5df7 fix commenting and indentation that was rushed for new years 2017-01-01 00:39:33 +00:00
toasterbabe be140d8143 Added "Flickylist = All" option. 
Couldn't get it to default to anything - it was causing crashes, and new years is in ten minutes, so let's do that tomorrow.
 2016-12-31 23:47:47 +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
toasterbabe 311886e582 * Ported in all of the Flickies from flickiesreduced8.wad except for the Flicker and seed. 
* Fixed a crash bug in the Flicky fly function I introduced sleepily last night.
 2016-12-31 16:55:06 +00:00
toasterbabe d3a70eb1db * All Flicky A_ functions ported. 
* Corrected MT_EGGSHIELD spawning a flicky.
* New compared to the Lua implementation: Flickies turn around when they hit walls!
 2016-12-30 19:16:20 +00:00
toasterbabe bf8bff82ba * MT_EGGTRAP (egg capsule center mobj) converted over to flickylist system. 
* MT_EXPLODE's anims partially FF_ANIMATE'd.
* A_FlickySpawn turned into a wrapper for internal function that does what A_FlickySpawn did but returns a pointer to the spawned flicky.
 2016-12-30 14:04:04 +00:00
toasterbabe d9177f778f * Made what MI had compile. 
* Added the ability to read in mobjtypes as well as from a short list of flicky constants.
* Added a new state, S_XPLD_FLICKY, which is the new deathstate of all badniks.
* Put the disabled animal-spawn-on-P_KillMobj behind a #define.
* Renamed the branch and associated properties to something not rife with sin.
 2016-12-29 17:02:05 +00:00
Monster Iestyn 7711f64eb7 Whoops forgot to commit this extra thing I was doing (just disables the old code for animal spawning) 2016-12-27 21:14:19 +00:00
Monster Iestyn cecc1912fe Starting work on adding new system for spawning animals; added A_FlickySpawn and level header "animallist"/"flickylist" parameter 
No idea if this compiles yet (let alone if what is there works at all), just getting this out the way so I can work on certain other things *cough plane displacement cough*
 2016-12-27 21:01:20 +00:00
Inuyasha 8fb9a3b3d5 Ignore modifier keys in chat 
(Fixes LSHIFT typing D repeatedly into chat)
 2016-12-26 21:32:35 -08:00
toasterbabe 4a53d96099 * Fixed changing skins during differing-length sprite animations resulting in sprite errors. 
* Added PF_BOUNCING to a place where it would likely be wanted.
 2016-12-26 18:36:57 +00:00
toasterbabe 2ba3afaeda Implemented unique attract shield sound (patch.dta). 2016-12-26 13:02:26 +00:00
toasterbabe 90758b47ec * Limit spawning of endsign head to if a sprite for it exists. 
* Rearrange colouropposite so lavender's opposite is crimson, considering gamegear.
 2016-12-25 22:20:20 +00:00
toasterbabe 877065250e Some NiGHTS change oversights I forgot to correct before. 2016-12-25 19:56:33 +00:00
toasterbabe 5164ee7fc9 Fun gameplay tweak: Turn CA_FLOAT into a limited CA_SLOWFALL when moving slowly, to double down on it being for speedrun characters and punishing slowing down. Rob-approved. 2016-12-24 22:23:34 +00:00
toasterbabe 578b809557 * Turned CA_DASHMODE into SF_DASHMODE. 
* SF_DASHMODE users can now dash on water.
* Gave CA_HOVER its own states/sprite2s.
* Gave Super Sonic's hover his own hover-run state/sprite2.
 2016-12-24 20:57:39 +00:00
toasterbabe 102f26182b * Tweaks to CA_BOUNCE. 
* Tweaks to drowning number placement for altered sizes.
 2016-12-24 14:23:11 +00:00
toasterbabe f60233027d On Rob's suggestion: Allow your controls to turn CA_BOUNCE users to turn on a dime when coiling for the next bounce. 2016-12-24 13:31:23 +00:00
toasterbabe 942065ba9f * CA_BOUNCE users now play animation/sound when bouncing on enemies, monitors. 
* CA_BOUNCE users harmlessly bounce off Sharps.
 2016-12-24 13:17:53 +00:00
toasterbabe b84ad05061 Okay, failed experiment fixed. (This has nothing to do with the ability to pierce bustable FOFs, I just modified it for kicks to see what would happen.) 2016-12-24 00:12:29 +00:00
toasterbabe a61f5e4521 * CA_BOUNCE can now break downwards. 2016-12-23 23:58:12 +00:00
toasterbabe 0a7fe9569d * Fixed issue where CA_BOUNCE users can harmlessly bounce on deathpits (and not Cakewalk style!) 
* Minor quality-of-life improvements to CA_BOUNCE handling.
 2016-12-23 23:13:31 +00:00
toasterbabe 10a137620a First commit, CA_BOUNCE almost completed. 2016-12-23 17:31:07 +00:00
Inuyasha 37c8ef6369 Merge branch 'public_next' of http://git.magicalgirl.moe/STJr/SRB2Internal 2016-12-22 17:46:39 -08:00
Inuyasha f326b3cbf9 Merge branch 'next' of http://git.magicalgirl.moe/STJr/SRB2 into public_next 2016-12-22 17:45:51 -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