Pull latest JKEnhanced version #42
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* 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
…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.
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.
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.
[SP] Fix vid_restart crash
Visit https://discourse.libsdl.org/t/sdl-2-0-8-released/23957 for release notes on changes
Upgrade to newest version of SDL2 (2.0.8)
Shared: Add missing audio format types for newer SDL
Prevent null pointers reaching the underlying G2 code as is done for cgame.
Also fix minor bug in an unused G2 API UI function. Also minor code cleanup in cgame G2 API functions.
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.
Fixes some derpiness in cases where handle is invalid and also adds missing calls to check model pointers in some functions.
…ul2-api Fix Ghoul2 API on server and UI for legacy mods
And update all the copyright years in those files
Upgrade minimum CMake to 3.1
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.
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.
Remove Xbox-related or unused tools
Remove tools which were moved to OpenJK-Tools
…cos-app Add SDL2 to macOS app bundle
And remove s_sdlSpeed
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: JACoders#987
Fixed bad memset on cg_healthBarEnts
…aira.tga instead of crosshairb.tga, does not allow negative index
… declaration Discovered by C++ compilation not finding an exact linker match
Draw stencil shadows in one drawcall when possible
Ubuntu 14.04 reached EOL for mainstream support in April 2019, and I'm about to add a dependency on a version of SDL newer than the one in 14.04. Instead of going via 16.04, which only has about a year of support lifetime left itself, let's go directly to 18.04, currently the latest LTS release. Update build-dependencies accordingly. Signed-off-by: Simon McVittie <smcv@debian.org>
This requires SDL >= 2.0.4. Since <https://bugzilla.libsdl.org/show_bug.cgi?id=2464> was fixed in SDL 2.0.4, SDL behaves as a CMake "config-file package", even if it was not itself built using CMake: it installs a sdl2-config.cmake file to ${libdir}/cmake/SDL2, which tells CMake where to find SDL's headers and library, analogous to a pkg-config .pc file. As a result, we no longer need to copy/paste a "find-module package" to be able to find a system copy of SDL >= 2.0.4 with find_package(SDL2). Find-module packages are now discouraged by the CMake developers, in favour of having upstream projects behave as config-file packages. This results in a small API change: FindSDL2 used to set SDL2_INCLUDE_DIR and SDL2_LIBRARY, but the standard behaviour for config-file packages is to set <name>_INCLUDE_DIRS and <name>_LIBRARIES. Use the CONFIG keyword to make sure we search in config-file package mode, and will not find a FindSDL2.cmake in some other directory that implements the old interface. In addition to deleting redundant code, this avoids some assumptions in FindSDL2 about the layout of a SDL installation. The current libsdl2-dev package in Debian breaks those assumptions; this is considered a bug and will hopefully be fixed soon, but it illustrates how fragile these assumptions can be. We can be more robust against different installation layouts by relying on SDL's own CMake integration. When linking to a copy of CMake in a non-standard location, users can now set the SDL2_DIR or CMAKE_PREFIX_PATH environment variable to point to it; previously, these users would have used the SDL2DIR environment variable. This continues to be unnecessary if using matching system-wide installations of CMake and SDL2, for example both from Debian. Mitigates: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951087 Signed-off-by: Simon McVittie <smcv@debian.org>
Fixes JACoders#1038 ofst over-reads past the end of the pSoundData buffer. Add a bounds check similar to S_CheckAmplitude() in codemp/client/snd_dma.cpp. JACoders@69800e8
Sounds that use dopplerScale (e.g., rocket launcher) exhibited a buffer over-read. S_PaintChannelFrom16's ofst reads past end of sfx->pSoundData buffer. To resolve this, take dopplerScale increments of ofst into consideration when calculating count, which controls the loop for ofst. Resolves: JACoders#1038 See also: JACoders@69800e8
…rmine if sabers are valid.
…es issues at large timescales such as during cutscene skipping.
…es. causes issues at large timescales such as during cutscene skipping." This reverts commit 968b8ac.
…ities. causes issues at large timescales such as during cutscene skipping when the event time is before the entity free time and cent->gent is used. Also remove unnecessary setting of NPC->count on takeoff/landing for boba and rockettrooper.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.