Alam Ed Arias
6ad1086128
Merge branch 'public_next' into master
2015-09-03 15:58:16 -04: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
Alam Ed Arias
fb5cba78d3
Merge branch 'public_next' into private
...
Conflicts:
src/p_mobj.c
2015-06-18 10:54:53 -04: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
Ronald Kinard
91934d5aec
Merge branch 'next' into internal-master
...
Synchronize the following MRs to internal:
* STJr/SRB2!6
* STJr/SRB2!8
* STJr/SRB2!9
* STJr/SRB2!10
Conflicts:
src/doomdef.h
src/p_map.c
2015-04-14 19:33:38 -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
MonsterIestyn
643dc4cbaa
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-02-24 02:09:21 -06:00
MonsterIestyn
e83fa3dc43
Partial damage system overhaul: P_DamageMobj, P_KillMobj, P_HitDeathMessages and P_RingDamage now all take a "damagetype" variable that determines what type of damage was dealt. Does not replace the "damage" variable, we'll have to see if that is worth keeping another time?
...
Currently the main benefit of these changes is that a number of non-Object-related hazards/deaths no long rely on dummy MT_NULL objects or other hacks to tell the game how you were hurt/killed, yay
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9039 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 02:09:18 -06:00
JTE
b2681984a6
Merge branch 'player-animations'
...
SPR_PLAY now calls up a secondary spritedef for all animations for all players. Old character wads (including player.dta) are no longer compatible.
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8993 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 01:59:38 -06:00
Matt Walsh
389299230d
Add in missing super check
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@8984 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-02-24 01:59:35 -06: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
