5534017954
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05:00
1b2aea81dc
Merge branch 'master' into next
2018-11-25 20:39:17 +00:00
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
aa607ecf4c
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_again
...
# Conflicts:
# src/d_clisrv.c
# src/m_misc.c
2018-11-18 18:26:50 +00:00
d14f87b8c6
Cleanup whitespace
2018-11-14 10:54:33 -05:00
63ba59341b
Fix monitors (and other objects) on a floating, bobbing FOF being stuck slightly above said FOF after it has finished bobbing
2018-11-12 16:23:59 +00:00
fc86c87465
Two scale things I noticed.
...
* Change spacing of bustable FOF debris with scale (plus increase its default a bit for less lag).
* Make a few instances of scalespeed take mapheader scaling into account.
2018-10-19 21:32:29 +01:00
a1e1aa81b5
Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2.git into nextmerge_plus_rain
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/g_game.c
# src/p_floor.c
# src/p_user.c
# src/r_data.c
# src/r_data.h
# src/v_video.c
2018-10-14 21:52:05 +01:00
89a6694d67
Don't trigger thwomp on spectators
2018-09-13 11:32:40 -04:00
c32c72c401
Thwomp fix: Don't trigger (look for players) when ~FF_EXISTS
2018-09-13 11:32:38 -04:00
9b3751b30c
Merge branch 'master' into sonicitems
2018-06-07 19:39:45 -04:00
dd05edfcc0
Merge remote-tracking branch 'srb2public/next'
2018-06-04 16:58:35 -04:00
f061ffa00e
Stop Each Time trigger linedefs and object-carrying scrollers from doing anything with FOFs without FF_EXISTS
2018-05-21 20:02:30 +01:00
00e913bbcc
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/k_kart.c
# src/k_kart.h
# src/lua_baselib.c
# src/p_inter.c
# src/p_spec.c
2018-03-31 00:44:03 -04:00
2cc2b68e38
Oh boy another real name
2018-03-29 14:48:45 -04:00
d99339ecd0
Merge remote-tracking branch 'refs/remotes/origin/master' into sonicitems
...
# Conflicts:
# src/info.c
# src/k_kart.c
# src/p_enemy.c
# src/p_inter.c
# src/p_mobj.c
2018-03-14 16:12:15 -04:00
07c7bc05c5
Fix the item box related crashes
...
Removed Magnet item box pulling code. It's a mess, hacky, doesn't really help in races, and breaks things. We will implement something new for it soon.
2018-03-13 05:20:47 +00:00
cbff4bbf44
So much
...
- Renamed fucking everything
- Threw out all of the item code because it looks at me funny
2018-02-05 18:55:52 -05:00
349b27e0de
Change splitscreen into UINT8, fix HUD slightly more
2017-12-18 20:59:04 -05:00
0393e24fa6
A lot lol
...
The importants:
- Fixed compiling
- Combined G_BuildTiccmd for all players, no more need for a function
for each
- You can actually start 3p/4p mode
2017-12-16 22:32:43 -05:00
198685582f
Previous EXE: The Better Edition
...
- Improve balloon-based items. Much more distinguished differences
between the different ranks
- Reverted Feather strafing. You can now just... properly move in the
air, if you're using a Feather or a Bounce Pad.
- Bounce pads are now stronger while using speed items.
- Fixed the long standing bug about offroad & ziplines working when
you're on FOFs above them. This is a tricky subject, so please report
any issues you may come across related to this.
- Shells should no longer travel to Mars, nor will they when using
bounce pads. They should now do a gentle hop.
- :WIP: new MP Player Setup screen, now shows character stats. Will
later feature the list of characters in a row of icons, and a backported
2.2 color selector with toast's permission
- Renamed "Match" to "Battle" :p
- Yet MORE minor cases where kartspeed & kartweight were being read as
fixed_t when they're freakin' UINT8's, people!
2017-11-28 01:13:23 -05:00
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
ec125628ab
Merge branch 'master' into next
2017-09-28 10:16:35 -04:00
2ccd397d11
Build: kill GCC 7's implicit-fallthrough warning
2017-09-28 09:39:47 -04:00
6e5cffba5b
Create static function P_IsObjectOnRealGround for each time thinker to use in place of P_IsObjectOnGroundIn, for non-FOF floor touch specials
...
This fixes solid FOFs activating floor touch specials for normal ground if using an "each time" trigger linedef
2017-07-17 20:56:55 +01:00
be3acfff0b
Fix warnings
...
Possibly fix some whitespace problems
2017-03-04 22:13:19 +00:00
0a782bf79e
Fixed thwomp sectors, Added Magnet Item.
2017-02-18 13:39:50 -05:00
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
66c6b6885f
Updates done a while ago... Not 100% sure what they were. :x
2016-11-20 23:23:10 -05:00
a2dabd7041
Fixed a bunch of things MI pointed out.
2016-10-31 14:03:53 +00:00
1e1a6c32f0
Corrected non-complete set of cases.
2016-10-31 09:34:24 +00:00
2d50dd1fd1
A bunch of fixes that allow for proper handling of triggerspecial_touch. Not perfect, but I don't have any more time to spend tonight.
2016-10-31 00:02:38 +00:00
e4a970f894
Starting from scratch. SRB2 v2.1.15
2016-07-06 00:10:19 -04:00
17e0adcbac
Renamed some struct variables so the problem this branch sets out to fix is more obvious at a glance.
...
* m_snext ==> m_thinglist_next
* m_sprev ==> m_thinglist_prev
* m_tnext ==> m_sectorlist_next
* m_tprev ==> m_sectorlist_prev
2016-06-09 14:16:02 +01:00
f07585191b
copyright dates/statements updated and such
...
(no actual SLOC changes)
2016-05-17 17:42:11 -07:00
9ee817c860
Some more vague rough porting.
2016-04-10 17:05:15 -04:00
7ae87cc2c6
Revert "No more stupidity for No More Enemies special plz"
...
This reverts commit 474ad01b46
2016-03-08 22:22:30 -08:00
a9d49cd9fa
Make all specials reliant on floor touch work right with sloeps
...
(I might've missed some, though)
2015-05-24 12:53:30 -05:00
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
6694480f68
Overhaul slope collision (NOT PHYSICS) to work almost perfectly
2015-04-27 13:20:50 -05:00
923fae476e
Merge branch 'fury-gh/slopes' into angles
...
Conflicts:
src/p_maputl.c
2015-04-19 15:56:55 -05:00
474ad01b46
No more stupidity for No More Enemies special plz NME special now acts similarly to Each Time, checking all sectors sharing the same tag as itself for any enemies/bosses hiding within. This also supports cases where the tagged sectors are FOF control sectors. When the situation is asitsaysonthetin, NME acts like a normal trigger linedef should and executes all linedef execs around the sector it's located in.
...
git-svn-id: https://code.orospakr.ca/svn/srb2/trunk@9005 6de4a73c-47e2-0310-b8c1-93d6ecd3f8cd
2015-03-31 18:00:12 -04:00
15f0670c43
Merge branch 'fix_each_time' into next
...
Conflicts:
src/p_floor.c
2015-03-01 02:13:46 -06:00
54f0d0c110
IN PROGRESS: porting eternity slopes from srb2cb
2014-11-18 18:45:57 -06:00
404b5f666c
SRB2 2.1.12 release
2014-11-11 19:55:07 -05:00
97b61eb66d
Each Time Fix Fix: Don't infinite loop when each time is set to trigger on exit.
2014-10-02 10:26:12 -07:00
2191e5b9de
Each Time Fix: Multiple players simultaneously entering a sector, e.g. Tails carries one in.
2014-10-01 13:49:44 -07:00
c028c83235
SRB2 2.1.9 release
2014-08-03 23:49:33 -04:00
b93cb1b65a
SRB2 2.1 release
2014-03-15 13:11:35 -04:00
TehRealSalt