Wolfy
7fa7543358
Fix the RA only linedef
...
I forgot some stuff.
2020-05-05 10:25:40 -05:00
Wolfy
86ac41bb4a
Record attack only linedef exec
2020-04-05 22:37:42 +02:00
Latapostrophe
c6710c3044
fix thrust on spring pads for shrink and the likes
2019-07-13 14:07:57 +02:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
Alam Arias
9163a05192
fix up misleading indentation of a if statement
2019-05-09 23:03:32 -04:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
a3d2b48329
Fix up more stuff
...
Now in a mergable state
2019-04-18 12:20:13 -04:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
mazmazz
06f4f355ff
Fix custom fade source bug for Change Music linedef
2019-03-13 19:53:16 -04:00
Latapostrophe
395df49ff0
Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works
2019-03-11 18:53:23 +01:00
Latapostrophe
2b47818d66
Fix respawning in reverse gravity
2019-02-18 14:00:36 +01:00
toaster
4e4d663b3e
Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
...
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
TehRealSalt
3491a22a94
Add disable for music credit showing on the change music linedef
2019-01-09 21:17:10 -05:00
TehRealSalt
5be9f9e2d4
Add MUSICDEF lump for defining custom songs & replacing existing songs
...
Very rudimentary at the moment, but it's workable
2019-01-09 21:00:45 -05:00
TehRealSalt
09da50000e
Merge branch 'next' into music-credits
2019-01-09 03:08:20 -05:00
TehRealSalt
301477f212
Misc level init fixes
2019-01-08 20:14:58 -05:00
SeventhSentinel
74aba46823
In-game music credits
2019-01-04 04:44:55 -05:00
mazmazz
6086a9f238
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
2326a58bc7
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
SeventhSentinel
d9a3b37e30
Add a mapobjectscale global
...
Should be no different than it was before, now it's just less tedious to type :V
2018-12-12 21:55:59 -05:00
TehRealSalt
6a8913e192
Back to numstarposts/2
2018-12-02 02:29:47 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
Sal
171e54d251
Merge branch 'mobjdamage-hook' into 'master'
...
Lua "damage" hooks
See merge request KartKrew/Kart!115
2018-11-29 07:16:22 -05:00
Latapostrophe
d240cfef86
Fixed conflict, swapped trapitem and inflictor, and moved the (void)inflictor;s
2018-11-28 19:41:01 +01:00
toaster
2cf5350c0f
LF_SECTIONRACE now has a secondary function!
...
* Sets the player respawn coords on the finish line, so dying in the short interval between crossing an intermediate finish line and hitting a checkpoint doesn't send you all the way back to the beginning.
2018-11-28 16:33:52 +00:00
Monster Iestyn
b4838e3afa
remove redundant wadfile loop within wadfile loop for ANIMDEFS code
2018-11-27 23:05:33 +00:00
TehRealSalt
668efe9105
Require 3/5ths of checkpoints instead of 1/2
...
This broke MKSC in a minor way if you skip a specific item set and then take the big cut... I'll let it go anyway since its an improvement everywhere else.
2018-11-27 14:28:11 -05:00
Latapostrophe
69b5efa71c
Possible fix for lack of mobjdamage and shoulddamage lua functionalities on players.
2018-11-26 21:23:41 +01:00
MonsterIestyn
d158d7e011
Merge branch 'next' into PK3-BackportNext
2018-11-26 18:56:51 +00:00
Monster Iestyn
d824e05a6f
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
toaster
18c0d5d7bd
Fix a bug where zoomtubes could cause ridiculous acceleration (ie, because PF_SPINNING was applied, causing ridiculously low friction, and then no mechanism was able to remove it)
2018-11-24 18:22:01 +00:00
Nev3r
34c472dfb7
Merge branch 'PK3-Backport' into 'PK3-BackportNext'
...
Pk3 backport
See merge request Nev3r/SRB2!1
2018-11-24 06:02:19 -05:00
Nev3r
48cf6572b3
Final touches
...
-Backported multiple per-wad/pk3 ANIMDEFS supported now, just like TEXTURES.
-Removed now-unused function.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-24 09:26:52 +01:00
Nev3r
206d411f46
Add missing tweaks
...
Also remove a test printf.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 17:58:45 +01:00
TehRealSalt
22d44ccfde
Remove drift & pogo spring on hit and a few other places
2018-11-21 19:00:14 -05:00
Sryder
67f0b120c7
Squash various warnings
...
Shadowed declarations
Unsuffixed float constants
There's an unsuffixed float constant I can't fix because the define is outside of SRB2. We could have our own copy of Pi if we really wanted.
2018-11-14 21:53:57 +00:00
TehRealSalt
ab02ea1e1a
Merge branch 'master' into all_hardcode
2018-11-02 01:42:34 -04:00
TehRealSalt
053579371a
Merge branch 'master' into more-fixes
2018-11-01 18:10:53 -04:00
TehRealSalt
0c0a53b2d6
Lap hands touch-up
2018-11-01 16:15:25 -04:00
TehRealSalt
b08fb14d62
Time over cam & signposts support mobjscale
2018-10-31 03:13:56 -04:00
TehRealSalt
193941945e
The motherload: all of my Lua is hardcoded
...
This took like 6 straight hours of work, never ask me for anything ever again
2018-10-29 05:00:08 -04:00
Sal
de1d9770b9
Merge branch 'no-spectate-griefing' into 'master'
...
Prevent spectate griefing
See merge request KartKrew/Kart!43
2018-10-19 15:50:18 -04:00
Sal
d64295a19f
Merge branch 'sweet-new-kicks' into 'master'
...
Sweet new kicks
See merge request KartKrew/Kart!39
2018-10-19 15:49:51 -04:00
Sal
3e2f4f2404
Merge branch 'remove-prints' into 'master'
...
Remove most gameplay prints
See merge request KartKrew/Kart!42
2018-10-19 15:49:01 -04:00
TehRealSalt
c4a249366c
Merge branch 'master' into no-spectate-griefing
2018-10-16 16:38:35 -04:00
TehRealSalt
43656e0704
== --> >=
2018-10-16 12:23:05 -04:00
TehRealSalt
0717db3f31
Prevent spectate griefing
...
If the player count dips below what was stored on the start of the last lap, then don't do time over so that someone can't just spectate at the end of a race out of rage. Y'all are assholes :V
2018-10-15 18:41:34 -04:00
TehRealSalt
3186af9e51
Remove most gameplay prints
...
A couple of the extraneous ones (karma interactions, bumper stealing, lap start notifications) have been removed outright. The rest that I could think of have been changed to use CON_LogMessage, so that they still go into log.txt when rereading a fun chat session but not showing themselves in gameplay. Necessary gameplay prints, such as players being defeated or coming back in Battle, have been kept until there's a suitable replacement for them in the future.
2018-10-14 17:45:28 -04:00