Commit graph

2109 commits

Author SHA1 Message Date
Monster Iestyn
4da3b7eac1 Merge branch 'next' into public_next 2017-05-11 22:57:45 +01:00
Monster Iestyn
55fd0aba91 Merge branch 'master' into next 2017-05-11 20:47:12 +01:00
Monster Iestyn
7185455d6a Merge branch 'jetjaw-crash-fix' into 'next'
Jet Jaw crash fix

Turns out not having MF_SHOOTABLE can cause the Jet Jaw to endlessly loop between the two states, until somehow LUA_CallAction inexplicably causes Z_StrDup to crash anyway (that one's a mystery to me, I'm not going to look into it right now). I tweaked A_JetJawChomp so this endless loop can't happen anymore.

See merge request !176
2017-05-11 15:23:56 -04:00
Monster Iestyn
435ea7dc9d Merge branch 'invalid-node-hotfix_master' into 'master'
Invalid node hotfix master

Quick hotfix to prevent `Net_CloseConnection` from crashing if the node's number is invalid.

See merge request !179
2017-05-11 15:17:31 -04:00
ZTsukei
d29586716a v 1.3.13
--------
Added that plus sign
Collision no longer affects ghosted players
2017-05-09 21:21:12 -04:00
Monster Iestyn
96c63bf95b Whoops forgot this bit too 2017-05-09 20:17:46 +01:00
Monster Iestyn
8582406dd2 prevent invalid nodes from crashing Net_CloseConnection, print a warning and return instead 2017-05-09 15:13:19 -04:00
Monster Iestyn
5950d8209f Merge branch 'next' into public_next 2017-05-08 16:24:19 +01:00
Monster Iestyn
3d5ac40d00 Merge branch 'master' into next 2017-05-08 16:17:17 +01:00
Monster Iestyn
4008cae507 Merge branch 'objs-folders-fix' into 'master'
obj folders fix

Partial backtrack of changes I made in !174. Apparently removing all the `.gitignore` files from `/objs`'s subfolders removed the only reason Git was keeping the folders alive (Git doesn't care about empty folders as it turns out). So now they have `.gitignore`s again, with a warning in each not to remove them.

See merge request !177
2017-05-08 11:16:07 -04:00
Monster Iestyn
1745966aa6 Re-add all the folders present in objs before my .gitignore changes, by adding .gitignore files again to keep them from disappearing 2017-05-08 15:54:17 +01:00
ZTsukei
1372cf55c9 Removed drown, maybe extended post-race time so it doesn't jump to results immediately
Added experimental player distance based items
2017-05-07 19:08:11 -04:00
Monster Iestyn
41130465b4 Use NF instead of normal P_SetMobjState to prevent endless looping 2017-05-07 22:21:17 +01:00
Monster Iestyn
89af58de4c Merge branch 'next' into public_next 2017-05-03 19:40:49 +01:00
Monster Iestyn
20351a103e Merge branch 'master' into next 2017-05-03 19:37:55 +01:00
Monster Iestyn
30143d2e25 Merge branch 'gitignore-stuff' into 'master'
.gitignore stuff

The following changes have been made to `.gitignore` files in the objs/ and bin/ folders:
* All the `.gitignore`s living in subfolders of objs/ have been done away with and replaced with a single `objs/.gitignore`, covering all the things that the subfolders ignored before (including depend.ped, if anyone is like me and has to remove that file manually)
* All the `.gitignore`s living in subfolders of `bin/Mingw` ignore .exes of any name, not just srb2win/srb2dd/srb2sdl. en.mo is also ignored now... or rather any .mo file (just in case). This is mostly for my own sanity and that of anyone else who uses EXENAME=[name.exe] when compiling with MinGW.

If you're not sure what `.gitignore` does exactly, as far as I'm aware it literally just tells Git what to "ignore" (or rather, not track), so anyone using Git GUI or some other Git program etc doesn't have to see changes certain files and can't accidentally commit the files or whatever.

See merge request !174
2017-05-02 22:12:37 -04:00
Monster Iestyn
b364c0186b Merge branch 'next' into public_next 2017-05-01 17:36:51 +01:00
Monster Iestyn
18fa73ba05 Merge branch 'admin-ban-fix' into 'next'
Admin ban fix

Okay, THIS time admin bans should work properly. Turns out the relevant code for banning did not properly consider the case of admins doing the banning, at least until now.

