Skip to content

Commit

Permalink
Initial cleanup and some rebranding
Browse files Browse the repository at this point in the history
  • Loading branch information
Razish committed May 29, 2019
1 parent a2ea6ad commit 72400d6
Show file tree
Hide file tree
Showing 439 changed files with 8,906 additions and 150,950 deletions.
254 changes: 30 additions & 224 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,224 +1,30 @@
This file will generally summarise the Github repo commit history
Key: [-] removed, [+] added, [\*] modified

# Features

## Single- and Multiplayer

* [\*] OpenJK now writes configs/screenshots/etc to `fs_homepath` directory. No longer have to run as administrator on Windows. (Multi-User support)
* [+] Added mouse-wheel to console
* [+] Add `r_noborder` option (windowed mode feature).
* [+] Add `r_centerWindow` option (windowed mode feature).
* [+] Add `r_mode -2` option to use desktop resolution.
* [\*] Removed cheat protection from `r_we` cmd, `r_dynamicGlow*` cvars
* [-] Removed CD Check Code
* [-] Removed Anti-Tamper Code. (It serves no purpose with source code available.)
* [\*] Shift-Escape will now also open the console as an alternate (e.g.: keyboard doesn't support the normal console key)
* [\*] Escape key will now close the console before anything else if the console is open
* [\*] Removed shift key requirement to open console
* [+] Raw Mouse Input is now available on all platforms with the in_mouse cvar at the current default value. (SDL2 uses raw mouse input by default)
* [\*] Drastically improved command/cvar tab-completion including auto-completion of arguments (e.g. `map mp/ffa1`)
* [+] Clipboard paste support added to all supported platforms now with SDL2.
* [+] Add `stopmusic` command
* [\*] Fixed segfault crashing in ragdoll code.
* [\*] Fixed `r_overbrightbits 1` resulting in blackness.
* [\*] Made the md4 (filesys) checksum code compatible with 64-bit operating systems.
* [\*] Fixed radar and rocket locking drawing not rendering properly. Can now support all types of shaders with multiple images if wanted too.
* [\*] MAX_PATCH_PLANES does not occur on some maps anymore with OpenJK (this isn't related because OpenJK specifically changed something to cause the error, but because of newer compilers affecting optimizations on decimal numbers)
* [\*] `OpenJK` folder is now searched as a fallback location if `base` and `fs_game` folders do not contain the appropriate gamecode to load.
* [\*] Error log on crashing exits are now reported to a crashlog text file in your OpenJK homepath.
* [-] Removed `r_allowSoftwareGL` cvar as it is no longer useful or needed.
* [+] Added filename completion to `cinematic` command.
* [\*] No more viewlog console for client or server.
* [+] Added improved dedicated server console with color (0-7) support and arrow key support and tab completion that functions the same as in-game console.
* [-] Removed blackbars around screen when rendering in widescreen.
* [\*] Fixed white screen during load with aformentioned black bar removal.

## Singleplayer only

* [+] Now searches for jagamex86.dll (or equivalent) in the mod's folder, too, meaning SP Code mods are possible.
* [+] NPCs support alternate saber colours
* [\*] Fallback location for jagame mod bin is now `OpenJK` instead of `base`
* [+] Add `modelscale` and `modelscale_vec` support to `misc_model_ghoul`
* [\*] Fix external lightmap support
* [\*] `r_flares` defaults to 1 now like Multiplayer.

### Gamecode (only available in `fs_game openjk` and derived mods)

* [+] Added `cg_smoothCamera` (default 1)
* [+] Added `cg_dynamicCrosshair` (default 1)
* [+] Added simple hud from multiplayer with tweaks to match real HUD options. `cg_hudFiles 1`

## Multiplayer only

* [\*] Gamecode DLL files on Windows are no longer extracted to homepath or basepath, but a temporary file path.
* [\*] Drastically improved status (server) command
* [\*] Tweaked `forcetoggle` rcon command.
* [+] Added `weapontoggle` rcon server command similar to `forcetoggle` command.
* [\*] Fixed memory leak related to NPC navigation on map changes.
* [+] Cheats are now defaulted to 1 in menu. Do not be alarmed, starting normally will disable them or connecting to a non-cheat server. This allows cheats to work properly while playing back demos.
* [+] Add `sv_lanForceRate` (Defaults to 1) Feature was already enabled, but not toggleable.
* [\*] `globalservers` master server command now supports multiple master servers with the `sv_master1..5` cvars
* [+] Added `fontlist` command. Useful for when making mods with custom fonts.
* [+] New serverside kick commands `kickall`, `kickbots` and `kicknum` (alias to `clientkick`).
* [-] Removed demo restriction code.
* [\*] `svsay` command prints to dedicated console
* [\*] Cvars will be sorted alphabetically when saved to disk
* [+] Added `ja_guid` userinfo field to uniquely track players for statistics
* [+] Added `cvar_modified` to show which cvars have been changed from default values
* [+] Added `s_doppler` sound effect for moving sound sources (rockets)
* [+] Added support for `surfaceSprites flattened` in MP. (Fixes surface sprites on t2_trip)
* [+] Added in-engine ban code from ioquake3. Cmds: `sv_rehashbans`, `sv_listbans`, `sv_banaddr`, `sv_exceptaddr`, `sv_bandel`, `sv_exceptdel`, `sv_flushbans`. CVar: `sv_banFile`
* [+] `addFavorite` command added to add current or specified server to favorites list.
* [+] Add ability to paste in text files in the UI
* [+] Add `cl_motdServer1..5` cvars. `cl_motd` points to which one is used or 0 to turn off
* [+] Add QuakeLive style mouse accel option (`cl_mouseAccelStyle`, `cl_mouseAccelOffset`)
* [+] Server side demo recording per client (from their pov) support
* [+] Add `sv_blockJumpSelect` cvar to help prevent use of modded clients using an exploit with `FP_LEVITATION` with old mods
* [+] Add external lightmap support from SP
* [+] Added ability to substitute BSP entities with ones from an external .ent file when loading a map (for easier entity modding)

### Gamecode (only available in `fs_game openjk` and derived mods)

* [\*] Tweaked simple hud with adjustments to match real HUD options. `cg_hudFiles 1`
* [+] Added `pmove_float` cvar (default off) for no velocity snapping resulting in framerate-dependent jump heights.
* [+] `clientlist` displays clients by id/name and if they are a bot. (Shows real client id unlike `serverstatus`)
* [+] Added `cg_fovAspectAdjust` to correct field of view on non-4:3 aspect ratios
* [+] Added `cg_fovViewmodel` to adjust the field of view for first-person weapons
* [+] Added `cg_chatBeep` and `cg_teamChatBeep` to toggle the chat message sound
* [+] Added JK2 gametypes
* [\*] Rewrote `callvote` code to allow disabling specific votes, added more options (e.g. display map list)
* [+] Add server command `toggleallowvote` to easily adjust the bit values of `g_allowVote`
* [+] Add userinfo validation options (`g_userinfoValidate`)
* [+] Add server command `toggleuserinfovalidation` to easily adjust the bit values of `g_userinfoValidate`
* [+] `fx_wind` entity
* [\*] `fx_rain` entity supports most options from SP now. LIGHTNING/shaking not supported, acidrain doesn't actually hurt
* [\*] more `customRGBA` options from SP on NPCs
* [+] Force Sight surfaces (cgame modification required)
* [+] Human Merc NPC spawner
* [\*] Make `target_location` entities logical (no gentity space used in most cases)

# Increased/lifted limits

## Single- and Multiplayer

* [\*] Increased Command Buffer from 16384 to 128*1024
* [\*] Increased max cvars from 1224 to 8192

## Singleplayer only

* [\*] `MAX_SHADER_FILES` bumped to 4096 from 1024 to match MP


# Bugfixes

## Single- and Multiplayer

* [\*] Fixed incorrect `alphagen` enum usage.
* [\*] Fixed widescreen resolution changes causing black screen when UI restarted.
* [\*] Fixed crash when trying to run custom resolutions with a listen server.
* [\*] Fixed Gamma Clamp on WinXP+
* [\*] Fixed weather system incorrectly throwing up a warning with shader data if weather system was unable to parse a vector correctly.
* [\*] Windows now uses correct memory status code for > 2gb when checking if low on physical memory.
* [\*] Tweaks to the cvar code to make it more strict in terms of read only/cheats/init. Fixes a lot of broken rules with cvars.
* [\*] Fixed cvar commands that allow you to `cg_thirdPerson !` (i.e. use a value of `!`) prevent you from typing out longer strings starting with a `!` as the value.
* [\*] FX Flashes now properly scale to fov and window aspect.
* [\*] Fixed a lot of formatting security holes.
* [\*] Several Out-of-bounds memory access and memory leaks fixed.
* [\*] Improved command line parsing based off of ioquake3 patches.
* [\*] Improved `echo` command by preserving colors based off of ioquake3 patches.
* [\*] Improved `GL_Extensions` printing using ioquake3 fix to prevent crashes on newer cards.
* [\*] Alt-tab works properly
* [\*] ~~Fix Windows issue where pressing alt key in windowed mode caused a temporary freeze~~
* [\*] Fixed never fading shadow in text
* [\*] Fix up font renderer glyph positioning
* [\*] Fixed a hang with some weird music sample rates
* [\*] Fixed a crash at startup when `r_dynamicGlow` was set to 2
* [\*] Fix Out-Of-Bounds access in `CM_EdgePlaneNum`
* [\*] Clamp `scr_conspeed` to be in the range 1-100
* [\*] Fix stencil shadows not working if a model has more than 500 vertexes.

### Gamecode (only available in `fs_game openjk` and derived mods)

* [\*] Fixed overstrike mode when using any UI edit box
* [\*] Fix crash when standing on an NPC who has been knocked down

## Singleplayer only

* [\*] Fixed a nasty memory issue with clipboard pasting
* [\*] Fixed `MiniHeapSize` issue
* [\*] Fixed intro cinematic only displaying as white screen when on non 4:3 aspect ratio.
* [\*] Fixed potential out of bounds in sound code.
* [\*] Fixed buffer overflow in filesystem code which prevented use of some maps (atlantica). Raven made a `Com_Error` to prevent this from happening, we removed that as well.
* [\*] Rosh no longer randomly dies due to falling damage on the first level.
* [\*] Fix force absorb capping to 100 instead of maximum force points
* [\*] Fix some invalid chunk length errors on x86_64 platforms

## Multiplayer only

* [\*] Fixed several parsers that broke with characters which wrapped to being negative.
* [+] Added misc security fixes to allow servers to deal with connectionless packets.
* [\*] Added security fixes to prevent servers from spoofing clients with connect packets.
* [\*] Added security fixes to prevent anyone from spoofing clients with print packets.
* [\*] Fixed clients being able to set IP via cvar.
* [\*] Dedicated server binaries now correctly print sectioned prints without adding newlines erroneously.
* [\*] Fixed client crash related to ragnos NPC
* [\*] Fixed some item prediction errors in team games. (Item prediction still sucks in general though)
* [\*] Fixed buffer overflow in client side rcon command.
* [\*] Fixes names that contain `*` or `**` at start incorrectly showing up in notify top box and chat box when sending messages.
* [\*] Server side / `viewlog` console now strips the `[skipnotify]` and `*` properly too.
* [+] (Un)pausing the game in solo play now results in smoother transition.
* [\*] `timescale` frametime fixes. Frametime < 1 is no longer possible (bad things happen)
* [\*] Fixed invalid `r_textureBitsLM` resulting in fullbright mode without cheats
* [\*] CVar code in engine is more robust. Protects against clients setting systeminfo cvars they should not etc. More accurate warning messages when servers/vms/clients set cvars they should not.
* [\*] Fix exploit with `usercmd` bytes set to -128

### Gamecode (only available in fs_game openjk and derived mods)

* [\*] Fixed very bad out of bounds access in `G_LogWeaponFire` with NPCs.
* [\*] Fixed some voting issues relating to clients disconnecting and/or switching teams.
* [\*] Fixed some voting issues relating to bad percentage calculation for passing/failing.
* [\*] Fixed color code stacking in names where colors were supposed to be stripped. (This relates to engine and gamecode for full effect)
* [\*] Fixed saber lock crash
* [\*] Force updates of clients at a fixed interval to prevent certain exploits.
* [\*] Prevent fast teamswitch exploit
* [\*] Disable "scoreboard" team
* [\*] Fix some looping sound issues
* [\*] Fix spectators being stuck when they stop following dead/disintegrated players
* [\*] Precache weapons on `map_restart` if `g_weaponDisable` changes
* [\*] Properly detect server settings (weapon/force disable)
* [\*] Filter multiple "@" characters in a name resulting in a localised string lookup (translation)
* [\*] Default/missing model+saber is now "kyle"
* [\*] Fixed tournament queueing (for duel/power duel)
* [\*] Fixed issues where spectators had trouble flying through doors close together
* [\*] Fix `cg_smoothClients` affecting local player negatively
* [\*] Fix 2d screen tints with some effects being too dark (protect/abosrb/rage/ysalamiri/inlava/inwater/inslime)
* [+] Filter out servers with invalid chars in their information from the browser (`ui_browserFilterInvalidInfo`)
* [+] UI now supports multiple master servers
* [\*] Fix teamoverlay not making you look dead in siege when in limbo
* [\*] Fix glowing lights bugs on players and dead spectators in siege (in client mod)
* [\*] Properly load siege sounds for all models that have them, fallback to old broken location if necessary.


# Cleanup

## Single- and Multiplayer

* [-] MPlayer code removed.
* [-] Removed force feedback code (requires unavailable commercial library)
* [\*] Updated the JPG library
* [\*] Updated the PNG library
* [\*] Updated the zLib and minizip libraries
* [\*] Refactor binds code in the UI
* [-] Removed (unused) RMG code
* [\*] General buffer safety cleanup

## Multiplayer only

* [\*] Tweaked serverbrowser client engine code.
* [\*] Pure server code cleanups in client and server.

### Gamecode (only available in fs_game openjk and derived mods)

* [\*] Optimised .sab parsing and fixed some potential memory corruption
* [\*] Optimised .veh and .vwp parsing
# cleanjoke changelog

## March 2019

- everything in ojk until jan 1 2018
- removed siege gametype
- removed NPCs (including vehicles) and leftover q3 bot/ai navigation code
- default saber is now `single_1`
- `models/weapons2` renamed to `models/weapons`
- default player name is "Player" not "Padawan"

## April 2019

New cvars:

Name | Default | Description
|:--- |:---:| ---:|
cg_instantDuck | 1 | don't smooth camera movement when ducking
cg_gunBob | 0.005 0.01 0.005 | ???
cg_gunBobEnable | 1 | gun will move around when running
cg_gunIdleDrift | 0.01 0.01 0.01 0.001 | ???
cg_gunIdleDriftEnable | 1 | gun will drift around when standing still
cg_gunMomentumDamp | 0.666 | smoothness of moving gun around
cg_gunMomentumFall | 0.5 | ???
cg_gunMomentumEnable | 0 | gun will sway around with camera movement
cg_gunMomentumInterval | 2.5 | ???

- Removed Tavion and Desann saber styles
- Server heartbeat every 2m (was 5m)
- Removed legacy VM support layer
19 changes: 10 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#============================================================================
# Copyright (C) 2013 - 2018, OpenJK contributors
#
#
# This file is part of the OpenJK source code.
#
#
# OpenJK is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as
# published by the Free Software Foundation.
#
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, see <http://www.gnu.org/licenses/>.
#============================================================================
Expand All @@ -25,7 +25,8 @@ set(InOpenJK TRUE)


# Project name
set(ProjectName "OpenJK" CACHE STRING "Project Name")
set(ProjectName "CleanJoKe" CACHE STRING "Project Name")
set(BinaryName "cleanjoke" CACHE STRING "Binary Name")
project(${ProjectName})

set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
Expand Down Expand Up @@ -150,19 +151,19 @@ message(STATUS "Git revision is ${GIT_SHA1}")


# Binary names
set(SPEngine "openjk_sp.${Architecture}")
set(SPEngine "${BinaryName}_sp.${Architecture}")
set(SPGame "jagame${Architecture}")
set(SPRDVanillaRenderer "rdsp-vanilla_${Architecture}")
set(MPEngine "openjk.${Architecture}")
set(MPEngine "${BinaryName}.${Architecture}")
set(MPVanillaRenderer "rd-vanilla_${Architecture}")
set(MPDed "openjkded.${Architecture}")
set(MPDed "${BinaryName}ded.${Architecture}")
set(MPGame "jampgame${Architecture}")
set(MPCGame "cgame${Architecture}")
set(MPUI "ui${Architecture}")
set(JK2SPEngine "openjo_sp.${Architecture}")
set(JK2SPGame "jospgame${Architecture}")
set(JK2SPVanillaRenderer "rdjosp-vanilla_${Architecture}")
set(AssetsPk3 "openjk-${Architecture}.pk3")
set(AssetsPk3 "${BinaryName}-${Architecture}.pk3")
# Library names
set(MPBotLib "botlib")
set(SharedLib "shared")
Expand Down
48 changes: 2 additions & 46 deletions codemp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,29 +55,6 @@ if(BuildMPEngine OR BuildMPDed)
"${GSLIncludeDirectory}"
)
set(MPBotlibBotlibFiles
"${MPDir}/botlib/aasfile.h"
"${MPDir}/botlib/be_aas.h"
"${MPDir}/botlib/be_aas_bsp.h"
"${MPDir}/botlib/be_aas_cluster.h"
"${MPDir}/botlib/be_aas_debug.h"
"${MPDir}/botlib/be_aas_def.h"
"${MPDir}/botlib/be_aas_entity.h"
"${MPDir}/botlib/be_aas_file.h"
"${MPDir}/botlib/be_aas_funcs.h"
"${MPDir}/botlib/be_aas_main.h"
"${MPDir}/botlib/be_aas_move.h"
"${MPDir}/botlib/be_aas_optimize.h"
"${MPDir}/botlib/be_aas_reach.h"
"${MPDir}/botlib/be_aas_route.h"
"${MPDir}/botlib/be_aas_routealt.h"
"${MPDir}/botlib/be_aas_sample.h"
"${MPDir}/botlib/be_ai_char.h"
"${MPDir}/botlib/be_ai_chat.h"
"${MPDir}/botlib/be_ai_gen.h"
"${MPDir}/botlib/be_ai_goal.h"
"${MPDir}/botlib/be_ai_move.h"
"${MPDir}/botlib/be_ai_weap.h"
"${MPDir}/botlib/be_ai_weight.h"
"${MPDir}/botlib/be_ea.h"
"${MPDir}/botlib/be_interface.h"
"${MPDir}/botlib/botlib.h"
Expand All @@ -90,25 +67,6 @@ if(BuildMPEngine OR BuildMPDed)
"${MPDir}/botlib/l_struct.h"
"${MPDir}/botlib/l_utils.h"

"${MPDir}/botlib/be_aas_bspq3.cpp"
"${MPDir}/botlib/be_aas_cluster.cpp"
"${MPDir}/botlib/be_aas_debug.cpp"
"${MPDir}/botlib/be_aas_entity.cpp"
"${MPDir}/botlib/be_aas_file.cpp"
"${MPDir}/botlib/be_aas_main.cpp"
"${MPDir}/botlib/be_aas_move.cpp"
"${MPDir}/botlib/be_aas_optimize.cpp"
"${MPDir}/botlib/be_aas_reach.cpp"
"${MPDir}/botlib/be_aas_route.cpp"
"${MPDir}/botlib/be_aas_routealt.cpp"
"${MPDir}/botlib/be_aas_sample.cpp"
"${MPDir}/botlib/be_ai_char.cpp"
"${MPDir}/botlib/be_ai_chat.cpp"
"${MPDir}/botlib/be_ai_gen.cpp"
"${MPDir}/botlib/be_ai_goal.cpp"
"${MPDir}/botlib/be_ai_move.cpp"
"${MPDir}/botlib/be_ai_weap.cpp"
"${MPDir}/botlib/be_ai_weight.cpp"
"${MPDir}/botlib/be_ea.cpp"
"${MPDir}/botlib/be_interface.cpp"
"${MPDir}/botlib/l_crc.cpp"
Expand All @@ -135,7 +93,7 @@ if(BuildMPEngine OR BuildMPDed)
"${MPDir}/qcommon/qcommon.h"
"${MPDir}/qcommon/qfiles.h"
"${MPDir}/qcommon/tags.h"

${SharedCommonFiles}
)
source_group("common" FILES ${MPBotlibCommonFiles})
Expand Down Expand Up @@ -263,7 +221,7 @@ if(BuildMPEngine OR BuildMPDed)
endif(WIN32)
source_group("common" FILES ${MPEngineAndDedCommonFiles})
set(MPEngineAndDedFiles ${MPEngineAndDedFiles} ${MPEngineAndDedCommonFiles})

set(MPEngineAndDedCommonSafeFiles
"${SharedDir}/qcommon/safe/files.cpp"
"${SharedDir}/qcommon/safe/files.h"
Expand Down Expand Up @@ -309,8 +267,6 @@ if(BuildMPEngine OR BuildMPDed)
set(MPEngineAndDedFiles ${MPEngineAndDedFiles} ${MPEngineAndDedIcarusFiles})

set(MPEngineAndDedServerFiles
"${MPDir}/server/NPCNav/navigator.cpp"
"${MPDir}/server/NPCNav/navigator.h"
"${MPDir}/server/server.h"
"${MPDir}/server/sv_bot.cpp"
"${MPDir}/server/sv_ccmds.cpp"
Expand Down
Loading

0 comments on commit 72400d6

Please sign in to comment.