Commits · 82f00215ac4d6b608d029ad632445ab3ce21f8f9 · STJr / SRB2 · GitLab

Snippets Groups Projects

Jan 02, 2018
- Remove unncessary extra boss frames · 82f00215
  Shaffle authored 7 years ago
  
  82f00215
- Merge branch 'public_next' · 61176ee7
  Monster Iestyn authored 7 years ago
  
  # Conflicts: # src/doomdef.h # src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj # src/win32/win_vid.c
  61176ee7
Dec 28, 2017
- Merge branch 'master' into next · 1ab52734
  Alam Ed Arias authored 7 years ago
  
  SRB2_release_2.1.20
  
  1ab52734
- GIT: ignore .vs folder · 98d6619c
  Alam Ed Arias authored 7 years ago
  
  98d6619c
- MSVC: set SubSystem on DLLs to Windows · f6479894
  Alam Ed Arias authored 7 years ago
  
  f6479894
Dec 27, 2017
- Merge branch '2.1.20-preparation' into 'next' · d937f6fc
  Monster Iestyn authored 7 years ago
  
  2.1.20 preparation See merge request STJr/SRB2!215
  d937f6fc
- Merge branch 'master' into next · 5400beb2
  Monster Iestyn authored 7 years ago
  
  5400beb2
- Merge branch 'restartaudio' into 'master' · afcdb5cd
  Monster Iestyn authored 7 years ago
  
  Add command to restart the audio system Closes #27 See merge request !214
  afcdb5cd
- Remove redundant !dedicated check · 87544629
  SteelT authored 7 years ago
  
  87544629
- Merge branch 'master' into next · f9388eab
  Alam Ed Arias authored 7 years ago
  
  f9388eab
- Merge branch 'respawnspecials-mobjtype-hotfix' into 'next' · fa507ee9
  Monster Iestyn authored 7 years ago
  
  P_RespawnSpecials mobj type hotfix See merge request !217
  fa507ee9
- Merge branch 'airbob-fix-backport' into 'next' · a87eec89
  Monster Iestyn authored 7 years ago
  
  Airbob fix backport See merge request !219
  a87eec89
- Indentation cleanup · 38561656
  SteelT authored 7 years ago
  
  38561656
- Makefile: disable win_dbg for DirectDraw · f397b5fc
  Alam Ed Arias authored 7 years ago
  
  f397b5fc
- Disable win_dbg · a29203ac
  Alam Ed Arias authored 7 years ago
  
  a29203ac
- TCP: remove BADSOCKET · e2b604fd
  Alam Ed Arias authored 7 years ago
  
  e2b604fd
Dec 25, 2017
- SRB2: disable Smaller Type Check for MSVC · 97af30ae
  Alam Arias authored 7 years ago
  
  97af30ae
Dec 24, 2017
- Merge branch 'master' into next · 6886a29e
  Monster Iestyn authored 7 years ago
  
  6886a29e
- Merge branch 'addfile-netgame-fixes' into 'master' · 69be3f34
  Monster Iestyn authored 7 years ago
  
  "addfile" console command netgame fixes See merge request !218
  69be3f34
Dec 20, 2017
- Fix airbob sectors fucking up when below 0 z-height. · a1620b70
  toaster authored 7 years ago and Monster Iestyn committed 7 years ago
  
  a1620b70
- Merge branch 'master' into addfile-netgame-fixes · ff745531
  toasterone authored 7 years ago
  
  Unverified
  
  ff745531
- Merge pull request #216 from LJSonik/download-freeze-fix · 6ef3465d
  toasterone authored 7 years ago
  
  Fix Master Server requests and player joins stopping file downloading
  Unverified
  
  6ef3465d
Dec 18, 2017
- Command_Addfile: add "too many files" and already-loaded checks and respective error messages · d576453b
  Monster Iestyn authored 7 years ago
  
  No more shall the server be kicked from their own servers for re-adding a wad by accident!
  d576453b
- Merge branch 'master' into download-freeze-fix · 36ce6579
  LJ Sonic authored 7 years ago
  
  Unverified
  
  36ce6579
- Merge branch 'download-freeze-fix' of https://github.com/LJSonik/SRB2 into download-freeze-fix · 47481804
  LJ Sonic authored 7 years ago
  
  47481804
- Add a short comment to explain the newplayernum hack · c8e9e779
  LJ Sonic authored 7 years ago
  
  c8e9e779
- Merge branch 'master' into next · 57a7a3be
  Alam Ed Arias authored 7 years ago
  
  57a7a3be
Dec 17, 2017
- Merge pull request #218 from LJSonik/resynch-fixes · 47a06ffd
  Monster Iestyn authored 7 years ago
  
  Resynch fixes
  Unverified
  
  47a06ffd
- Merge branch 'master' into download-freeze-fix · 084a534f
  LJ Sonic authored 7 years ago
  
  Unverified
  
  084a534f
- Merge branch 'master' into resynch-fixes · 9c7ff6e0
  LJ Sonic authored 7 years ago
  
  Unverified
  
  9c7ff6e0
- Added a bunch of I_Asserts to lua_hooklib.c relating to mobj types just in case · c7cd6458
  Monster Iestyn authored 7 years ago
  
  c7cd6458
- Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that... · ec103678
  Monster Iestyn authored 7 years ago
  
  Bail out of P_RespawnSpecials if no mobjinfo entry has a doomednum that matches, and print a warning to the console. This prevents a mobj of NUMMOBJTYPES from being created and potentially crashing the game. Really, this happens only if you start messing with the mapthings of respawning items like rings/weapons/etc in the first place via Lua.
  ec103678
Dec 16, 2017
- Merge branch 'master' into next · baf22717
  Alam Ed Arias authored 7 years ago
  
  baf22717
- Merge pull request #212 from SteelTitanium/window_center_fix · 703c5322
  Alam Arias authored 7 years ago
  
  Fix for window being offcenter
  Unverified
  
  703c5322
- Merge branch 'master' into next · bd86f988
  Alam Ed Arias authored 7 years ago
  
  bd86f988
- Merge pull request #219 from LJSonik/net-archive-fix · 2ad4e1a1
  Monster Iestyn authored 7 years ago
  
  Fix missing lua_pop in ArchiveExtVars
  Unverified
  
  2ad4e1a1
Dec 15, 2017
- Merge branch 'net-archive-fix' of https://github.com/LJSonik/SRB2 into net-archive-fix · 4ea5d2df
  LJ Sonic authored 7 years ago
  
  4ea5d2df
- Return for both players and mobjs if they've got an empty table, instead of just mobjs · beb9b0f1
  LJ Sonic authored 7 years ago
  
  beb9b0f1
- Merge branch 'master' into net-archive-fix · b9941809
  LJ Sonic authored 7 years ago
  
  Unverified
  
  b9941809
- Fix missing lua_pop in ArchiveExtVars · 0b836a98
  LJ Sonic authored 7 years ago
  
  0b836a98