Sally Coolatta
1b43cdddd5
Allow saving in modified games.
2022-11-16 11:14:29 -05:00
Eidolon
9a88c9ea47
Merge branch 'gravityflipping' into 'next'
...
Gravity flip bugfixes & additions
Closes #378 , #661 , and #430
See merge request STJr/SRB2!1808
2022-11-12 23:33:07 +00:00
Eidolon
f3830b2934
Merge branch 'pandoras-letter' into 'next'
...
Fix hidden 100% completion reward actually being obtained at 50% completion
See merge request STJr/SRB2!1842
2022-11-11 23:00:24 -06:00
Alam Ed Arias
f5e1d9722f
Merge branch 'master' into next
2022-11-11 22:03:58 -05:00
Alam Ed Arias
e1fd0dfca3
Cleanup whitespace changes from SRB2_release_2.1.23
2022-11-11 21:19:29 -05:00
Eidolon
12c2ddb115
Merge branch 'uncappedrevengeance' into next
...
Uncapped
See merge request STJr/SRB2!1856
# Conflicts:
# src/dummy/i_system.c
# src/win32/win_sys.c
2022-11-08 21:13:50 -06:00
MascaraSnake
812e154638
Fix typo in rising FOF binary-to-UDMF conversion
2022-11-06 07:52:54 +01:00
katsy
a10b824e0d
pandora's box is condition 28, not 27
2022-11-01 14:59:10 -05:00
James R
76879299f9
Restrict exec path to srb2 directories
2022-10-14 22:10:24 -07:00
James R
b1a86b0b34
Disallow adding files with absolute path or traversing upward
...
(Except as part of srb2home, srb2path or addons_folder --
this lets addons menu work, primarily.)
- disallowed when using addfile or addfolder
- security check for xcmd receive
2022-10-14 20:41:45 -07:00
sphere
31a6b7b365
Merge branch 'improve-439-again' into 'next'
...
Allow linedef action 439 to set different back-side textures (again)
See merge request STJr/SRB2!1812
2022-10-10 16:21:06 +00:00
MascaraSnake
049bfd7bd4
Minor code cleanup in P_ConvertBinaryLinedefTypes
2022-10-09 17:17:16 +02:00
spherallic
f37d466343
Merge branch 'next' into gravityflipping
2022-09-29 19:27:00 +02:00
sphere
a53d9b3788
Merge branch '457failuretagfix' into 'next'
...
Fix action 457 (Track object angle) not triggering the 'failure' tag
Closes #883
See merge request STJr/SRB2!1814
2022-09-28 21:04:02 +00:00
spherallic
cc3d4acdcd
Fix AppVeyor build failure
2022-09-20 20:42:19 +02:00
spherallic
00ecddf3e9
Fix action 457 reading the failure tag from the wrong offset field
2022-09-18 12:55:17 +02:00
spherallic
cd85240ec3
Add toggle for action 439 to use backside textures
2022-09-17 11:40:44 +02:00
spherallic
fe8485cc2f
Add flag to set wind/current/push/pull strength using X offset
2022-09-17 11:20:51 +02:00
spherallic
3da9fb636a
Add plane scroller features to binary map format:
...
- Added actions for scrolling floor + ceiling simultaneously
- Added flag to use X offset for speed, instead of line length
2022-09-17 10:51:16 +02:00
spherallic
872a2001c8
Add new linedef executor trigger that checks gravity
2022-09-17 02:14:25 +02:00
spherallic
0ee81a1cc3
Support gravity override flag in UDMF
2022-09-11 19:46:57 +02:00
spherallic
8d06145377
Play gravity flip sound on jump in jumpflip sectors, reorganize code
2022-09-09 15:35:05 +02:00
spherallic
9fabddd4bb
Add sector type that flips gravity upon jumping
2022-09-08 16:56:35 +02:00
spherallic
f0adc71f9b
Add flag to invert current gravity to gravity flip executor
2022-09-08 16:56:35 +02:00
spherallic
8a0f0237f2
Merge branch 'next' into udmf-fof-flags
2022-09-06 09:52:01 +02:00
sphere
9e2d8f059d
Merge branch 'write-textmap-bruh' into 'next'
...
Fix size_t compiler warnings in P_WriteTextmap
See merge request STJr/SRB2!1785
2022-09-05 21:54:20 +00:00
MascaraSnake
ec119eac2f
Merge branch 'next' into udmf-fof-flags
2022-07-31 13:27:03 +02:00
MascaraSnake
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02:00
Eidolon
69c5da2720
Merge branch 'next' into uncappedrevengeance
2022-07-15 00:14:27 -05:00
MascaraSnake
9971592dc6
UDMF conversion: Fix noclimb flag not being applied to linedef types 66-68
2022-06-04 11:14:31 +02:00
MascaraSnake
fc4b79c0de
Fix custom FOF flag conversion in binary maps
2022-06-04 10:59:42 +02:00
Eidolon
f94c25c05c
Change UDMF wall scroll scale to SCROLL_SHIFT
...
UDMF special 502 now must scale arg 2 and 3 in the same scale
space as line length scrolling in binary format. This
is to ensure compatibility with the binary format.
Fixes STJr/SRB2#862
Co-Authored-By: MascaraSnake <jonassauer27@gmail.com>
2022-05-29 02:02:20 -05:00
Zwip-Zwap Zapony
d10ca13eb9
Apply 1 suggestion(s) to 1 file(s)
2022-05-28 12:18:09 +00:00
MascaraSnake
e1a5f48c51
Fix even more size_t printfs
2022-05-28 14:08:19 +02:00
MascaraSnake
fd2a097c34
Fix more size_t mishaps
2022-05-28 10:29:35 +02:00
Eidolon
d511857675
Reset view interp in preticker
2022-05-05 19:43:55 -05:00
Eidolon
73930c655b
Run UpdateMobjInterpolators in preticker
2022-05-05 19:27:51 -05:00
Eidolon
805941a98f
Merge public next into uncappedrevengeance
...
This is to capture the UDMF merges and make the later code review
easier.
2022-05-03 14:45:14 -05:00
MascaraSnake
28bdd7ef00
Fix size_t compiler warnings in P_WriteTextmap
2022-05-01 19:27:10 +02:00
Eidolon
f0d7d8467f
Refactor timing code even more
...
System layer is greatly simplified and framecap
logic has been moved internally. I_Sleep now
takes a sleep duration and I_SleepDuration
generically implements a precise sleep with spin
loop.
2022-05-01 00:32:46 -05:00
Eidolon
48d8c83540
Ensure view is not interpolated on first frame
2022-04-30 19:10:07 -05:00
Eidolon
c0865e4faa
Ensure mobj interpolators reset on level load
2022-04-30 17:59:32 -05:00
Eidolon
e79654a33a
Completely refactor timing system
...
Time is now tracked internally in the game using I_GetPreciseTime
and I_UpdateTime. I_Time now pulls from this internal timer. The
system code no longer needs to keep track of time itself.
This significantly improves frame and tic timing in interp mode,
resulting in a much smoother image with essentially no judder at
any framerate.
2022-04-30 16:33:23 -05:00
Eidolon
568677edc1
Move mobj interpolators to r_fps
2022-04-26 20:56:33 -05:00
Eidolon
0e1b01f206
Update mobj oldstates before all thinkers
2022-04-26 20:56:32 -05:00
Eidolon
3e5cec7e72
Intialize interpolator list at a better time
2022-04-26 20:56:31 -05:00
Eidolon
d34ec2ef06
Reset view interpolation on level load
2022-04-26 20:31:38 -05:00
MascaraSnake
5fbe5189ce
Merge branch 'udmf-sector-fields' into udmf-full
2022-04-20 21:01:52 +02:00
MascaraSnake
faa7d89e3e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-04-20 21:01:16 +02:00
MascaraSnake
5660d896e6
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
2022-04-20 21:00:44 +02:00
MascaraSnake
54640a8664
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# extras/conf/udb/Includes/SRB222_things.cfg
2022-04-20 20:59:55 +02:00
MascaraSnake
39b7fb9ff8
Merge commit 'd624ee25' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
# src/p_spec.c
2022-04-20 20:41:46 +02:00
MascaraSnake
9815d40c20
Adapt tutorial plant to UDMF
2022-04-20 20:06:08 +02:00
MascaraSnake
36bf8b1a77
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-04-19 22:33:53 +02:00
MascaraSnake
863b1e125a
Merge branch 'udmf-lighting' into udmf-linedef-executors
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:31:57 +02:00
MascaraSnake
2e56c3de35
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-04-19 22:18:30 +02:00
MascaraSnake
f672b1b940
Merge branch 'udmf-scrollers' into udmf-polyobjects
...
# Conflicts:
# src/p_spec.c
2022-04-19 22:17:28 +02:00
MascaraSnake
f164809618
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2022-04-19 22:06:32 +02:00
MascaraSnake
36692483df
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
...
# Conflicts:
# src/p_inter.c
2022-04-19 22:04:04 +02:00
MascaraSnake
0b4bbacec0
Merge branch 'next' into udmf-fofs-mkii
2022-04-19 21:59:31 +02:00
sphere
55854410ac
Merge branch 'line-angle' into 'next'
...
Add angle field to linedef_t
See merge request STJr/SRB2!1602
2022-03-22 09:09:40 +00:00
sphere
a0aebb2ed0
Merge branch 'fast-r-load-textures' into 'next'
...
Do not reload every texture when adding a wad
See merge request STJr/SRB2!1725
2022-03-21 22:41:04 +00:00
MascaraSnake
a78e4e553c
Merge branch 'next' into udmf-fofs-mkii
2022-03-18 07:29:02 +01:00
SteelT
3eaae066ef
Show overall grade emblem requirement of a multi-mare NiGHTS stage in SP pause menu
...
Fixes #71
2022-03-08 21:06:01 -05:00
spherallic
50330c746b
Merge branch 'next' into fast-r-load-textures
2022-03-08 22:11:16 +01:00
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
LJ Sonic
1a1cb8942c
Merge branch 'znodes-offset-fix' into 'next'
...
UDMF: Fix offset calculation for segs that represent linedef backsides
See merge request STJr/SRB2!1701
2022-02-06 17:12:58 +00:00
James R
2ebec53561
P_AddWadFile: only load textures in current file
2022-01-27 00:03:34 -08:00
MascaraSnake
a342703b50
Merge branch 'udmf-sector-fields' into udmf-full
...
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
2022-01-14 21:16:23 +01:00
MascaraSnake
13b8d1cf7e
Merge branch 'udmf-more-linedef-types' into udmf-sector-fields
2022-01-14 21:09:11 +01:00
MascaraSnake
7fd1c0512a
Merge branch 'udmf-thing-types' into udmf-more-linedef-types
...
# Conflicts:
# src/p_setup.c
2022-01-14 21:06:45 +01:00
MascaraSnake
0833f0bd4f
Merge branch 'udmf-executor-triggers' into udmf-thing-types
...
# Conflicts:
# src/p_setup.c
# src/p_spec.h
2022-01-14 21:01:39 +01:00
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
MascaraSnake
323cfaace9
Add blendmode support to FOFs
2022-01-14 19:40:45 +01: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
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
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
MascaraSnake
666833e64b
P_WriteTextmap: Add warnings for deprecated sector specials and reserved tags
2022-01-11 20:24:07 +01:00
MascaraSnake
0b9876d61b
P_WriteTextmap: Clear out colormap linedef special after copying the colormap
2022-01-10 22:10:19 +01:00
MascaraSnake
3b4fad16db
P_WriteTextmap: Convert global colormaps
2022-01-10 21:23:55 +01: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
MascaraSnake
fba986ff1c
Merge branch 'udmf-lighting' into udmf-linedef-executors
2022-01-09 13:50:47 +01:00
MascaraSnake
0b8204491d
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-01-09 13:50:14 +01:00
MascaraSnake
904b434c65
Merge branch 'udmf-scrollers' into udmf-polyobjects
2022-01-09 13:49:46 +01:00
MascaraSnake
0c6e2c70c7
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2022-01-09 13:49:14 +01:00
MascaraSnake
5e7547b822
Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs
2022-01-09 13:48:40 +01:00
MascaraSnake
0a2294118e
Merge branch 'udmf-scrollers' into udmf-full
2022-01-09 12:53:35 +01:00
MascaraSnake
ce29d05be8
Fix typo in wall scroller conversion
2022-01-09 12:53:12 +01:00
MascaraSnake
b3ca6845c1
P_WriteTextmap: Don't bother with equation slopes because binary maps can't have them anyway
2022-01-09 12:38:49 +01:00
MascaraSnake
7276c6bef5
P_WriteTextmap: Correctly write linedef executor delays
2022-01-09 12:37:46 +01:00
MascaraSnake
1fbfc9bea9
P_WriteTextmap: Convert custom gravity and custom exit
2022-01-09 11:44:53 +01:00
MascaraSnake
5f6014223d
Don't convert global colormaps
2022-01-09 10:41:50 +01:00
MascaraSnake
c1f03e7720
P_WriteTextmap: Convert colormaps
2022-01-09 10:22:25 +01:00
MascaraSnake
8615e86a0b
P_WriteTextmap: Don't try to write invalid textures
2022-01-09 09:27:39 +01:00
MascaraSnake
90cd009b23
Remove writethings because it no longer works properly with the binary-to-UDMF conversion
2022-01-08 16:58:55 +01:00
MascaraSnake
1269fe6c0e
Implement faster textmap parser
2022-01-08 13:17:15 +01:00
MascaraSnake
b05bcc4657
P_WriteTextmap: Correct flat offsets
2022-01-07 15:44:56 +01:00
MascaraSnake
c912222df6
Merge branch 'znodes-offset-fix' into udmf-full
2022-01-07 14:44:42 +01:00
MascaraSnake
56b00fac54
P_WriteTextmap: Rearrange properties and remove some defaults
2022-01-07 13:39:25 +01:00
MascaraSnake
95ce2aca98
P_WriteTextmap: Update friction to float
2022-01-07 12:59:29 +01:00
MascaraSnake
b6a5ff98f0
Merge branch 'udmf-sector-fields' into udmf-full
2022-01-07 12:46:47 +01:00
MascaraSnake
8b5f6cca37
Add command line parameter for saving the current map in TEXTMAP format
2022-01-07 12:45:40 +01:00
MascaraSnake
1de5b77710
Fix typo
2022-01-07 10:25:32 +01:00
MascaraSnake
659410dde1
Use Slope Skew flag instead of Upper Unpegged for FOF skewing
2022-01-05 23:47:05 +01:00
MascaraSnake
2bef8da42f
Remove access to unused effect6 flag in UDMF
2022-01-05 18:42:53 +01:00
MascaraSnake
5f97047b96
Rename linedef flags
2022-01-05 18:40:02 +01:00
MascaraSnake
55559a5f98
Split P_ConvertBinaryMap into multiple functions
2022-01-05 18:15:04 +01:00
MascaraSnake
06b7d7ceb8
Make only ML_EFFECT3 affect midtexture pegging in UDMF
2022-01-05 18:05:47 +01:00
MascaraSnake
549569e75b
Fix offset calculation for segs that represent linedef backsides
2022-01-05 10:08:49 +01:00
MascaraSnake
d25bc75a92
Remove redundant UDMF check in P_LoadSidedefs
2022-01-05 09:22:13 +01:00
MascaraSnake
577ae68d6d
Make sector friction a floating-point field
2022-01-04 21:25:34 +01:00
MascaraSnake
88fae019a2
Fix typos in binary-to-UDMF conversion
2022-01-04 19:59:51 +01:00
MascaraSnake
9d67420e5c
Egg Slimer: Fix typo in binary-to-UDMF conversion and invert speed-up flag
2022-01-04 19:57:14 +01:00
MascaraSnake
7609f300ba
Fix typo in laser FOF conversion
2022-01-04 19:45:36 +01:00
MascaraSnake
ca1d844278
Merge branch 'blentran-update' into udmf-full
2022-01-04 19:36:20 +01:00
MascaraSnake
afde568856
Add blendmode support to FOFs
2022-01-04 19:33:17 +01:00
MascaraSnake
8c17bb57e6
Turn the fog wall linedef type into a blendmode
2022-01-04 14:26:03 +01:00
MascaraSnake
3b08a15860
Expose blendmodes to UDMF
2022-01-04 14:26:03 +01:00
sphere
f455bf347b
blentran part 3: Wall & plane blendmodes.
2022-01-04 14:26:03 +01:00
MascaraSnake
913731b4bc
Merge branch 'blentran-update' into udmf-full
...
# Conflicts:
# src/lua_maplib.c
# src/p_setup.c
# src/p_spec.c
2022-01-02 23:19:47 +01:00
MascaraSnake
2886a277d8
Turn the fog wall linedef type into a blendmode
2021-12-31 15:00:27 +01:00
MascaraSnake
9b780f417e
Fix a conversion oversight with linedef type 8
2021-12-31 14:06:06 +01:00
MascaraSnake
eef7763d68
Set SSF_WINDCURRENT and SSF_CONVEYOR automatically if there's a pusher/conveyor
2021-12-31 13:58:41 +01:00
MascaraSnake
2b4d32b372
Turn solid lava into a damagetype
2021-12-31 12:15:01 +01:00
MascaraSnake
e011962156
Make the sector special field inaccessible in UDMF
2021-12-31 11:44:05 +01:00
MascaraSnake
208395214a
Implement sector fields for linedef executor triggering
2021-12-31 11:39:34 +01:00
MascaraSnake
b3be8d1f44
Implement sector damagetype field
2021-12-31 08:53:00 +01:00
MascaraSnake
feaa4f1273
Replace most sector specials with sector special flags
2021-12-31 00:03:24 +01:00
MascaraSnake
570a6ab395
Turn "intangible to camera" sector special into a sector flag
2021-12-30 20:37:57 +01:00
MascaraSnake
b3863c57be
Replace verticalflip in sector_t with a sector flag that's accessible via Lua and UDMF
2021-12-30 18:50:02 +01:00
MascaraSnake
86e2fefcac
Add sector gravity field for UDMF
2021-12-30 18:19:42 +01:00
MascaraSnake
e3d41e0bda
Adapt linedef type 540 to UDMF
2021-12-30 15:32:28 +01:00
MascaraSnake
f30b97ba93
Adapt heat wave effect to UDMF
2021-12-30 14:48:40 +01:00
MascaraSnake
2a1f96aa3c
Adapt linedef type 8 to UDMF
2021-12-30 14:26:51 +01:00
MascaraSnake
2fd6eafbcf
Expose sector flags to Lua and UDMF
2021-12-30 14:16:00 +01:00
MascaraSnake
34229030f2
Make implementation of slope copying with linedef type 700 not hacky
2021-12-30 08:10:20 +01:00