Unlike my last attempt at fixing admin bans (!165), this one would require both host and admin to have the fix exe assuming everyone else would be using 2.1.17, so I'm merging to next instead of master.

See merge request !167
2017-04-30 21:05:07 -04:00
Monster Iestyn
0dabef730d Merge branch 'allowteamchange-fix' into 'next'
Allowteamchange fix

Fixes "allowteamchange no" to actually work properly and NOT desync you from the game in most cases. You can now switch TO spectator freely (as intended it turns out), and switching FROM spectator is prohibited. The "Enter Game" menu option in Match/Tag now displays one of those blue window notices just like with "Change Teams" in CTF/Team Match if you cannot change teams right now. Everything else works as you'd expect.

The de-sync issue was originally reported here https://mb.srb2.org/showthread.php?p=789965#85

See merge request !168
2017-04-30 21:04:07 -04:00
Monster Iestyn
d7a216e192 Ignore all *.exe files and *.mo files (such as en.mo) in all bin/Mingw folders 2017-04-30 20:42:24 +01:00
Monster Iestyn
19ca1698d8 Combine all /objs/*/.gitignore files into /objs/.gitignore, make sure depend.ped is also ignored 2017-04-30 20:33:36 +01:00
Monster Iestyn
72d52547fa Merge branch 'next' into public_next 2017-04-26 16:16:57 +01:00
Monster Iestyn
058ad4df88 Merge branch 'master' into next 2017-04-26 16:15:40 +01:00
ZTsukei
1ad993236f Monster Iestyn's Falling-Rocks-On-Slope fix 2017-04-24 22:32:19 -04:00
Monster Iestyn
c16ae57f91 Merge branch 'addfile-directories-fix' into 'next'
Addfile directories fix

This is a fix for this bug: https://mb.srb2.org/showthread.php?t=42279

See merge request !166
2017-04-24 20:46:38 -04:00
Monster Iestyn
e03577d957 Merge branch 'falling-rocks-fix' into 'next'
Falling rocks fix

This fixes the rock spawners' rocks not being removed if they rolled down to the ground from a slope rather than bouncing (see https://mb.srb2.org/showthread.php?t=41963)

See merge request !162
2017-04-24 20:41:32 -04:00
Monster Iestyn
7658469c23 Merge branch 'drawfill-fix-2' into 'master'
DrawFill made not stupid

made it more consistent with other drawing functions; doesn't draw off of the sides, and doesn't ignore snapping or widths for reasons that don't make sense
(for instance: the green bar in MI's test script showed *above* the blue one in non-green resolutions in 2.1.17)

See merge request !173
2017-04-24 12:43:10 -04:00
Monster Iestyn
7f7c7c58ab Use less-than, not less-than-or-equals, since deststop is off-screen 2017-04-24 17:41:50 +01:00
ZTsukei
cdf8d793bd v1.3.11
-------
Braking no longer stops on a dime, and instead reduces your speed input. The effect is different between braking and accelerating at the same time, and braking on its own.
Increased 'driftweight' to player->kartweight*14, up from player->kartweight*12.
Changed the base drift curve formula from a range of 447 - 303, to 415 - 303. This will result in a very slightly wider drift arc at low weights. This does not effect the strength of steering while drifting.
Drifting without holding a direction now has a bonus of 0.5 frames, up from 0.
Added kartweight to the required number of drift frames, at half value. Lighter characters take up to 4 additional frames to earn blue sparks, 8 for orange.
2017-04-20 21:51:57 -04:00
ZTsukei
04432f7789 v1.3.10
-------
Accelcode now factors in forwardmove value rather than a boolean. This is used to enable clutching (or whatever you call it; accel+brake) to give its own result.
Fixed Thwomps killing players rather than crushing them.
Reverted buggy collision experiment from previous version.
2017-04-19 21:05:17 -04:00
ZTsukei
74589aaea8 v1.3.09
-------
Reverted drift timer to 52 + player->kartspeed;
Reduced weight's effect on neutral drifting by 10%
Reduced weight's effect on collision by 50%
*EXPERIMENTAL*: Inverted collision's x and y. This should shunt players to the side instead of bump them forward?
2017-04-18 23:24:03 -04:00
ZTsukei
8dd47ef983 v1.3.08 - The Fat One
--------
Driftboost formula changed to:
49 + player->kartspeed*2;
(No longer factors weight from previous version)
Collision code now factors character weight for players.
Collision code now only plays the collision sound once, rather than per player.
Weight now factors into drifting's base value. A heavier character will drift more straight with no input and have less control.
Added a cheat check in SetPlayerSkinByNum(), to force speed and weight within the boundaries of 1 and 9.
Nerfed orange turbo to 50 frames, down from 60.
2017-04-18 21:04:56 -04:00
ZTsukei
1e576fb61f v1.3.07
-------
Changed the drift spark formula from:
51 + player->kartspeed;
To:
43 + player->kartspeed*2 + (10 - player->kartweight);
This allows an extreme heavy/accel to get sparks more often than an extreme light/speed character. Other extremes should be roughly where they were before.
2017-04-17 21:29:57 -04:00
ZTsukei
45dbdfa31c v1.3.06
-------
Increased weight's effect on drifting by 20% (10->12)
2017-04-17 20:38:32 -04:00
ZTsukei
3a90256ff8 v1.3.05
--------
Fixed Drift Sparks.
Added a "IF YOU CHANGE THIS" memo comment.
2017-04-17 13:46:41 -04:00
ZTsukei
cfdb127630 v1.3.04 - The Bouncy One
--------
Hardcoded Collide.lua.
Added player boolean array "Collide", used by Collide.lua.
Walls are now bouncy by default again, like they were in 1.09.
Buffed Orange Drift sparks, the boost now lasts 60 frames up from 40.
2017-04-17 13:20:52 -04:00
ZTsukei
1c62f2ff14 v1.3.03
-------
Fixed offroad being applied to almost every sector special. Oops.
2017-04-16 21:51:46 -04:00
ZTsukei
e6305ece38 v1.3.02
-------
Diagonal springs now keep your current speed if you are faster than their set speed. This only affects players for now.
Offroad is no longer handled by &256, and is now handled by &2, &3, &4; Damage (Damage (Water), Damage (Fire), and Damage (Electric))
Starpost mobj radius and height have been reduced to 1*FRACUNIT, this should fix the checkpoint infinispawn bug.
2017-04-16 20:47:48 -04:00
ZTsukei
911508e262 1.3.01
------
Friction now correctly ignores FoFs over the sector (idk if it'll work on FoFs themselves yet)
Friction reduces speed to 1/3, was 1/2.
2017-04-16 16:17:22 -04:00
Sryder
ba2cf198bf Make sure it actually compiles 2017-04-16 19:55:21 +01:00
Sryder
82a392079d Update version to 1.3.0 2017-04-16 19:19:29 +01:00
Sryder
56153bbac0 Revert "Remove kart offroad variable and workings." This will likely be temporary until the sector effect is done for a default friction value.
This reverts commit aff9a78d76.

# Conflicts:
#	src/d_player.h
#	src/g_game.c
#	src/k_kart.c
2017-04-16 19:01:32 +01:00
Inuyasha
5e4f960f3a fixed drawfill to be more consistent w/ other functions
doesn't draw off of the sides, and doesn't ignore snapping or widths for reasons that don't make sense
(for instance: the green bar in MI's test script showed *above* the blue one in non-green resolutions in 2.1.17)
2017-04-12 15:34:13 -07:00
Monster Iestyn
586d2e1bde Merge branch 'next' into public_next 2017-04-05 21:05:33 +01:00
Monster Iestyn
81c3d6820e Merge branch 'commandline_skinselect' into 'next'
Command-line skin selecting fix

Fixed http://mb.srb2.org/showthread.php?t=42312.

Also, fixed being able to change your skin colour during credits/cutscenes in singleplayer.

See merge request !158
2017-04-04 16:49:55 -04:00
Alam Ed Arias
4fa188cf01 build: fix 64-bit builds 2017-04-01 17:22:24 -04:00
Inuyasha
6b9ba5d790 Merge branch 'luascript-linedef-fix' into 'next'
Linedef type 443 (Call Lua Function) fix

Fix for https://mb.srb2.org/showthread.php?t=42491

Note that the crash reported occurs only if Lua has been initialized (by having a Lua script loaded) and a LinedefExecute hook function has been added.

See merge request !171
2017-04-01 17:08:49 -04:00
Monster Iestyn
bf29b5c6d1 Print warning message in console if line->next is NULL 2017-04-01 20:16:48 +01:00
Monster Iestyn
f473118b09 Merge branch 'next' into public_next 2017-03-30 21:48:50 +01:00
Alam Ed Arias
8f25dc62cc Merge branch 'master' into next 2017-03-30 08:11:26 -04:00