MascaraSnake
|
0d9860c368
|
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
|
2022-01-14 20:42:59 +01:00 |
|
MascaraSnake
|
4b8f5bd7f3
|
Merge branch 'udmf-lighting' into udmf-linedef-executors
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/doomdata.h
# src/r_defs.h
|
2022-01-14 20:30:29 +01:00 |
|
MascaraSnake
|
79cf2f53e8
|
Merge branch 'udmf-polyobjects' into udmf-lighting
|
2022-01-14 20:24:51 +01:00 |
|
MascaraSnake
|
7d2a188c31
|
Merge branch 'udmf-scrollers' into udmf-polyobjects
|
2022-01-14 20:24:13 +01:00 |
|
MascaraSnake
|
940d076190
|
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
|
2022-01-14 20:21:48 +01:00 |
|
MascaraSnake
|
5d343f9c13
|
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
# Conflicts:
# extras/conf/udb/Includes/SRB222_misc.cfg
# src/p_spec.h
|
2022-01-14 20:17:18 +01:00 |
|
Hannu Hanhi
|
49d03913d7
|
Add missing optimization to npo2 sloped floor sprites
|
2022-01-14 20:45:28 +02:00 |
|
MascaraSnake
|
323cfaace9
|
Add blendmode support to FOFs
|
2022-01-14 19:40:45 +01:00 |
|
Hannu Hanhi
|
d0966f123f
|
Fix software splats not being clipped by ceiling walls
|
2022-01-14 20:11:49 +02:00 |
|
Hannu Hanhi
|
f72f45d93a
|
Fix software splats breaking and crashing in skyboxes
|
2022-01-14 19:53:03 +02:00 |
|
MascaraSnake
|
6bb6dc88ca
|
Merge branch 'next' into udmf-fofs-mkii
# Conflicts:
# src/hardware/hw_main.c
# src/lua_maplib.c
# src/p_spec.c
# src/p_user.c
|
2022-01-14 07:24:05 +01:00 |
|
MascaraSnake
|
37bb9d9c11
|
Fix oversight with rising FOFs
|
2022-01-13 23:11:10 +01:00 |
|
MascaraSnake
|
7c0687bc33
|
P_WriteTextmap: Copy colormap only to first tagged sector and do the rest via the linedef
|
2022-01-13 23:02:38 +01:00 |
|
MascaraSnake
|
1fdfb6ba6e
|
P_WriteTextmap: Add warning for linedef type 61
|
2022-01-13 22:14:41 +01:00 |
|
MascaraSnake
|
b8524fc741
|
P_WriteTextmap: Convert linedef executors that rely on mapthings
|
2022-01-13 21:59:00 +01:00 |
|
MascaraSnake
|
2d4aabe48e
|
P_WriteTextmap: Remove superfluous whitespaces in moreids
|
2022-01-13 18:57:41 +01:00 |
|
MascaraSnake
|
1dcee17fa4
|
P_WriteTextmap: Convert linedef type 76
|
2022-01-13 18:54:18 +01:00 |
|
spherallic
|
8007aa82ca
|
Merge branch 'next' into tutorial-scenery
|
2022-01-13 16:03:57 +01:00 |
|
katsy
|
fe3a201df5
|
fix oldringexplode not scaling or flipping
|
2022-01-13 02:52:10 -06:00 |
|
lachablock
|
4af820e82c
|
Restore a cast I didn't realize used to be there
|
2022-01-13 09:56:47 +11:00 |
|
lachablock
|
70a1dd6db0
|
Merge remote-tracking branch 'origin/next' into server-bots
|
2022-01-13 09:52:38 +11:00 |
|
LJ Sonic
|
b7dbb7782e
|
Only load map lumps that are WADs or have no extension
|
2022-01-12 23:06:26 +01:00 |
|
MascaraSnake
|
25fe26badc
|
P_WriteTextmap: Add more warnings for unconvertable stuff
|
2022-01-12 21:36:19 +01:00 |
|
spherallic
|
93512ae9f9
|
Update Zone Builder configuration.
|
2022-01-12 00:46:24 +01:00 |
|
sphere
|
f8532d4ad1
|
Merge branch 'blentran-update' into 'next'
Blentran - updated
See merge request STJr/SRB2!1656
|
2022-01-11 21:53:49 +00:00 |
|
sphere
|
53f9d4b2e0
|
Merge branch 'new-default-controls' into 'next'
Several changes to default control settings
See merge request STJr/SRB2!1682
|
2022-01-11 21:19:05 +00:00 |
|
sphere
|
0ca74432f9
|
Merge branch 'ogl-better-gpu-error' into 'next'
Improve OpenGL GDI Generic error message
See merge request STJr/SRB2!1673
|
2022-01-11 21:16:32 +00:00 |
|
sphere
|
ea3b867c7e
|
Merge branch 'rotationcrash' into 'next'
Fix 2.2.10 pre1 rollangle crash (resolves #747)
Closes #747
See merge request STJr/SRB2!1707
|
2022-01-11 21:16:14 +00:00 |
|
sphere
|
af925c1742
|
Merge branch 'taglists-refactor' into 'next'
Speed up taglist creation
See merge request STJr/SRB2!1702
|
2022-01-11 21:15:06 +00:00 |
|
sphere
|
61e6226f66
|
Merge branch 'waterdrop' into 'next'
Add collision check for flipped water drops
Closes #735
See merge request STJr/SRB2!1697
|
2022-01-11 21:12:56 +00:00 |
|
MascaraSnake
|
666833e64b
|
P_WriteTextmap: Add warnings for deprecated sector specials and reserved tags
|
2022-01-11 20:24:07 +01:00 |
|
lachablock
|
8ed18a12a4
|
Merge remote-tracking branch 'origin/next' into server-bots
|
2022-01-11 20:04:22 +11:00 |
|
katsy
|
2e4c5d1446
|
alternate fix to #555 which doesn't crash the game
|
2022-01-10 19:32:21 -06:00 |
|
MascaraSnake
|
0b9876d61b
|
P_WriteTextmap: Clear out colormap linedef special after copying the colormap
|
2022-01-10 22:10:19 +01:00 |
|
spherallic
|
af5173c90f
|
Increase Eggman's hitboxes to actually match the current sprites.
|
2022-01-10 21:38:30 +01:00 |
|
MascaraSnake
|
3b4fad16db
|
P_WriteTextmap: Convert global colormaps
|
2022-01-10 21:23:55 +01:00 |
|
MascaraSnake
|
576ded6537
|
Fix incorrectly applied FOF blendmodes
|
2022-01-10 20:59:57 +01:00 |
|
LJ Sonic
|
a6808de96c
|
Fix message sending code using hardcoded buffer size
|
2022-01-10 20:12:27 +01:00 |
|
LJ Sonic
|
de9d6ecbe6
|
Fix long chat messages causing net command failures
|
2022-01-10 20:05:58 +01:00 |
|
LJ Sonic
|
aee7803621
|
Add SKIPSTRINGL macro
|
2022-01-10 20:03:36 +01:00 |
|
LJ Sonic
|
05f1a9edc1
|
Revert "Fix long chat messages causing net command failures"
This reverts commit 1377824799.
|
2022-01-10 19:57:15 +01:00 |
|
LJ Sonic
|
7ea81eacc5
|
Fix say command and its variants using hardcoded buffer size
|
2022-01-10 19:31:41 +01:00 |
|
LJ Sonic
|
3083290af8
|
Add READSTRINGL and WRITESTRINGL macros
|
2022-01-10 18:57:18 +01:00 |
|
LJ Sonic
|
a668546088
|
Make byte stream manipulation code easier to read
|
2022-01-10 18:56:42 +01:00 |
|
GoldenTails
|
e0afc2d2b6
|
Add a player->mo check before attempting to account for ztargetting.
|
2022-01-09 17:09:57 -06:00 |
|
MascaraSnake
|
868b2577ad
|
Merge branch 'udmf-sector-fields' into udmf-full
# Conflicts:
# src/hardware/hw_main.c
# src/p_setup.c
# src/p_spec.c
|
2022-01-09 13:58:27 +01:00 |
|
MascaraSnake
|
020b738aa9
|
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
|
2022-01-09 13:52:59 +01:00 |
|
MascaraSnake
|
e7a281d994
|
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
|
2022-01-09 13:52:26 +01:00 |
|
MascaraSnake
|
e19ba99f57
|
Merge branch 'udmf-executor-triggers' into udmf-thing-types
|
2022-01-09 13:51:50 +01:00 |
|
MascaraSnake
|
95bf8ea4bb
|
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
|
2022-01-09 13:51:21 +01:00 |
|