Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/eternalcodes/OpenJK
Browse files Browse the repository at this point in the history
  • Loading branch information
eternalcodes committed Mar 28, 2016
2 parents 911f435 + d491bcd commit c2fcd06
Showing 1 changed file with 15 additions and 25 deletions.
40 changes: 15 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
# jaPRO
# EternalJK

>The main goals of this mod are as follows, in order of priority:
>
* To recreate the fast-paced fullforce combat seen in JK2, and the JA+ mod for JKA.
* To improve the MP style saber hit detection, as seen in JA+.
* To remove certain gameplay related exploits.
* To improve the weapon (gun) combat and balance.
* To add netcode features such as lag compensation for hitscan and projectiles, clientside simulated projectiles, etc.
* To add a simple admin system, with little potential for abuse.
* To add support for a race gametype, similar to racesow in warsow or defrag in quake 3, with player isolation, accounts, and persistent highscores.
* To add other gameplay enhancing features.
This fork focuses on the UI Library and Client Engine modifications. It currently officially supports the jaPRO cgame mod.

[![jaPRO README](https://img.shields.io/badge/readme-videoP-lightgrey.svg)](https://github.com/videoP/jaPRO/blob/master/README.md)
If you have any suggestions or would like to submit a bug report, please post them in [issues] (https://github.com/eternalcodes/EternalJK/issues).

This branch focuses on the UI Library and Client Engine modifications for the jaPRO multiplayer mod. You can find the server-side Game Library in [videoP's OpenJK fork](https://github.com/videoP/jaPRO). To prevent cheating, the source code for the Client Game Library is not publicly available.

If you have any suggestions or would like to submit a bug report, please post them on our website's forums.

[![Website](https://img.shields.io/badge/website-upsgaming.com-brightgreen.svg)](http://upsgaming.com) [![Fork](https://img.shields.io/badge/repository-japro%20server--side-blue.svg)](https://github.com/videoP/jaPRO)
[![Website](https://img.shields.io/badge/website-japro-brightgreen.svg)](http://upsgaming.com/japro) [![Fork](https://img.shields.io/badge/repository-japro%20game%20library-blue.svg)](https://github.com/videoP/jaPRO)

## License

Expand All @@ -27,21 +14,24 @@ OpenJK is licensed under GPLv2 as free software. You are free to use, modify and

## For players

Installing and running jaPRO:
Installing and running EternalJK:

1. [Download the latest plugin](http://upsgaming.com/files/japro3.pk3).
2. Place file into the Jedi Academy `GameData/japro` folder. For Steam users, this will be in `<Steam Folder>/steamapps/common/Jedi Academy/GameData/japro`. (Create the folder if it doesn't exist.)
3. Profit.
1. [Download the latest release](https://github.com/eternalcodes/EternalJK/releases).
2. Extract the file into the Jedi Academy `GameData` folder. For Steam users, this will be in `<Steam Folder>/steamapps/common/Jedi Academy/GameData/`.
3. Run openjk.x86.exe (Rename to jamp.exe for better steam support)

## For Developers

### Contributing to jaPRO
### Contributing to EternalJK
* [Fork](https://github.com/JACoders/OpenJK/fork) the OpenJK project on GitHub
* Add a remote to this fork
* Create a new branch using this branch and make your changes
* Send a [pull request](https://help.github.com/articles/creating-a-pull-request) to upstream (eternalcodes/japro)
* Send a [pull request](https://help.github.com/articles/creating-a-pull-request) to upstream (eternalcodes/master)

## Maintainers (in alphabetical order)
## Maintainers

* [eternal](https://github.com/eternalcodes)
* [loda](https://github.com/videoP)

## Contributors
* [invert](https://github.com/Xethioz)
* [loda](https://github.com/videoP)

0 comments on commit c2fcd06

Please sign in to comment.