Commits · 0833f0bd4f511a1ba58f9f284bb793231d9dcde0 · STJr / SRB2 · GitLab

Snippets Groups Projects

Jan 14, 2022
- Merge branch 'udmf-executor-triggers' into udmf-thing-types · 0833f0bd
  MascaraSnake authored 3 years ago
  
  # Conflicts: # src/p_setup.c # src/p_spec.h
  0833f0bd
- Merge branch 'udmf-linedef-executors' into udmf-executor-triggers · 0d9860c3
  MascaraSnake authored 3 years ago
  
  0d9860c3
- Merge branch 'udmf-lighting' into udmf-linedef-executors · 4b8f5bd7
  MascaraSnake authored 3 years ago
  
  # Conflicts: # extras/conf/udb/Includes/SRB222_misc.cfg # src/doomdata.h # src/r_defs.h
  4b8f5bd7
- Merge branch 'udmf-polyobjects' into udmf-lighting · 79cf2f53
  MascaraSnake authored 3 years ago
  
  79cf2f53
- Merge branch 'udmf-scrollers' into udmf-polyobjects · 7d2a188c
  MascaraSnake authored 3 years ago
  
  7d2a188c
- Merge branch 'udmf-plane-linedefs' into udmf-scrollers · 940d0761
  MascaraSnake authored 3 years ago
  
  # Conflicts: # extras/conf/udb/Includes/SRB222_misc.cfg # src/p_spec.h
  940d0761
- Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs · 5d343f9c
  MascaraSnake authored 3 years ago
  
  # Conflicts: # extras/conf/udb/Includes/SRB222_misc.cfg # src/p_spec.h
  5d343f9c
- Add blendmode support to FOFs · 323cfaac
  MascaraSnake authored 3 years ago
  
  323cfaac
- Merge branch 'next' into udmf-fofs-mkii · 6bb6dc88
  MascaraSnake authored 3 years ago
  
  # Conflicts: # src/hardware/hw_main.c # src/lua_maplib.c # src/p_spec.c # src/p_user.c
  6bb6dc88
Jan 11, 2022
- Update Zone Builder configuration. · 93512ae9
  sphere authored 3 years ago
  
  93512ae9
- Merge branch 'blentran-update' into 'next' · f8532d4a
  sphere authored 3 years ago
  
  Blentran - updated See merge request !1656
  f8532d4a
- Merge branch 'new-default-controls' into 'next' · 53f9d4b2
  sphere authored 3 years ago
  
  Several changes to default control settings See merge request !1682
  53f9d4b2
- Merge branch 'ogl-better-gpu-error' into 'next' · 0ca74432
  sphere authored 3 years ago
  
  Improve OpenGL GDI Generic error message See merge request !1673
  0ca74432
- Merge branch 'rotationcrash' into 'next' · ea3b867c
  sphere authored 3 years ago
  
  Fix 2.2.10 pre1 rollangle crash (resolves #747) Closes #747 See merge request STJr/SRB2!1707
  ea3b867c
- Merge branch 'taglists-refactor' into 'next' · af925c17
  sphere authored 3 years ago
  
  Speed up taglist creation See merge request !1702
  af925c17
- Merge branch 'waterdrop' into 'next' · 61e6226f
  sphere authored 3 years ago
  
  Add collision check for flipped water drops Closes #735 See merge request !1697
  61e6226f
- alternate fix to #555 which doesn't crash the game · 2e4c5d14
  katsy authored 3 years ago
  
  2e4c5d14
Jan 09, 2022
- Merge branch 'udmf-executor-triggers' into udmf-thing-types · e19ba99f
  MascaraSnake authored 3 years ago
  
  e19ba99f
- Merge branch 'udmf-linedef-executors' into udmf-executor-triggers · 95bf8ea4
  MascaraSnake authored 3 years ago
  
  95bf8ea4
- Merge branch 'udmf-lighting' into udmf-linedef-executors · fba986ff
  MascaraSnake authored 3 years ago
  
  fba986ff
- Merge branch 'udmf-polyobjects' into udmf-lighting · 0b820449
  MascaraSnake authored 3 years ago
  
  0b820449
- Merge branch 'udmf-scrollers' into udmf-polyobjects · 904b434c
  MascaraSnake authored 3 years ago
  
  904b434c
- Merge branch 'udmf-plane-linedefs' into udmf-scrollers · 0c6e2c70
  MascaraSnake authored 3 years ago
  
  0c6e2c70
- Merge branch 'udmf-fofs-mkii' into udmf-plane-linedefs · 5e7547b8
  MascaraSnake authored 3 years ago
  
  5e7547b8
- Fix blendmode regression in OpenGL caused by faulty fog wall support · 95e90940
  MascaraSnake authored 3 years ago
  
  95e90940
- Fix typo in wall scroller conversion · ce29d05b
  MascaraSnake authored 3 years ago
  
  ce29d05b
Jan 07, 2022
- Speed up taglist creation · 3248556f
  MascaraSnake authored 3 years ago
  
  3248556f
- Update VS project files · 5149699d
  MascaraSnake authored 3 years ago
  
  5149699d
Jan 04, 2022
- Fix incorrect turnaround behavior for bounceFloor and bounceCeiling · a8e32cfe
  MascaraSnake authored 3 years ago
  
  a8e32cfe
- Chained spring: Correct flag description in UDB config · 8291d433
  MascaraSnake authored 3 years ago
  
  8291d433
- Gas jet: Fix typo in UDB config · 70a28bad
  MascaraSnake authored 3 years ago
  
  70a28bad
- Fix typos in binary-to-UDMF conversion · 88fae019
  MascaraSnake authored 3 years ago
  
  88fae019
- Egg Slimer: Fix typo in binary-to-UDMF conversion and invert speed-up flag · 9d67420e
  MascaraSnake authored 3 years ago
  
  9d67420e
- UDB config: Move thing type args from Doom section to UDMF section · 46ad1e4a
  MascaraSnake authored 3 years ago
  
  46ad1e4a
- Fix UDB config typo · 6cc7cc32
  MascaraSnake authored 3 years ago
  
  6cc7cc32
- Fix UDB config typo · e0ed58f5
  MascaraSnake authored 3 years ago
  
  e0ed58f5
- Fix typo in laser FOF conversion · 7609f300
  MascaraSnake authored 3 years ago
  
  7609f300
- Merge branch 'blentran-update' of git.do.srb2.org:STJr/SRB2 into blentran-update · ee7fc985
  MascaraSnake authored 3 years ago
  
  ee7fc985
- Fix cyan pixel cutting in Software · c7281d18
  sphere authored 3 years ago
  
  c7281d18
- Turn the fog wall linedef type into a blendmode · 8c17bb57
  MascaraSnake authored 3 years ago and sphere committed 3 years ago
  
  8c17bb57