Commits · 1af969d579b31419859f2e6d38073b5a424687a8 · SteelT / SRB2

Jun 22, 2019
- Merge branch 'pk3_leak' into 'master' · 1af969d5
  Monster Iestyn authored 5 years ago
  
  Pk3 Leaks See merge request STJr/SRB2!500
  1af969d5
Jun 21, 2019
- Free the zentries · 8444379d
  Sryder authored 5 years ago
  
  8444379d
- Merge branch 'master' into pk3_leak · 83da71f8
  Sryder authored 5 years ago
  
  83da71f8
- Remember to end inflating · dcd4995e
  Sryder authored 5 years ago
  
  dcd4995e
- Merge branch 'stand(alone)-lump-comedy' into 'master' · fb182369
  Monster Iestyn authored 5 years ago
  
  Stand(alone) lump comedy See merge request STJr/SRB2!499
  fb182369
Jun 20, 2019
- Fix the clearly accidental duplication of lumpinfo's memory allocation in ResGetLumpsStandalone · bc2804d3
  Monster Iestyn authored 5 years ago
  
  bc2804d3
Jun 14, 2019
- Merge branch 'apng-opengl' into 'master' · 96b12f09
  Monster Iestyn authored 5 years ago
  
  opengl apng fix See merge request STJr/SRB2!497
  96b12f09
- Update m_misc.c · c5916337
  Lactozilla authored 5 years ago
  
  c5916337
Jun 08, 2019
- Merge branch '2.1.24-prep' into 'next' · bfa73252
  SteelT authored 5 years ago
  
  Update version to 2.1.24 See merge request STJr/SRB2!495
  SRB2_release_2.1.24
  
  bfa73252
Jun 07, 2019
- Merge branch 'next' into 2.1.24-prep · f5d883bd
  Monster Iestyn authored 5 years ago
  
  # Conflicts: # debian-template/control # debian/changelog
  f5d883bd
- Merge branch 'master' into next · ea08ba3f
  Alam Ed Arias authored 5 years ago
  
  ea08ba3f
- Merge branch 'gme-msvc' into 'master' · 83b8a98d
  Alam Ed Arias authored 5 years ago
  
  Add GME to MSVC 10 solution See merge request STJr/SRB2!448
  83b8a98d
- Merge branch 'next' into 2.1.24-prep · c0c1e541
  SteelT authored 5 years ago
  
  c0c1e541
- Merge branch 'travis-deployer' into 'master' · 3edf73f1
  Alam Ed Arias authored 5 years ago
  
  Deploy OS X and Debian packages from Travis-CI See merge request STJr/SRB2!449
  3edf73f1
- Merge branch 'master' into travis-deployer · 3c08ee13
  SteelT authored 5 years ago
  
  # Conflicts: # .travis.yml
  3c08ee13
- Merge branch 'jimita-flashpals-on-screenshots' into 'next' · e1d025cd
  SteelT authored 5 years ago
  
  Flashpals on screenshots See merge request STJr/SRB2!492
  e1d025cd
- Merge branch 'more-limits' into 2.1.24-prep · eb99ad04
  SteelT authored 5 years ago
  
  eb99ad04
- Update version to 2.1.24 · 6f6d912f
  Monster Iestyn authored 5 years ago
  
  6f6d912f
Jun 03, 2019
- Upped freeslots limit · d4dac527
  SteelT authored 5 years ago
  
  d4dac527
May 25, 2019
- Merge branch 'next' into jimita-flashpals-on-screenshots · dc273d3f
  SteelT authored 5 years ago
  
  dc273d3f
May 13, 2019
- Merge branch 'master' into next · 600a3737
  Monster Iestyn authored 5 years ago
  
  600a3737
- Merge branch 'archiveworld-sigsegv-fix' into 'next' · 2a9019c1
  Monster Iestyn authored 5 years ago
  
  Fix SIGSEGV from sending lindefs/sidedefs in savegame due to duplicated lines. See merge request STJr/SRB2!490
  2a9019c1
- Fix NONET build · addf2bb3
  Alam Ed Arias authored 5 years ago
  
  addf2bb3
- Merge branch 'perpetual-modifier-updates' into 'master' · 8a144274
  SteelT authored 5 years ago
  
  Set modifiers in a non-reactive manner See merge request STJr/SRB2!456
  8a144274
- Merge branch 'no-frameskip' into 'next' · 06961a8f
  SteelT authored 5 years ago
  
  Don't skip frames when connecting or paused See merge request STJr/SRB2!489
  06961a8f
- Properly fix crash due to duplicated lines. · cad65ad5
  SteelT authored 5 years ago
  
  cad65ad5
- Revert "Check that lumps are okay" · 4e0cc250
  SteelT authored 5 years ago
  
  This reverts commit 7ac0a8b4.
  4e0cc250
May 09, 2019
- Check that lumps are okay · 7ac0a8b4
  James R. authored 6 years ago and SteelT committed 5 years ago
  
  7ac0a8b4
May 08, 2019
- Merge branch 'master' into next · f0e16cad
  Monster Iestyn authored 5 years ago
  
  f0e16cad
- Merge branch 'alias_recursion_hotfix_2' into 'master' · 8ea9d0e9
  Monster Iestyn authored 5 years ago
  
  Alias recursion hotfix 2 See merge request STJr/SRB2!482
  8ea9d0e9
- Don't skip frames when connecting or paused · 8f05d759
  wolfs authored 5 years ago
  
  8f05d759
- Merge branch 'public-musicplus-tagfix' into 'next' · e394f41c
  wolfs authored 5 years ago
  
  Fix music load lag by reverting tag changes See merge request STJr/SRB2!486
  e394f41c
May 06, 2019
- Merge branch 'master' into next · 406c3619
  Monster Iestyn authored 5 years ago
  
  406c3619
- Merge branch 'banip-command' into 'next' · aab2f55a
  Nev3r authored 5 years ago
  
  Ban IP command See merge request STJr/SRB2!460
  aab2f55a
- Merge branch 'console-wait-fix' into 'master' · ae25e8ea
  Nev3r authored 5 years ago
  
  Don't count down wait timer when executing a command line See merge request STJr/SRB2!483
  ae25e8ea
- Merge branch 'opengl-sprite-billboarding' into 'master' · 8b8e165d
  Nev3r authored 5 years ago
  
  OpenGL Sprite Billboarding See merge request STJr/SRB2!485
  8b8e165d
- Add a cvar for sprite billboarding, off by default. · 82735349
  Sryder authored 5 years ago
  
  82735349
May 03, 2019
- Merge branch 'master' into next · 454306cf
  Monster Iestyn authored 5 years ago
  
  454306cf
- add parentheses around these conditions to fix sloped lights cutting out... · a5dfbe7e
  Monster Iestyn authored 5 years ago
  
  add parentheses around these conditions to fix sloped lights cutting out lights on FOF walls for apparently no reason not making a merge request because this is so laughably stupidly simple
  a5dfbe7e
- Merge branch 'master' into next · d4ab2837
  Monster Iestyn authored 5 years ago
  
  d4ab2837