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
