Commits · e545e5f9baccac7d5468fbcbab646fe7261d92fb · STJr / SRB2 · GitLab

Snippets Groups Projects

Mar 15, 2020
- Add UDMF colormap fields · e545e5f9
  MascaraSnake authored 5 years ago
  
  e545e5f9
Feb 18, 2020
- Merge branch 'next' into udmf-next · cae99654
  MascaraSnake authored 5 years ago
  
  cae99654
Feb 17, 2020
- Merge branch 'viewroll' into 'next' · d0b9027d
  James R. authored 5 years ago
  
  Rolling See merge request STJr/SRB2!690
  d0b9027d
- Merge branch 'extra-emblem-display' into 'next' · 8e4cb953
  James R. authored 5 years ago
  
  Extra emblem hint display See merge request !721
  8e4cb953
- Merge branch 'stoppedclock-exposed' into 'next' · af141667
  James R. authored 5 years ago
  
  Expose stoppedclock to Lua See merge request !771
  af141667
- Merge branch 'lua-hud-get-rotsprites' into 'next' · 11a1ce6d
  James R. authored 5 years ago
  
  Get rotated sprites with v.getSprite(2)Patch See merge request !773
  11a1ce6d
- How many bruh moments can we have? · f4c2a455
  James R. authored 5 years ago
  
  f4c2a455
- Merge branch 'colormap_flags_refactor' into 'next' · fb666919
  James R. authored 5 years ago
  
  Clean up the mess that is extracolormap_t::fog See merge request !790
  fb666919
- Merge branch 'fix-overtime' into 'next' · d4e80ddc
  James R. authored 5 years ago
  
  Fix overtime not working See merge request !784
  d4e80ddc
- Merge remote-tracking branch 'origin/next' into fix-overtime · ae013108
  Lactozilla authored 5 years ago
  
  ae013108
- Merge remote-tracking branch 'upstream/master' into viewroll · c4b390bc
  fickleheart authored 5 years ago
  
  c4b390bc
- Merge branch 'master' into public_next · 7dac10f5
  SteelT authored 5 years ago
  
  SRB2_release_2.2.1 Verified
  
  7dac10f5
- Merge remote-tracking branch 'public/next' into public_next · 847b2bde
  SteelT authored 5 years ago
  
  Verified
  
  847b2bde
- Merge remote-tracking branch 'origin/next' into public_next · 472d533d
  James R. authored 5 years ago
  
  472d533d
- Merge remote-tracking branch 'origin/master' into next · e245354c
  James R. authored 5 years ago
  
  e245354c
- Merge branch 'revert-console-in-menus' into 'master' · 753829c8
  James R. authored 5 years ago
  
  No more console in menus because codebase sucks xd See merge request !791
  753829c8
- Revert "Let the console open in menus" · 705cf9fd
  James R. authored 5 years ago
  
  This reverts commit ef3d462e.
  705cf9fd
- Update credit at Rob's request · 773ed0a0
  SteelT authored 5 years ago
  
  Verified
  
  773ed0a0
- Merge branch 'mobj-shadowscale-send' into 'public_next' · 18601c2e
  SteelT authored 5 years ago
  
  Fix object shadow not appearing for mid-joiners See merge request STJr/SRB2Internal!627
  18601c2e
Feb 16, 2020
- Merge branch 'public_next' into mobj-shadowscale-send · 728e01e6
  SteelT authored 5 years ago
  
  Verified
  
  728e01e6
- Update file hash yet again · b44358df
  SteelT authored 5 years ago
  
  Verified
  
  b44358df
- Fix object shadow not appearing for mid-joiners · cb97aafd
  SteelT authored 5 years ago
  
  Verified
  
  cb97aafd
- Clean up the mess that is extracolormap_t::fog · 512c6f24
  MascaraSnake authored 5 years ago
  
  512c6f24
- Update comment · 3a82864c
  SteelT authored 5 years ago
  
  Verified
  
  3a82864c
- Merge remote-tracking branch 'public/next' into public_next · 13a521d8
  SteelT authored 5 years ago
  
  Verified
  
  13a521d8
Feb 15, 2020
- Merge branch 'fix-ded-servers' into 'next' · b2168aba
  LJ Sonic authored 5 years ago
  
  Fix dedicated servers not running gamelogic See merge request !788
  b2168aba
- Fix dedicated servers not running gamelogic · 7b13f0a2
  LJ Sonic authored 5 years ago
  
  Note to future testers: Remember to test dedicated servers before merging. And splitscreen also.
  7b13f0a2
- Fix overtime not working · 5dc0f064
  Lactozilla authored 5 years ago
  
  5dc0f064
- Update hashes (again) · e7a0fc65
  MascaraSnake authored 5 years ago
  
  e7a0fc65
- Merge remote-tracking branch 'Public/next' into public_next · 9dd788a9
  MascaraSnake authored 5 years ago
  
  9dd788a9
- Merge branch 'master' into next · 31bce6c8
  MascaraSnake authored 5 years ago
  
  31bce6c8
- Merge branch 'dropshadows-refactor' into 'next' · 63ffe561
  MascaraSnake authored 5 years ago
  
  Use exact object types when setting shadowscale See merge request !755
  63ffe561
- Merge branch 'fix-shift-in-ciptbx' into 'master' · b332aaa6
  MascaraSnake authored 5 years ago
  
  I broke SHIFT in the Connect IP Textbox.. whoops. See merge request !777
  b332aaa6
- Merge branch 'leftover-tokens' into 'next' · 7bb7cb61
  MascaraSnake authored 5 years ago
  
  Don't carry extra tokens into the next level if you got all 7 emeralds already See merge request !778
  7bb7cb61
- Merge remote-tracking branch 'Public/next' into public_next · 869748df
  MascaraSnake authored 5 years ago
  
  869748df
- Merge branch 'po-slide-fixes' into 'next' · 9bf0cfda
  MascaraSnake authored 5 years ago
  
  Improvements to polyobjects carrying things See merge request !772
  9bf0cfda
- Merge branch 'S_SKIN-missing-flag' into 'next' · fff638f4
  MascaraSnake authored 5 years ago
  
  Missing flag in S_SKIN See merge request !781
  fff638f4
Feb 13, 2020
- Merge branch 'linedef-alpha' into 'udmf-next' · 2f465e67
  MascaraSnake authored 5 years ago
  
  Implement linedef alpha field See merge request !774
  2f465e67
- Merge branch 'patch-valid' into 'next' · ba92db41
  James R. authored 5 years ago
  
  Don't error when checking patch.valid on invalid patches See merge request !780
  ba92db41
- Add flag name variant of SF_NONIGHTSROTATION to S_SKIN · 84109497
  James R. authored 5 years ago
  
  84109497