JKGDevs / JediKnightGalaxies

Jedi Knight Galaxies (JKG) is a multiplayer shooter with role playing elements, played out in the Star Wars universe. The project is a full conversion game modification for Jedi Knight: Jedi Academy.
https://www.jkgalaxies.net/
GNU General Public License v2.0
33 stars 12 forks source link

Merge fixes from OpenJK #346

Open Silverfang22 opened 2 years ago

Silverfang22 commented 2 years ago

Stopping here to post, still need to go through commits from before Dec 23, 2016

Commits are shown in each category with newest commits at top

Tried to not include reverted changes...hopefully didn't miss any

rd-common b5796b954af8e13e077b0f4aa17552fbc1262c9d a8b7a75b19ec51b1b845585afef06366d85d2d2c (also rd-vanilla, sdl, and sys)

botlib be7dbae7dc5d241edd1b616bde83c1c974f6f703 (warnings fix)

sys 45a05fe1fae2fb9ef2c47a0bb96fd94711f0df97 c9e1de88ab965adfb547aec2ae0d7a804ba7b4f8

qcommon b5d4273c387cf5c51e4af6dc0a4174bc6dcbe026 28c72736b22bc2858ad2063828a0a3b616c0ac42 561bf292560cee14a9cb85bb835b0a4fa1fc4d62 (windows compile fix) c9e1de88ab965adfb547aec2ae0d7a804ba7b4f8 a9620751d1b77a4144833aa4818ac06b075be480 faeacb556cb9662d7ea6a7db960444d54ebfd7a2

rd-dedicated e02a0dff5e0f849fc9d3a315dcbfa33904e7acbf 6b234a6db865acc2a1986fb3a9cc2d5224e9a322 (warnings fix)

Client c62c0f2d4905af9a98b7cfece4ef9591185253d1 (legacy mods G2 API fixes) b48f71ee210ffe07c34caa3115ecdace3b686cd1 (g2) dd3a1c8e7bbb4048e15c6b8585dc4d6dc5612601 (g2) 4090e096070547f48828e8fb2ced74b05e1563f6 dac8819e51c00b048db00f88fef5d8b3555623fa 89cebbcc134e0de58b3d3ad6b077613bb63d5565 (and qcommon) 71325abca0f5371d7745b69decad9ae2e88cc716 948b55b59b6c8110969d7b22a504397a313a70ba (and server) c9e1de88ab965adfb547aec2ae0d7a804ba7b4f8 (qcommon and sys) 03d66c17e11739a0c5bd8c578cb8916b376c6bc3 cbe2d2ada5e9df4e9bf265ed7cc86f881afed7f5

UI 94866c43789ec8d352d4a4ddecf26297fdd0520f e2c254b28cd52a0ab19f7171f07d1c6542a883fb 5a3f8d969d6c24706639fc9290f69ac5283ba006 a3588914317513258ab3d03efcc23af6cecd0b8b (EAX icon, probably unnecessary) 72ae574e3aa1c60faaf56b76c356b67a03c8c47a

SDL 528488e93c1bcb1ca18114c008c33ba3ee9d78c6 7d01241c4922a387720c08be94e1d9d6444f3675 ffe7ffed5641ea36af449a996432b6afa8a6ee6a

CGame ffa5568b96fc3a394d0b1d0f917e9e36e2542177 efbeb7cbbee591620932d053bb4a4f0131846538 (Includes Game and Vehicle code fixes) 58e5a2002ae8b3d3dbd003d1fb494c0c737c2397 (unused define removal) 7f23591f11dbb144709db9dd1d823587e7f8ff40 18324bace6d39b884115fdd77e9005af0b59617c (also game, qcommon, ui, rd-common, compiler warnings fix) 36b675920981d0e964cbc9c93cc7255eefdc4c3b (also client) 210c6a8ba81ce54be996077ee76b150701723266

Game 4881be7478a833791d127fce7563de252d2246f7 4fb17cf0db8fcce9a3ae157e048662098b5190ef (Maybe irrelevant) 4cb9711a0f716d7807134474a4616feed73a58aa 32dcb33b670ba0695eb9463097eaa9a0d2070303 5dedb33968797ebdb113c4c35b3039b734a7f7a2 (mindtrick fix) 92059a6bdd9a7a256e0a07d550c5fc4db4ddb8f4 b24826990b40e154e2c441fd926c8853d6b0f882 0edd860ac9cd96fdbc5c594e17bc0265dddf8f0d (and ui and botlib) ff647b37dcd1cbbc2e61d7fd6787681b601382f5 bca1d8da3f7fb19415bd01388f46cf0b2ad5835d (and qcommon) 9c38824c462933210810fad193576fbe1c744c95

Sound 0218d2d0c9fb4cfae36efc3837a6cfe22e40b02a 49744461d612b33892127c230ce8fe5652e44308 c19f5c3da787a0192b1ea95443278277f67342d3 ddb2be1273dc32cabd426f4db6385bcf94e1fbb3 7cb9015d7fe86ddff8265d56d5fa6d6077f23afc 63e31e83454b0309d7dcb03d949ea7ab82497dfd da0dc70bb24f8b4c3f9192ba3670e1ee05d7b034

Server 7b6d53ddb8bd2595c73fa554cb85e57fab15801a 962f3198371a9c44093253cd04999155ac6a657f 10d96cc08e9b960c90e2048cab86030977f31b0f 698fe7c0e150b3f38e0d5d229faf36ad7948afca (G2 Fix) 083ae51e459cd1a90c11907e3ccabdd181041ece (G2 Fix) 41bd4d8f5eabf0a24ffdb8cc3d9071d857cda532 (G2 fix) 8b07e58c1c2875e94823c8afe5443e003370349b 6aba69055e4591b7ac96eee8b40322cbf4a681b4 50bde780d55e825e6d7f19478bdaa7373ae118d3

rd-vanilla 07675e20746741bc16a712cbf1c9847a5e4a0029 e283f39d04a1baf69b41ab8907e977a9d0f03144 2b8b3e640b3e29855494e02044f4b1c470f2cfd1 (MacOS fix) 6a453c38779a2f861c9e511958c8f43e92299b0d d00df395a04ba437fb35df81a9db414d3786c14d e9116155052ef6a22135a1806a10e959aa9a1e00 9f27132aa81485c35a92a79095ea54df32276dc3 9736ae61da6de669dd3dc210c7be69be1d0214b3 ae3900fcd8bc19a9322c506977af24bb627e3794 (Ghoul 2, rd-common, g2 api fixes) 55de6a695fddc8c89e1d48b4b2701f6c01998694 (compiler warnings fix) 47df6ee400c233addd41b8945edb5f5c2b6e3b64 82d82094e8c53657f9f57ba8740496c2cc5ba204

[ 212d7d8222875274ed43463ff68e55e1c664e3b1 54bca13343060a70c304caa093c70a28f08a15bf 49344cefdd9225193ab4a06bcae0b2e2d2411042 b993a8ced51c2e183ebcf3417b4055740cde6d03 ]

Possibly Irrelevant: 235fb9e1a9c4537a603b2e54e444327d20d198a3 30c31294b99f441bb7d795979bbec369a399aa6b 18f20494dffbf12c2167a1c92dbea4aae70fdeb9 (holocron fix) fcf40fc7e104f38802efe4578c7cef3e8e3dca22