Permalink
Commits on Sep 17, 2018
  1. Merge pull request #986 from smcv/gcc8

    xycaleth committed Sep 17, 2018
    JK2: Remove mismatched allocator from std::map typedefs
Commits on Sep 15, 2018
  1. Merge branch 'master' into gcc8

    xycaleth committed Sep 15, 2018
  2. Merge pull request #978 from xycaleth/fix/s-khz

    xycaleth committed Sep 15, 2018
    Use s_khz with SDL sound backend
Commits on Aug 9, 2018
  1. JK2: Remove mismatched allocator from std::map typedefs

    smcv committed Aug 6, 2018
    The Allocator is meant to be one that is suitable for allocating
    std::pair<key, value> instances, not value instances, and the
    Standard C++ library provided by gcc 8 asserts that the types match.
    The closest valid allocator here would be
    std::allocator<std::pair<key, value>>, but that is the default for
    this template anyway, so we can just omit it.
    
    Closes: #985
    Bug-Debian: https://bugs.debian.org/905477
    Signed-off-by: Simon McVittie <smcv@debian.org>
  2. macOS CI: Upgrade Homebrew packages before installing

    smcv committed Aug 9, 2018
    Travis-CI's macOS worker image currently has libpng installed at a
    slightly outdated version. Unlike "apt install", "brew install"
    will not upgrade a package that is already installed, and will exit
    unsuccessfully when asked to do so. There does not seem to be a
    Homebrew command for "upgrade these packages if installed, or install
    them if not installed", so the most straightforward way seems to be
    to upgrade everything before invoking brew install.
    
    Fixes: #987
Commits on Jun 9, 2018
  1. Add missing sdl_sound.h file

    xycaleth committed Jun 9, 2018
  2. Use s_khz with SDL sound backend

    xycaleth committed Jun 9, 2018
    And remove s_sdlSpeed
Commits on Jun 6, 2018
  1. openbsd build fix

    devnexen authored and Razish committed Oct 15, 2017
Commits on May 8, 2018
  1. Merge pull request #977 from xycaleth/dev/bundle-sdl2-with-macos-app

    ensiform committed May 8, 2018
    Add SDL2 to macOS app bundle
  2. Merge pull request #976 from xycaleth/dev/move-tools

    ensiform committed May 8, 2018
    Remove tools which were moved to OpenJK-Tools
  3. Merge pull request #975 from xycaleth/dev/remove-unused-tools

    ensiform committed May 8, 2018
    Remove Xbox-related or unused tools
Commits on May 7, 2018
  1. Add SDL2 to macOS app bundle

    xycaleth committed May 7, 2018
    This will make the macOS app bundle completely self-contained (as it
    should be), i.e. the client will not need to install SDL2 separately.
Commits on May 6, 2018
  1. Remove tools which were moved to OpenJK-Tools

    xycaleth committed May 6, 2018
  2. Remove Xbox-related or unused tools

    xycaleth committed May 6, 2018
    Some of the tools were purpose-made for assets to be used on the Xbox.
    We don't need these anymore so let's remove them.
Commits on May 4, 2018
  1. Merge pull request #972 from xycaleth/dev/cmake-upgrade

    ensiform committed May 4, 2018
    Upgrade minimum CMake to 3.1
Commits on Apr 28, 2018
  1. Upgrade minimum CMake to 3.1

    xycaleth committed Apr 28, 2018
    And update all the copyright years in those files
Commits on Apr 14, 2018
Commits on Apr 1, 2018
  1. Merge pull request #967 from JACoders/dev/fix-legacy-mods-ghoul2-api

    xycaleth committed Apr 1, 2018
    Fix Ghoul2 API on server and UI for legacy mods
Commits on Mar 27, 2018
  1. MP Ded: Make G2 api more in line with vanilla regular renderer

    ensiform committed Mar 27, 2018
    Fixes some derpiness in cases where handle is invalid and also adds missing calls to check model pointers in some functions.
