Sryder
43936013f7
Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart.git into waypoints
...
# Conflicts:
# src/d_netcmd.h
# src/k_kart.c
# src/p_setup.c
2019-05-25 12:09:47 +01:00
Jaime Passos
62547b2a49
Animations, better flat management.
2019-05-21 15:24:26 -03:00
Jaime Passos
775b64f540
Support for patches and textures to be used in place of sector flats
...
Still a work in progress.
2019-05-21 00:28:52 -03:00
TehRealSalt
62aeeea9cb
Fix a couple of things not using pure white
2019-05-13 12:50:36 -04:00
TehRealSalt
dc41fe3d8d
Port over only the relevant changes from the reduced-palette branch, update some of the Kart-specific stuff
2019-05-12 17:19:49 -04:00
TehRealSalt
db5f8e8c6b
Merge branch 'v1'
2019-05-12 15:26:03 -04:00
wolfy852
9ac41cca73
Merge remote-tracking branch 'remotes/pub/next' into v1
...
# Conflicts:
# src/d_netcmd.c
# src/r_main.c
# src/v_video.c
2019-05-12 03:40:02 -05:00
wolfy852
2222738e1c
Merge remote-tracking branch 'remotes/srb2pub/public_flatsprite' into next
...
# Conflicts:
# src/d_netcmd.c
# src/doomdef.h
# src/doomstat.h
# src/f_finale.c
# src/g_game.c
# src/hu_stuff.c
# src/m_menu.c
# src/p_spec.c
# src/p_user.c
# src/r_main.c
# src/r_things.c
# src/s_sound.c
# src/v_video.c
# src/y_inter.c
2019-05-06 22:40:12 -05:00
TehRealSalt
4006045f12
Merge branch 'v1'
2019-05-06 22:06:59 -04:00
mazmazz
d944156744
Merge remote-tracking branch 'origin/master' into menu-execs
2019-05-02 18:47:43 -04:00
TehRealSalt
435862b29d
finished scrambles
2019-04-26 13:34:30 -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
924ed2d623
Remove dynamic slope queue list due to now being unnecessary.
...
Signed-off-by: Nev3r <apophycens@gmail.com>
2019-04-21 11:52:18 +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
fickleheart
25ff05fdd0
Add demo rewinding
...
Preview is fairly basic, and only shows players
rewinding. Full state is restored via reloading
the replay and jumping to the timestamp once
the rewind is done.
2019-04-06 14:51:00 -05:00
Monster Iestyn
3b3a37daad
level header's "forcecharacter" parameter doesn't take skin numbers anymore, so this isn't needed!
2019-04-03 19:51:36 +01:00
Monster Iestyn
07e8ef6627
Split off part of P_SpawnSpecials into a new function called P_InitSpecials
...
This allows tag lists, gravity, weather, and the "CheckFor" vars to be initialised before running P_LoadThings or P_ResetDynamicSlopes, in case they could affect mobj spawning or cause a netgame desync somehow by carrying over the previous level's values
# Conflicts:
# src/p_spec.c
2019-04-03 19:46:10 +01:00
fickleheart
f60e92aa70
Move public demo vars to a single struct
2019-03-24 21:32:15 -05:00
fickleheart
ab0bb33d6e
Self-reminder...
2019-03-19 23:45:45 -05:00
fickleheart
4e5aba836e
Merge remote-tracking branch 'remotes/james/netreplays-dedicated-sigsegv-fix' into new_netreplays
2019-03-19 23:44:39 -05: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
Jaime Passos
fd5fb73671
gl4
2019-03-17 22:27:50 -03:00
mazmazz
378106ad73
Fix MIDI crash bug when changing music between levels
...
This happened when the old music was ERZ2 native midi, then warping to any other level.
2019-03-15 10:02:50 -04:00
mazmazz
5c308c5597
Fade out music upon dying or level change: 2.1 frontport
2019-03-15 04:21:17 -04:00
mazmazz
822b4d12bf
Merge branch 'public_next'
2019-03-15 01:43:03 -04:00
mazmazz
9d32ea8b5a
Merge branch 'public-musicplus-feature-interfadeout' into public-musicplus-feature-endoflevel
2019-03-15 01:09:12 -04:00
mazmazz
1381343a2e
Implement MUSICINTERFADEOUT level header
2019-03-15 01:05:52 -04:00
mazmazz
c427ccbec5
Merge remote-tracking branch 'public-gl/next' into public-musicplus-feature-endoflevel
2019-03-15 00:39:26 -04:00
mazmazz
83e89ba62c
Merge branch 'public_next'
2019-03-15 00:33:06 -04:00
mazmazz
2eb04ab17d
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
TehRealSalt
6aa55bdbe2
Merge remote-tracking branch 'kartpublic/next' into fortnite
2019-03-11 13:49:12 -04:00
wolfy852
2dc5dde769
Merge remote-tracking branch 'remotes/origin/master' into waypoints
...
# Conflicts:
# src/k_kart.c
2019-03-08 12:24:03 -06:00
James R
6949781ca2
Do not record replays when dedicated
2019-03-04 22:26:05 -08:00
fickleheart
843bc6bc1b
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
2019-03-03 20:24:39 -06:00
Sally Cochenour
75125b726e
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:22:38 -05:00
fickleheart
b085355bdd
Move fov cvar out of OGL-specific code
2019-02-23 10:18:20 -06:00
James
4f9109501e
Hyu b gone
2019-02-19 23:15:31 -05:00
fickleheart
4f8ef7c3aa
Fix compile warnings
2019-02-06 21:03:05 -06:00
fickleheart
1c6046ac43
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
...
# Conflicts:
# src/g_game.c
# src/k_kart.c
2019-02-06 20:47:35 -06:00
Sally Cochenour
b2d2d64323
Merge branch 'master' into fortnite
2019-02-04 20:01:20 -05:00
Sryder
10af9db31b
P_NetKeepAlive should also be here because it potentially pauses mid-game!
2019-02-04 21:54:10 +00:00
fickleheart
5836b0818a
Record net replays to replay/online/
2019-02-03 14:29:54 -06:00
MascaraSnake
3c0cb14a29
In-map emblem coordinates are now set via emblem mapthings (thing type 322) instead of X/Y/Z fields in SOC
2019-02-03 14:32:07 +01:00
MascaraSnake
3ea09d4ffe
Emblem and unlockable SOFTcoding! Emblems and unlockables are no longer predefined in the code and instead loaded from IWAD
2019-02-03 11:05:22 +01:00
