stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-24 02:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity
13568 commits 174 branches 42 tags 288 MiB
Commit graph

463 commits

Author SHA1 Message Date
Arthur
e909f8ec12 Fixes Issue #711 2022-12-31 21:06:39 -05:00
Eidolon
c5527f9470 Merge branch 'pterabyte-tweaks' into 'next' 
Fix Pterabyte spawns (+ behavior tweaks)

See merge request STJr/SRB2!1839
 2022-11-13 23:40:56 +00: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
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
spherallic
57cf1f870d Fix Pterabyte spawns, revert mashing requirement, increase grace period 2022-10-25 13:11:30 +02:00
spherallic
9da90cef8e Merge branch 'next' into gravityflipping 2022-09-30 21:27:32 +02:00
sphere
70161ff52e Merge branch 'fancarry' into 'next' 
Add carry type to fans (with fixed merge conflicts)

See merge request STJr/SRB2!1809
 2022-09-30 13:07:19 +00:00
spherallic
f37d466343 Merge branch 'next' into gravityflipping 2022-09-29 19:27:00 +02:00
spherallic
612424e2e2 Merge branch 'next' into fancarry 2022-09-16 22:54:08 +02:00
spherallic
9e9e3f4cca Correct ceilingz handling in quicksand 2022-09-12 14:00:17 +02:00
spherallic
9499d16221 Fix quicksand in reverse gravity 2022-09-12 11:27:28 +02: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
5790168194 Convert P_TeleportMove use to origin funcs 2022-04-26 20:56:34 -05:00
Sally Coolatta
d476b41dfa P_SetOrigin & P_MoveOrigin to replace P_TeleportMove 2022-04-26 20:56:33 -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
Sally Coolatta
e4930535f3 P_InitAngle, to fix angle interpolation on spawning objects 2022-04-26 20:56:31 -05:00
Eidolon
f0279e69f2 Reset mobj interp state on TeleportMove 2022-04-26 20:31:39 -05:00
MascaraSnake
faa7d89e3e Merge branch 'udmf-more-linedef-types' into udmf-sector-fields 2022-04-20 21:01:16 +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
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
spherallic
14295ac7de 2022 2022-03-03 20:24:46 +01:00
spherallic
d624ee2541 Revert "minor spike optimisations" 
This reverts commit b2d693a547.
 2022-02-28 14:30:01 +01:00
James R
518de0ce10 Add P_CheckMove 
Checks if P_TryMove would succeed without actually moving.
 2022-02-01 03:37:03 -08:00
MascaraSnake
2b4d32b372 Turn solid lava into a damagetype 2021-12-31 12:15:01 +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
2fd6eafbcf Expose sector flags to Lua and UDMF 2021-12-30 14:16:00 +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
b1d0870511 (Mostly) adapt fan to UDMF 2021-12-28 07:47:10 +01:00
sphere
4b9d40b911 Merge branch 'we-do-a-little-trolling' into 'next' 
Take ramp sectors into account for pushables (closes #595)

Closes #595

See merge request STJr/SRB2!1540
 2021-12-20 12:34:26 +00:00
sphere
b092374e1a Merge branch 'lagspikes' into 'next' 
Minor spike optimisations

See merge request STJr/SRB2!1669
 2021-12-20 12:33:13 +00:00
katsy
97e2fe18c6 fix spike sandwich teleportation issue 2021-12-06 18:00:30 -06:00
katsy
b2d693a547 minor spike optimisations 2021-12-05 02:13:09 -06:00
Radicalicious
d791fc2dc8 Merge remote-tracking branch 'stjr/next' into we-do-a-little-trolling 2021-12-03 21:53:32 -06:00
LJ Sonic
be87a84a01 Merge branch 'perfstats-averaging-rebased' into 'next' 
Perfstats averaging and refactor

See merge request STJr/SRB2!1643
 2021-12-02 23:57:26 +00:00
spherallic
49e6e7a80f Fix retracting spikes dealing typeless damage instead of spike damage. 2021-11-27 16:19:04 +01:00
Hannu Hanhi
77ecfb9cdc Perfstats averaging and refactor 2021-10-29 02:18:02 +03:00
GoldenTails
72bf2a9897 Add angle field to linedef_t 2021-08-24 03:13:18 -05:00
Radicalicious
165be34206 Fix player maxstep, oops 2021-06-09 12:59:06 -04:00
Radicalicious
976373dd37 Calculate maxstep for pushables 2021-06-08 23:45:50 -04:00
James R
4d22b9f17f Merge remote-tracking branch 'origin/next' into hooklib-refactor 2021-06-07 18:12:52 -07:00
Nev3r
6edad47788 Merge branch 'no-airwalking-springs' into 'next' 
No airwalking (from horizontal springs)

See merge request STJr/SRB2!1428
 2021-06-01 07:38:04 -04:00
sphere
65350e59c9 Merge branch 'rollout-stuff' into 'next' 
Rollout rock improvements

Closes #445, #221, and #532

See merge request STJr/SRB2!1401
 2021-05-31 16:12:17 -04:00
Steel Titanium
a2667f4dc9 Merge branch 'master' into next 2021-05-11 20:08:44 -04:00
Lach
5fb4b34f8c Merge branch 'steamed' into 'next' 
Make steam apply sprung flag

See merge request STJr/SRB2!1365
 2021-05-10 08:39:06 -04:00