Nev3r
022ddcf363
Merge branch 'models-plus-final' into 'next'
...
3D models support for spritexoffset, spriteyoffset, spritexscale, spriteyscale, parity with sprite rollangle
See merge request STJr/SRB2!1840
2023-07-24 12:46:10 +00:00
Sally Coolatta
7c2a241042
Remove the need for setting rotation axis in spriteinfo for models
...
Now it just does it like Software
2023-07-24 04:40:15 -04:00
Sally Coolatta
ae233b000f
Remove modeltilt, use roll & pitch instead
...
Broken currently, about half of the slopes you can go into have the wrong tilt
2023-07-24 04:11:42 -04:00
TehRealSalt
95cbee52c6
Model tilts
...
- Add modeltilt variable, for more manual control of the model tilting. By default this just copies standingslope, but doesn't get cleared in the air.
- Shadows & trailing bananas now tilt to match the ground they are on.
- Rocket Sneakers & afterimages now tilt to match the player's current orientation.
2023-07-24 04:11:42 -04:00
Ace Lite
2240742720
Merge branch SRB2:next into lua-texture-offsets-expose
2023-07-06 18:35:00 +00:00
sphere
d7a84b967c
Merge branch 'strongpower' into 'next'
...
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
See merge request STJr/SRB2!1366
2023-07-05 17:05:47 +00:00
katsy
f261b9f0e1
Add player->powers[pw_strong], refactor attacks and busting conditions, and allow breaking floors and ceilings separately
2023-07-05 17:05:47 +00:00
Sally Coolatta
49fa46d80e
Online emblems
...
Currently, emblems share with everyone. Will add an option to toggle this.
2023-06-02 16:06:43 -04:00
sphere
ce504d4e8e
Merge branch 'mobj-dispoffset' into 'next'
...
Turn dispoffset into a mobj field
See merge request STJr/SRB2!1708
2023-05-25 20:59:43 +00:00
spherallic
1470d099e3
Update copyright year & credits
2023-03-31 14:53:31 +02:00
Ashnal
7800c9e5c9
Fix use after free bug
2023-01-01 12:31:12 -06:00
Ace Lite
3217984f55
c-side offset/angle variable renamed
2022-11-25 23:01:27 +00:00
Alam Ed Arias
f5e1d9722f
Merge branch 'master' into next
2022-11-11 22:03:58 -05:00
Alam Ed Arias
7e0fa2d34c
Cleanup whitespace changes from SRB2_release_2.2.9
2022-11-11 21:19:25 -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
8d4baace53
Add Lua backwards compatibility for FOF flags
2022-07-31 12:04:42 +02: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
Eidolon
9f845622cd
Revert "P_InitAngle, to fix angle interpolation on spawning objects"
...
This reverts commit a80c98bd164a2748cbbfad9027b34601185d93f5.
2022-04-26 20:56:34 -05:00
Eidolon
568677edc1
Move mobj interpolators to r_fps
2022-04-26 20:56:33 -05:00
Eidolon
a67432a415
Add mobj interpolator on load netgame
2022-04-26 20:56:33 -05:00
Sally Coolatta
e4930535f3
P_InitAngle, to fix angle interpolation on spawning objects
2022-04-26 20:56:31 -05: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
36bf8b1a77
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-04-19 22:33:53 +02:00
MascaraSnake
2e56c3de35
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-04-19 22:18:30 +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
spherallic
14295ac7de
2022
2022-03-03 20:24:46 +01:00
MascaraSnake
0d9860c368
Merge branch 'udmf-linedef-executors' into udmf-executor-triggers
2022-01-14 20:42:59 +01:00
MascaraSnake
79cf2f53e8
Merge branch 'udmf-polyobjects' into udmf-lighting
2022-01-14 20:24:51 +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
lachablock
d764d68d02
Turn dispoffset into a mobj field
2022-01-13 18:53:26 +11: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
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
b74d06b4e7
Netsync sector flags
2021-12-30 14:33:24 +01:00
MascaraSnake
228efa5ffc
Add "relative" setting to linedef type 799 and adapt it to UDMF
2021-12-29 15:29:59 +01:00
MascaraSnake
1e1ea22e51
Separate thinker structs for dynamic line and vertex slopes
2021-12-29 13:53:38 +01:00
MascaraSnake
95248dc80f
Merge branch 'next' into udmf-thing-types
...
# Conflicts:
# src/p_mobj.c
2021-12-29 09:35:25 +01:00
MascaraSnake
59c6d59c00
Adapt NiGHTS things to UDMF
2021-12-19 21:30:49 +01:00
MascaraSnake
ebf692f143
Adapt push/pull point to UDMF
2021-12-16 07:00:30 +01:00
John FrostFox
c420de6f11
Include pmomz for mobjs in net savestates and load if it exists
2021-12-09 11:42:06 +03:00
MascaraSnake
c9ed484129
Rewrite each time thinker
2021-12-07 07:17:58 +01:00
MascaraSnake
44faed6285
Make light levels in thinkers INT16
2021-09-19 16:25:27 +02:00
MascaraSnake
68aa14f7d0
Netsync floor/ceiling lighting
2021-09-19 09:20:00 +02:00
MascaraSnake
e144f97d35
Merge branch 'udmf-plane-linedefs' into udmf-scrollers
2021-09-17 10:35:41 +02:00