mazmazz
6086a9f238
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
2019-01-02 03:47:51 -05:00
mazmazz
81352aece1
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -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
Sryder
9b00709966
Merge branch 'master' into waypoints
2018-12-04 22:29:22 +00:00
TehRealSalt
6a8913e192
Back to numstarposts/2
2018-12-02 02:29:47 -05:00
Sryder
746a004f18
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/info.c
# src/p_mobj.c
# src/p_spec.c
2018-12-01 22:09:03 +00: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
mazmazz
b37a2016c7
Merge remote-tracking branch 'origin/master' into menu-execs
2018-11-20 18:31:30 -05:00
mazmazz
02fe8dc178
Allow changing titlemap's cameraref via Line 422 Cut-Away View; change music too
2018-11-18 02:41:35 -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
mazmazz
368b12d6d9
Line 457: Calculate input angle tolerance correctly
2018-11-14 10:13:39 -05:00
mazmazz
7b0ec6479f
Merge branch 'master' into text-prompts
2018-11-13 11:12:44 -05:00
mazmazz
422692ed03
NextTag implementation
...
* Adjust named tag implementation to be more portable
* Next page adjustments
2018-11-13 00:13:36 -05:00
mazmazz
8b434072a9
Stub netgame support; ignore bots on linedef special
2018-11-10 15:34:56 -05:00
mazmazz
3174969755
Added page tags and find page by tag
...
* Added tutorial mode defines to this branch
2018-11-10 09:32:53 -05:00
mazmazz
3d86cbc729
Close text prompt upon level load
2018-11-04 22:32:47 -05:00
mazmazz
f8d64c93d7
Move Line 449 to Line 459; allow post exec tag by either Back X offset or line tag
2018-11-04 22:32:47 -05:00
mazmazz
7246b6e9a6
Changed Line 449 post exec tag to line tag
2018-11-04 22:32:46 -05:00
mazmazz
30dbb6a644
TextPrompt: Implement player blocked controls and post-close run line
2018-11-04 22:32:46 -05:00
mazmazz
c914be07ab
Line 449 param rearranging
2018-11-04 22:32:46 -05:00
mazmazz
2b36943bf0
Basic TextPrompt line action implemented
2018-11-04 22:32:45 -05:00
mazmazz
0865497e66
Linedef Exec 449 Control Text Prompt - beginnings
2018-11-04 22:32:45 -05:00
mazmazz
6e058dc212
Line 458: Only do disable operation if MFE_TRACERANGLE is set
2018-11-04 16:48:18 -05:00
mazmazz
8f5f32a1b8
Trigger line exec by whether mobj is facing its tracer
...
* MFE_TRACERANGLE
* Thing 758 MT_ANGLEMAN
* mobj thinker behavior
* Line Exec 457/458 Enable/Disable
2018-11-04 16:28:25 -05: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