TehRealSalt
005e01850d
Fix magnet & star
2017-11-11 22:29:38 -05:00
TehRealSalt
9bea44e5c1
Fix this garbage
2017-11-05 16:34:12 -05:00
Sryder13
351670513d
Give explosion particle mobjs the target of who spawned it (bomb thrower, blue lightning user)
...
So that explosion particles can trigger voice lines (and not crash) and add points for players in battle
Also don't play voice lines when you hit yourself
2017-11-05 17:15:19 +00:00
TehRealSalt
a9c1b3e747
Everything.
...
- Player arrows now show if a player is in the item roulette
- Boo has been improved, and added back to Battle's item roulette
- The CHECK HUD item is now more accurate, and should appear more often
- Early comeback mechanic. Functional, but really unpolished
- Attempted (again) to make the first player to join in a netgame spawn
with balloons
- No longer shows respawn text on death
2017-11-05 01:43:47 -05:00
Sryder13
2e2d4073b8
Bombs should check for teams in team match, not regular match
2017-10-25 15:04:08 +01:00
TehRealSalt
d3387f816b
Battle Mode item respawning
2017-10-24 17:04:22 -04:00
TehRealSalt
163eae7325
Red shells no longer target people without balloons
2017-10-23 18:59:41 -04:00
TehRealSalt
4efda9b830
Remove some redundancies from the last commit
2017-10-23 18:54:10 -04:00
TehRealSalt
4c877a6490
Move some A_ItemPop stuff into P_CanPickupItem
2017-10-23 18:38:45 -04:00
TehRealSalt
31a13e245c
BATLLE MODE
...
AAAAAA
2017-10-22 03:06:35 -04:00
TehRealSalt
5fe2f4928f
Merge remote-tracking branch 'refs/remotes/srb2public/next' into zarrotsu
...
# Conflicts:
# src/doomdef.h
# src/sdl/i_main.c
# src/sdl/i_video.c
# src/y_inter.c
2017-10-17 15:53:34 -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
Alam Ed Arias
01602fa1f1
Build: fixup warnings in Debug builds
2017-09-28 16:54:26 -04:00
Alam Ed Arias
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -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
Alam Ed Arias
459d8064ee
Merge branch 'master' into public_flatsprite
2017-05-12 20:42:55 -04: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
41130465b4
Use NF instead of normal P_SetMobjState to prevent endless looping
2017-05-07 22:21:17 +01:00
Sean Ryder
be3acfff0b
Fix warnings
...
Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
ZTsukei
f50ecc0dcd
Most items work (netgame needs testing), will do fireballs later.
2017-02-26 17:38:24 -05:00
ZTsukei
493436dc1a
Adjusted bonustime, Goldshrooms work, added intermediate boostspeed for between Megashroom size
2017-02-19 15:54:23 -05:00
ZTsukei
0a782bf79e
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 13:39:50 -05:00
Sryder
35b789d330
Fix random duplicate code from merge in hw_main.c and r_segs.c
...
Whitespace cleanup
2017-02-18 00:25:16 +00:00
Sryder
68d439a783
Merge branch 'upstream/next' into zarrotsu_vanillamerge
...
# Conflicts:
# src/Makefile
# src/doomdef.h
# src/hardware/hw_main.c
# src/p_mobj.c
# src/p_user.c
# src/r_segs.c
# src/sdl/i_video.c
# src/win32/win_sys.c
2017-02-17 20:14:55 +00:00
Alam Ed Arias
fc9a86f6d2
Mingw: fixup unsigned/signed compare
2016-12-22 19:39:14 -05:00
ZTsukei
66c6b6885f
Updates done a while ago... Not 100% sure what they were. :x
2016-11-20 23:23:10 -05:00
ZTsukei
82b0e9962e
Toaster's friction code???
2016-08-23 21:04:06 -04:00
toasterbabe
2a74ea07ee
Chee wanted paper sprites' code, so here it is for the public to see.
...
Note: Won't compile. Need to merge in the NAMEcLcR stuff first, let me do that.
2016-08-22 22:54:30 +01:00
ZTsukei
3a3180ce05
Redid control names, some item code, start of drift shenanigans
2016-08-20 22:15:11 -04:00
ZTsukei
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
Inuyasha
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
Inuyasha
9cec9093bb
denom of A_CheckRandom can't be zero, that would be bad
2016-03-30 06:20:57 -07:00
Inuyasha
caf081b6f5
Merge branch 'bp_random2' of http://git.magicalgirl.moe/STJr/SRB2 into bp_random2
2016-03-29 16:35:21 -07:00
Inuyasha
ac03ce39c8
*_Random is now *_RandomByte.
...
P_RandomChance is now a macro for something that should happen a
certain percentage of time.
P_SignedRandom was moved to a macro. Nobody cared.
# Conflicts:
# src/p_inter.c
2016-03-29 16:27:55 -07:00
ZTsukei
b9db247d55
Logic for itemboxes, demonic red shells from hell, and bobomb explosions. Just a rough copy-paste.
2016-03-27 21:02:55 -04:00
Monster Iestyn
eab51414f3
Fix typo in A_ChangeAngleAbsolute
2016-03-07 21:16:02 +00:00
Alam Ed Arias
2b12e5ff20
Merge branch 'next' into backport_unslot-music
2016-02-26 02:11:29 -05:00
Alam Ed Arias
6000b5c980
Merge branch 'master' into next
2016-02-09 14:13:50 -05:00
Inuyasha
8c17dac589
The concept of "music slots" doesn't exist anymore.
...
Use whatever names you want for your music. So long as you prefix the lumps with O_ or D_, it doesn't matter anymore.
DISCLAIMER: Linedef type 413 (change music) and Lua scripting is not tested.
(cherry picked from commit 025ca413a2a01a8ec7c104748c2f510e350aa457)
# Conflicts:
# src/p_user.c
2016-02-09 02:48:33 -08:00
Alam Ed Arias
f4886657c1
clang: fixup a few clang warnings
2016-02-05 22:12:12 -05:00
Nipples the Enchilada
0a0f16a001
Merge branch 'actions-tweaks' into 'next'
...
Actions tweaks
This just rewrites the action A_SetTargetsTarget currently, dunno if I'll bother to tweak any more actions in the near future \*shrugs\*
That said, PLEASE check whether the action works properly before accepting the merge. It's been a while since I last did anything with this branch, so I forget entirely whether I tested it or not.
See merge request !27
2015-12-30 14:45:37 -05:00
Yukita Mayako
2fb03a7cff
Merge branch 'next' of git@git.magicalgirl.moe:STJr/SRB2.git into angles
...
Conflicts:
src/p_map.c - Automatically resolved by mergetool
2015-08-22 09:52:11 -04:00
Monster Iestyn
b449bd826a
Rewrote A_SetTargetsTarget to be more sensible and efficient
2015-08-13 19:42:00 +01:00
RedEnchilada
3f8e7b1739
Revert/remove unused/broken junk from original slopes port
...
m_vector removal to come later. The little thing commented out in it
is so I could revert the weird tables.c change.
2015-05-22 20:57:58 -05:00
RedEnchilada
6694480f68
Overhaul slope collision (NOT PHYSICS) to work almost perfectly
2015-04-27 13:20:50 -05:00
RedEnchilada
923fae476e
Merge branch 'fury-gh/slopes' into angles
...
Conflicts:
src/p_maputl.c
2015-04-19 15:56:55 -05:00
RedEnchilada
ddd66b9eff
Make A_SetObjectFlags only reset sector/bmap links if needed
2015-04-17 12:10:40 -05:00
RedEnchilada
210279625a
Extra tiny logic fixes; swinging chains are smoother, and polyobjects can follow single-waypoint sequences
2015-04-06 11:23:08 -05:00
MonsterIestyn
076719e6a4
P_CheckSight should ideally be called AFTER most other things in things like P_LookForPlayers at least
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9043 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:13 -04:00
Matt Walsh
0a7f3751f6
Add in missing super check
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8984 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-01 19:38:00 -05:00
Alam Ed Arias
73b3287b19
SRB2 2.1.14 release
2015-01-01 14:50:31 -05:00
Ronald Kinard
54f0d0c110
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-18 18:45:57 -06:00
Alam Ed Arias
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
Alam Ed Arias
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
Alam Ed Arias
02a3b0776c
SRB2 2.1.7 release
2014-04-14 01:14:58 -04:00
Alam Ed Arias
2fed5d1270
SRB2 2.1.3 release
2014-03-18 13:56:54 -04:00
Alam Ed Arias
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00