Commits on Mar 25, 2018
  1. MP: Fix G2 AddBolt API returning inconsistent result

    ensiform committed Mar 25, 2018
    In original game if the g2 pointer/ref was invalid it would return -1.  In the new modules it seems to have changed to returning to 0 here causing an inconsistency.  UI already returns -1 properly but cgame and server did not.
Commits on Mar 22, 2018
  1. MP: Fix and cleanup UI legacy mods G2 API calls

    ensiform committed Mar 22, 2018
    Also fix minor bug in an unused G2 API UI function.
    Also minor code cleanup in cgame G2 API functions.
  2. MP: Fix legacy server mods to use function wrappers to protect G2 API

    ensiform committed Mar 22, 2018
    Prevent null pointers reaching the underlying G2 code as is done for cgame.
Commits on Mar 9, 2018
  1. Merge pull request #962 from JACoders/dev/sdl-format-spec-fixes

    xycaleth committed Mar 9, 2018
    Shared: Add missing audio format types for newer SDL
  2. Shared: Add missing audio format types for newer SDL

    ensiform committed Mar 9, 2018
Commits on Mar 7, 2018
  1. Merge pull request #961 from JACoders/dev/upgrade-sdl2.0.8

    xycaleth committed Mar 7, 2018
    Upgrade to newest version of SDL2 (2.0.8)
Commits on Mar 5, 2018
  1. Upgrade to newest version of SDL2 (2.0.8)

    ensiform committed Mar 5, 2018
Commits on Mar 4, 2018
  1. Replace OS X -> macOS

    xycaleth committed Mar 4, 2018
Commits on Feb 26, 2018
  1. Merge pull request #957 from xycaleth/dev/fix-sp-vidrestart

    ensiform committed Feb 26, 2018
    [SP] Fix vid_restart crash
Commits on Feb 25, 2018
  1. [SP] Fix vid_restart crash

    xycaleth committed Feb 25, 2018
    The renderer isn't initialized until the first frame after the restart.
    The game frame can run before this happens which will try to do some
    operations with the renderer, causing the process to crash.
Commits on Feb 7, 2018
  1. Added manifest files again, but directly to source list this time.

    ensiform committed Feb 7, 2018
    Hopefully this works better than the previous attempt and does not bork things.  CMake 3.4 is required on Windows for this to work. Leaving version as is for now due to other work being done on CMake support elsewhere.
    
    Should fix DPI awareness / scaling on Windows + Have proper version info.
Commits on Feb 3, 2018
  1. [SP] "Give Force" limit changed from 100, uses playermodel's max forc…

    PotatoMaster authored and xycaleth committed Feb 2, 2018
    …e power now
    
    Previously, the console command "give force" only allowed the amount of force power to go up to 100 and not the actual limit of the current playermodel, because it was set to go until FORCE_POWER_MAX, which was defined as 100. Now, if you are using a playermodel with an increased amount set, that amount will be used as the maximum.
Commits on Feb 1, 2018
Commits on Jan 28, 2018
  1. Fix Travis CI build (#955)

    xycaleth committed Jan 28, 2018
    * Fix Travis CI build
    
    Add missing dependencies - why doesn't aptitude just download them??
    
    * Try apt packages using apt add-on in Travis
    
    * Remove some packages and fix host env variable
    
    * Add libglib2.0-dev dependency for i686
    
    * Maybe Release and Debug flavours?
    
    * Split Debug and Release travis builds
    
    * Add macOS build
    
    * Brew install for OSX build
    
    And reorder the builds
    
    * Try using install script again
    
    * Fix typo when running install script
    
    * Fix install script for macOS
    
    * Whitespace fixes
    
    * Add missing space
Commits on Jan 3, 2018
  1. MP: Server gamecode fix for rancors causing spectators to appear

    ensiform committed Jan 3, 2018
    This commit fixes #875.
    
    G_HeldByMonster was being called on the player and any following spectators every frame. The latter of which is unnecessary.