TehRealSalt
f48a08cd53
Merge v1
2019-05-06 21:23:29 -04:00
TehRealSalt
e59a7175be
Fix skin shit
2019-05-02 00:39:49 -04:00
Nev3r
09ff071656
Fixed more mobj thinker iterator oversights and removed all mobj thinker function checks
...
Mobjs got their own thinker list after all, and disappearing thinkers are automatically purged from their lists and sent to the limbo list.
So it's safe to assume all thinkers inside the mobj list must be mobjs.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 16:39:57 +02:00
Nev3r
679f8bd0fd
Merge branch 'slopethinkers' into thinkerlists
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 11:47:34 +02:00
Nev3r
5a4eded7af
Added a mobj-only list entry for mobj thinkers
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 23:29:20 +02:00
Nev3r
baeda5060c
Basic multiple thinker list implementation
...
Set up a main thinker list and a polyobject mover list to test things up. Works so far, networking as well.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 22:39:22 +02:00
Nev3r
a5e83d3f0c
Add a slope thinker queue.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-20 13:06:06 +02:00
TehRealSalt
ea2bcb3b99
Update from master
2019-04-19 20:14:06 -04:00
Nev3r
bb083f20b4
Dynamic slopes now use thinkers.
...
* Moved dynamic slope-related data into its own thinker.
* Vertex slopes no longer use the mapthings directly.
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-19 14:14:43 +02:00
TehRealSalt
089be795a2
Huge splitscreen refactor
...
Did not get to finish all refactoring or even compile this, I'll continue later
2019-04-18 03:08:11 -04:00
Wolfy
2c21b62f65
Merge remote-tracking branch 'remotes/public/master' into followme
2019-04-06 13:48:46 -05:00
Nev3r
bb374a7b36
Implement displacement-based polyobject rotation.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-05 11:50:59 +02:00
fickleheart
be458c1d05
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/doomdef.h
# src/g_game.c
# src/p_user.c
2019-03-19 22:17:25 -05:00
fickleheart
93bd5b61c9
Fix bad merge in map data archiving code
2019-03-16 14:56:56 -05:00
TehRealSalt
6aa55bdbe2
Merge remote-tracking branch 'kartpublic/next' into fortnite
2019-03-11 13:49:12 -04:00
wolfy852
b19d9f69f1
Merge remote-tracking branch 'remotes/pub/next' into followme
...
# Conflicts:
# src/dehacked.c
# src/info.c
# src/info.h
2019-03-08 02:34:04 -06:00
Sal
6db91223cf
Merge branch 'minor-item-tweaks' into 'next'
...
Assorted item tweaks
See merge request KartKrew/Kart-Public!85
2019-03-07 21:24:51 -05:00
Alam Arias
24f7ea2ce1
Merge remote-tracking branch 'origin/master' into followme
2019-03-07 17:29:47 -05:00
wolfy852
17d7c536de
Merge branch 'master' into next
2019-03-07 00:23:17 -06:00
James R
99d2af5669
Check that lumps are okay
2019-03-04 22:13:22 -08:00
wolfy852
6feeb1e1f0
Merge remote-tracking branch 'remotes/pub/next' into followme
2019-02-26 17:12:51 -06:00
wolfy852
2c85e79c6a
Fix players crashing when joining netgames with active followers
2019-02-26 17:09:24 -06:00
Sally Cochenour
12dd8e49c0
Merge branch 'next' into minor-item-tweaks
2019-02-22 19:30:52 -05:00
James R
f8928300ec
Rename splitscreen member to something more meaningful
2019-02-22 15:57:44 -08:00
James
4f9109501e
Hyu b gone
2019-02-19 23:15:31 -05:00
james
76f2df2c40
Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t
2019-02-16 23:25:50 -08:00
Latapostrophe
92ab2845c8
Followers but they crash when you join netgames
2019-02-14 03:56:28 +01:00
Sally Cochenour
b2d2d64323
Merge branch 'master' into fortnite
2019-02-04 20:01:20 -05:00
fickleheart
d9f1345701
[HACK] Save correct lap count on netreplays
2019-01-27 15:45:42 -06:00
TehRealSalt
3246ca6b33
More finished power level
...
broken, can't finish
2019-01-16 14:49:42 -05:00
TehRealSalt
654580d48b
Minor whitespace
2019-01-15 21:56:46 -05:00
fickleheart
bc3a7ba5cb
Save stored turn ranges in NetArchivePlayers
2019-01-08 23:27:39 -06:00
TehRealSalt
f8a1cf849f
Merge branch 'master' into fortnite
2019-01-08 18:17:09 -05:00
SeventhSentinel
8391dd520a
Add item spinning, turn into papersprites, spawn more orbs
...
Also tried to fix a memory issue I only get from Sev's compiles by removing the need to free memory for this... but didn't fix anything :/
2019-01-02 14:08:00 -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
TehRealSalt
b27c709879
a bunch of stuff I left uncommited
2018-12-15 19:14:30 -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
TehRealSalt
43af067415
Add a 5-second delay before the kill-field kicks in
...
Until it's ready, the orbs are transparent and the minimap icon blinks. Also, tons more sounds. ALSO, Super Overtime mode.
2018-12-06 18:13:40 -05:00
TehRealSalt
dfa0522326
Battle Mode overtime
...
After the time limit is up, spawn a shrinking kill-field. This is one hefty initial commit!
2018-12-06 13:46:38 -05:00
TehRealSalt
4507ee18fd
Merge remote-tracking branch 'srb2public/next' into merge-next
2018-11-29 08:49:50 -05: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
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
TehRealSalt
d3fb778a52
Keep track of the place SPB is following
...
This makes it so that if the SPB'd person is passed, then the person who's getting SPB'd won't get the increased item odds for the weird feedback loop.
2018-11-24 20:41:17 -05: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
623c7097f1
Backported PK3 support to 2.1
...
Hopefully I'm not missing anything.
Signed-off-by: Nev3r <apophycens@gmail.com>
2018-11-23 16:58:16 +01:00
TehRealSalt
9bec65ca03
Franticized items for 2nd place VS SPB'd 1st
2018-11-22 23:38:54 -05:00
Digiku
aed64a7c73
Merge branch 'nights-dronebox' into 'master'
...
NiGHTS: Drone hitbox improvements and player position correction on Nightserize
See merge request STJr/SRB2Internal!158
2018-11-21 20:19:39 -05:00
Marco Z
633c28b28a
VC build fixes
2018-11-20 21:54:20 -05:00