Commit graph

1830 commits

Author SHA1 Message Date
TehRealSalt
cce7b4374a Merge remote-tracking branch 'refs/remotes/origin/zarrotsu' into attack-is-back 2017-10-17 00:45:30 -04:00
TehRealSalt
727d55b64e Merge remote-tracking branch 'refs/remotes/srb2public/public_flatsprite' into zarrotsu
# Conflicts:
#	src/doomdef.h
2017-10-17 00:40:38 -04:00
TehRealSalt
9c0437bcd1 Thought I heard something about camera changing, it hasn't, so I decided to port work I did for internal
Basically:
1.) farther camera defaults
2.) different camera settings save
3.) cam_dist automatically increases with splitscreen (& analog mode,
but that's irrelevant for kart :p)

(IIRC someone said that this branch is fine to commit directly to,
please feel free to revert immediately if this isn't the case :V)
2017-10-16 23:52:13 -04:00
TehRealSalt
4ed0511013 Some cleanup
No longer save score/rings, use the Race tally as a placeholder
replacement for the butchered vanilla one
2017-10-16 20:23:26 -04:00
TehRealSalt
b5e0a80c35 Oho, here's the problem!
Too many fixed_t!
2017-10-16 17:52:42 -04:00
TehRealSalt
3e74ac2b97 Ghost scale fix 2017-10-16 07:11:48 -04:00
TehRealSalt
540bea911a First, minor steps to Record Attack support
To-Do:
- fix demo desync (desync is only super noticeable on slopes, but a
message pops up when the player starts moving regardless)
- fix ghosts not appearing
- replace that dumb level tally
- remove a bunch of things that made the assumption that race & record
attack would never mix (ex: "next map x doesn't support race mode, using
map y anyway" message)
2017-10-15 02:33:28 -04:00
ZTsukei
ba7580d8e2 = Nerfed Megas across the board.
- Rarer
 - Speed reduced from +25% to +20%
 - Getting squished doesn't last as long
= Nerfed the Banana Meta - or at least changed it
 - You don't wipeout for as long
 - You don't lose as much speed from wiping out (1/2 instead of 1/4)
= Respawning after death is faster
 - Lakitu drops you faster, only three floaty sounds instead of four
= Adjusted the camera to the values given by Sev
2017-10-13 15:44:17 -04:00
Wolfy
01126d1232 Actually run the fucking shadows this time 2017-10-11 21:31:17 -05:00
Wolfy
b27ab8f51b oops 2017-10-11 21:14:14 -05:00
Wolfy
366fe9fa91 Add TD shadows to Kart
Disclaimer: I haven't tested this and therefore am not sure whether or not it actually works. I think it does. Probably.
2017-10-11 20:54:35 -05:00
Wolfy
faf886885e Have Kart use kmd2.dat instead of md2.dat 2017-10-11 20:26:34 -05:00
ZTsukei
7c71feb274 Fixed thrown items (99% sure)
Thrown items are thrown farther now; distance based on CC.
2017-10-11 10:49:14 -04:00
ZTsukei
b95f1d568a Updated item weights
Fix attempt for thrown items
2017-10-10 21:09:38 -04:00
ZTsukei
b59246f413 Added Donut Plains Bushes 2017-09-04 22:32:14 -04:00
ZTsukei
ee7ea5f6cb Fixed the word "ZONE" not appearing in the title 2017-09-01 18:58:12 -04:00
ZTsukei
a1f2f5b675 New level tag "ZONETITLE" can be set to replace the word "ZONE" in a level. "NOZONE" overrides it and forces no display at all. 2017-09-01 13:01:59 -04:00
ZTsukei
5d26588759 Added allllllll the old mobjs. Still need to reassign level ids. 2017-08-31 23:16:03 -04:00
ZTsukei
a8a4f06aa3 Corrected type masking in d_clisrv.c 2017-08-10 17:37:31 -04:00
ZTsukei
fd85c536ff v1.3.19
-------
Moved the Lakitu respawn code so that it isn't console-only.
2017-08-09 23:45:13 -04:00
ZTsukei
80990da828 v1.3.18
-------
Fixed really poorly done netcode stuff. This should fix the kartstuff desyncing, maybe collision stuff too?
Fixed Megashroom's growth animation lasting too long.
2017-08-09 18:14:20 -04:00
ZTsukei
8d19d18200 v1.3.17
-------
Lakitu returns from his ironically-not-pillowshaded-cloud grave
Dropboosting works on respawn
Players respawn "automatically after 2 seconds" instead of "*instantaneously* while accel is held"
2017-07-16 12:06:29 -04:00
Monster Iestyn
8290ae9fd4 Fix paper sprites apparently "turning" around sometimes when you turn the camera, when they're supposed to be still (sawb.wad for instance)
I cleaned up some of Sryder's changes a little too I guess
2017-07-02 16:38:25 +01:00
ZTsukei
3cdcaa6f2f G_PlayerReborn desync fix, maybe? 2017-06-26 21:41:05 -04:00
ZTsukei
6381791ca6 Swoopy Start & Lap Lakitu 2017-06-03 18:19:25 -04:00
ZTsukei
192647d4f1 Lakitu Start Lights 2017-05-21 18:25:34 -04:00
ZTsukei
eaa5167f71 v1.3.16
--------
Fireballs narrower
Fake Item is no longer restricted while held
Held items that are restricted remain in the item wheel until used
Magnet now correctly hits nearby players and objects
2017-05-17 23:11:00 -04:00
ZTsukei
2972dc9b67 Fireballs work, added to roulette.
Removed [k_fireballtimer] since it is not going to be used.
2017-05-13 11:15:35 -04:00
Alam Ed Arias
459d8064ee Merge branch 'master' into public_flatsprite 2017-05-12 20:42:55 -04:00
toasterbabe
6edfdae2c6 Merge branch 'public_flatsprite' into 'public_flatsprite'
OpenGL Flatsprites

Flat sprites in OpenGL
Is on my GitHub repo here: https://github.com/Sryder13/SRB2/tree/public_flatsprite

See merge request !143
2017-05-12 17:41:20 -04:00
Monster Iestyn
a1f5caeba6 Merge branch 'update-to-v2.1.18' into 'next'
Update to v2.1.18

Exactly what it says on the tin.

See merge request !180
2017-05-12 16:08:31 -04:00
Monster Iestyn
b8ffeeb59f Update version number to v2.1.18
Don't worry, I remembered to update MODVERSION as well this time :)
2017-05-12 16:06:27 +01:00
ZTsukei
e72b2921fb Can get items during spin-outs now
Collision now correctly ignores boo and squish
Collision now ignores star
2017-05-11 20:51:53 -04: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
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
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
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