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
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
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
95e909400f
Fix blendmode regression in OpenGL caused by faulty fog wall support
2022-01-09 13:45:56 +01:00
MascaraSnake
ce29d05be8
Fix typo in wall scroller conversion
2022-01-09 12:53:12 +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
a8e32cfe12
Fix incorrect turnaround behavior for bounceFloor and bounceCeiling
2022-01-05 00:26:10 +01:00
MascaraSnake
e0ed58f577
Fix UDB config typo
2022-01-04 19:49:28 +01:00
MascaraSnake
7609f300ba
Fix typo in laser FOF conversion
2022-01-04 19:45:36 +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
MascaraSnake
ee728126df
Fix oversight with linedef type 604
2021-12-31 14:09:38 +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
