Hannu Hanhi
8b83348216
Merge remote-tracking branch 'upstream/next' into ogl-palette-rendering-merge
2022-01-29 04:32:43 +02: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
katsy
2e4c5d1446
alternate fix to #555 which doesn't crash the game
2022-01-10 19:32:21 -06:00
MascaraSnake
95e909400f
Fix blendmode regression in OpenGL caused by faulty fog wall support
2022-01-09 13:45:56 +01:00
MascaraSnake
3248556fa9
Speed up taglist creation
2022-01-07 18:42:56 +01:00
MascaraSnake
5149699def
Update VS project files
2022-01-07 18:00:56 +01:00
MascaraSnake
ee7fc9853d
Merge branch 'blentran-update' of git.do.srb2.org:STJr/SRB2 into blentran-update
2022-01-04 19:35:10 +01:00
spherallic
c7281d1801
Fix cyan pixel cutting in Software
2022-01-04 14:26:04 +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
MascaraSnake
84dfea4580
Add new blendmode linedef types to config
2022-01-04 14:26:03 +01:00
sphere
f455bf347b
blentran part 3: Wall & plane blendmodes.
2022-01-04 14:26:03 +01:00
sphere
470b069179
blentran part 2: Sprite & patch blendmodes.
2022-01-04 14:26:03 +01:00
sphere
f9d2fd9ce5
blentran part 1: Flag changes & semibright support.
2022-01-04 14:26:03 +01:00
spherallic
1a21ca14f0
Fix cyan pixel cutting in Software
2022-01-02 20:44:24 +01:00
spherallic
719ceb0586
Add collision check for flipped water drops
2022-01-01 19:34:27 +01:00
MascaraSnake
2886a277d8
Turn the fog wall linedef type into a blendmode
2021-12-31 15:00:27 +01:00
spherallic
d9410e3e6a
fix compile warnings (this really puts the mess in message)
2021-12-30 16:29:37 +01:00
spherallic
17251895ea
Increase default camera height for both playstyles
2021-12-29 19:29:41 +01:00
spherallic
4d1fb04327
Update playstyle names on the input display
2021-12-29 19:29:41 +01:00
spherallic
0a38fef147
Several changes to default control settings:
...
- Renamed Simple to Automatic, and made it the default
- Renamed Standard to Manual
- Changed some camera settings to make Automatic easier to control
- Changed most default gamepad controls, to fit Automatic playstyle
- Changed a few default keyboard controls
- Added default binds for custom actions 1-3
- Removed forced camera settings in the tutorial (to account for
upcoming tutorial update)
- Also lowered default sound/music volume a little bit
2021-12-29 19:29:36 +01:00
sphere
e8c83f48be
Merge branch 'fix-binary-mtag' into 'next'
...
Make linedef 96 apply to tags from 97-99, but not to itself
See merge request STJr/SRB2!1633
2021-12-29 10:07:35 +00:00
sphere
4e972f7d24
Merge branch 'deathpit_explosions' into 'next'
...
Fix enemy/boss/minecart explosions in death pits (Closes #67 )
Closes #67
See merge request STJr/SRB2!1688
2021-12-29 10:00:25 +00:00
sphere
2e8b7688e8
Merge branch 'resolve-329' into 'next'
...
Allow changing the master server address while hosting a netgame
Closes #329
See merge request STJr/SRB2!1687
2021-12-29 10:00:08 +00:00
sphere
c12ad1d63c
Merge branch 'invert' into 'next'
...
Give the inverted flashpal a constant
See merge request STJr/SRB2!1685
2021-12-29 10:00:04 +00:00
sphere
68547a503b
Merge branch 'botsforexit' into 'next'
...
Don't count bots in playersforexit
See merge request STJr/SRB2!1684
2021-12-29 09:59:54 +00:00
katsy
effcb948ad
Don't count bots in playersforexit
2021-12-29 09:59:54 +00:00
sphere
e152a32c10
Merge branch 'HUD_fixes' into 'next'
...
Some hud fixes (by Confusion)
See merge request STJr/SRB2!1670
2021-12-29 09:59:40 +00:00
sphere
31eb2a7e77
Merge branch 'nobotbonus' into 'next'
...
Don't award end-of-level bonuses to Tailsbot
See merge request STJr/SRB2!1676
2021-12-27 11:49:13 +00:00
spherallic
1040141560
Fix enemy/boss/minecart explosions in death pits
2021-12-27 12:41:04 +01:00
spherallic
b830fee2e3
Allow changing the master server address while hosting a netgame.
2021-12-26 21:30:36 +01:00
spherallic
bb514d227c
Don't count music.dta as a main wad when using listwad
2021-12-26 21:12:39 +01:00
sphere
6cb6cc5afb
Merge branch 'fixlazytails' into 'next'
...
Set a default botleader if we don't have one (resolves #717 )
Closes #717
See merge request STJr/SRB2!1683
2021-12-26 12:41:49 +00:00
katsy
243a797efe
Set a default botleader if we don't have one ( resolves #717 )
2021-12-26 12:41:49 +00:00
katsy
9b10473e0d
add invert flashpal constant
2021-12-24 19:36:26 -06:00
sphere
2615528f45
Merge branch 'pterabyte-mash' into 'next'
...
CR_PTERABYTE tweaks (Closes #304 )
Closes #304
See merge request STJr/SRB2!1380
2021-12-24 13:29:13 +00: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
646844bfdc
Merge branch 'fix-drowning-vanishing' into 'next'
...
Fix player disappearing when drowning in painstate (resolves #597 )
Closes #597
See merge request STJr/SRB2!1667
2021-12-20 12:33:20 +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
sphere
1abe3374ef
Merge branch 'sandwich' into 'next'
...
Fix spike sandwich teleportation issue (resolves #693 )
Closes #693
See merge request STJr/SRB2!1672
2021-12-20 12:33:00 +00:00
sphere
3e8e6bcbb8
Merge branch 'netsave-pmomz-fix' into 'next'
...
Include pmomz for mobjs in net savestates and load if it exists (Resolves #713 )
Closes #713
See merge request STJr/SRB2!1675
2021-12-20 12:32:55 +00:00
sphere
fb5eed9d10
Merge branch 'pyreflyfire' into 'next'
...
Prevent Pyre Fly fire from warping up nearby ledges
See merge request STJr/SRB2!1681
2021-12-20 12:32:47 +00:00
spherallic
e7a7a3b213
Prevent Pyrefly fire from warping up nearby ledges.
2021-12-13 15:20:43 +01:00
MascaraSnake
ac3dd146c7
Expose blendmodes to UDMF
2021-12-12 07:02:17 +01:00
