Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tukkek/javelin
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.7b3
Choose a base ref
...
head repository: tukkek/javelin
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.7
Choose a head ref

Commits on Sep 26, 2017

  1. Playtesting

    tukkek committed Sep 26, 2017
    Copy the full SHA
    8211fa5 View commit details
  2. Fixing #128. Had to remove Attack#equals and #hashCode, which might e…

    …nd up affecting other features that depend on them.
    tukkek committed Sep 26, 2017
    Copy the full SHA
    57020dc View commit details

Commits on Sep 27, 2017

  1. playtesting

    tukkek committed Sep 27, 2017
    Copy the full SHA
    f165d4f View commit details
  2. playtesting

    tukkek committed Sep 27, 2017
    Copy the full SHA
    faba1a4 View commit details
  3. Copy the full SHA
    83b4fd6 View commit details

Commits on Sep 28, 2017

  1. Copy the full SHA
    369710a View commit details

Commits on Oct 4, 2017

  1. playtesting and returning Experience to troves in a less exploitable …

    …fashion (asks for rewards after fight ends and removes location)
    tukkek committed Oct 4, 2017
    Copy the full SHA
    c7e9863 View commit details
  2. Playtesting Temples and Win

    tukkek committed Oct 4, 2017
    Copy the full SHA
    ae59690 View commit details

Commits on Oct 5, 2017

  1. Generating Shops for Scenario mode, Plain/Hills towns no longer conne…

    …cted through a portal since they are going to be replaced by Gates later on
    tukkek committed Oct 5, 2017
    Copy the full SHA
    86b252c View commit details

Commits on Oct 6, 2017

  1. The old "terrainplains" file was used by a couple maps, reintroducing…

    … it as "terraingrass"
    tukkek committed Oct 6, 2017
    Copy the full SHA
    a4b3901 View commit details

Commits on Oct 9, 2017

  1. playtesting

    tukkek committed Oct 9, 2017
    Copy the full SHA
    d23c5c1 View commit details

Commits on Oct 11, 2017

  1. Copy the full SHA
    fba1ab0 View commit details

Commits on Oct 18, 2017

  1. Copy the full SHA
    50f7107 View commit details
  2. Copy the full SHA
    6d613cd View commit details
  3. Copy the full SHA
    fe5541e View commit details

Commits on Oct 19, 2017

  1. Fixing several issues: encoding on docs, poison/detox flows (again), …

    …Combat Expertise maneuvers not registering to base monsters, monsters receiving more HP than correct, Rapid Shot not updating,
    tukkek committed Oct 19, 2017
    Copy the full SHA
    e6e7cc8 View commit details

Commits on Dec 7, 2017

  1. Playtesting

    tukkek committed Dec 7, 2017
    Copy the full SHA
    f41624b View commit details

Commits on Dec 8, 2017

  1. Copy the full SHA
    ea2a311 View commit details

Commits on Dec 27, 2017

  1. Hopefully got rid of "couldn't determine outcome" errors which were u…

    …ncommon but constant. Apprently, ValueSelector would sometimes select the dummy "previous" node passed to it on the start of recursion if it didn't like any of the actions it could take.
    tukkek committed Dec 27, 2017
    Copy the full SHA
    dceacc7 View commit details
  2. Playtesting

    tukkek committed Dec 27, 2017
    Copy the full SHA
    b61840b View commit details

Commits on Jan 30, 2018

  1. Playtesting

    tukkek committed Jan 30, 2018
    Copy the full SHA
    ae7f96f View commit details

Commits on Jan 31, 2018

  1. Improving game world by making buildable locations only be spawned by…

    … towns - thus giving town and wilderness more personality; reducing redundancy and location spam; and providing more space for new stuff
    tukkek committed Jan 31, 2018
    Copy the full SHA
    946a131 View commit details
  2. Copy the full SHA
    d46baf5 View commit details

Commits on Feb 1, 2018

  1. Downscaling DamageReduction.

    tukkek committed Feb 1, 2018
    Copy the full SHA
    2e09066 View commit details
  2. Copy the full SHA
    9e7ba1d View commit details

Commits on Feb 6, 2018

  1. Copy the full SHA
    ce023f5 View commit details
  2. Copy the full SHA
    dea579c View commit details

Commits on Feb 7, 2018

  1. Playtesting

    tukkek committed Feb 7, 2018
    Copy the full SHA
    6a58a3f View commit details
  2. Copy the full SHA
    fc37c2e View commit details

Commits on Feb 8, 2018

  1. Copy the full SHA
    fdf14fb View commit details
  2. Playtesting

    tukkek committed Feb 8, 2018
    Copy the full SHA
    291b677 View commit details

Commits on Feb 10, 2018

  1. Ditching the last implementation of the Arena (which was way too comp…

    …lex and not much different from the base game) and starting a hopefully much more interesting minigame loosely based on MOBAs.
    tukkek committed Feb 10, 2018
    Copy the full SHA
    dfcdfb3 View commit details
  2. Further work on Arena

    tukkek committed Feb 10, 2018
    Copy the full SHA
    b159045 View commit details
  3. bugfix

    tukkek committed Feb 10, 2018
    Copy the full SHA
    5076795 View commit details

Commits on Feb 11, 2018

  1. Copy the full SHA
    67ccb67 View commit details

Commits on Feb 12, 2018

  1. Copy the full SHA
    e02066a View commit details

Commits on Feb 13, 2018

  1. Moving Javelin#randomdifficulty() to EncounterGenerator#getdifficulty…

    …(), with some refactoring
    tukkek committed Feb 13, 2018
    Copy the full SHA
    3e1f686 View commit details
  2. Copy the full SHA
    285d452 View commit details
  3. Copy the full SHA
    d331265 View commit details
  4. more work on DungeonGenerator

    tukkek committed Feb 13, 2018
    Copy the full SHA
    526dd3d View commit details

Commits on Feb 14, 2018

  1. Copy the full SHA
    e19f5a8 View commit details
  2. Copy the full SHA
    8d4fc8f View commit details
  3. Adding corridor template

    tukkek committed Feb 14, 2018
    Copy the full SHA
    2b970b6 View commit details
  4. Copy the full SHA
    231e7a0 View commit details
  5. Copy the full SHA
    d279dcb View commit details
  6. Copy the full SHA
    c0424d6 View commit details

Commits on Feb 15, 2018

  1. DungeonGenerator now interconnects rooms after the dungeon is built, …

    …providing much needed non-linearity
    tukkek committed Feb 15, 2018
    Copy the full SHA
    f725806 View commit details

Commits on Feb 16, 2018

  1. Copy the full SHA
    7db4874 View commit details
  2. Copy the full SHA
    0880285 View commit details
  3. Tuning RoomSizeTable

    tukkek committed Feb 16, 2018
    Copy the full SHA
    4af1626 View commit details
Showing 4,177 changed files with 71,355 additions and 518,947 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
9 changes: 2 additions & 7 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="images/|javelin/|tyrant/" kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/junit.jar" sourcepath="lib/junitSrc.zip"/>
<classpathentry kind="lib" path="lib/forms-1.0.5.jar" sourcepath="lib/forms-1.0.5-src.zip"/>
<classpathentry kind="lib" path="lib/looks-1.2.2.jar"/>
<classpathentry kind="lib" path="lib/sax2.jar"/>
<classpathentry kind="lib" path="lib/commons-math-2.1.jar"/>
<classpathentry including="javelin/" kind="src" path=""/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-22-openjdk-amd64"/>
<classpathentry kind="output" path="bin"/>
</classpath>
7 changes: 6 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
*.log
*.save*
bin
TODO
TODO/
avatarsmore
javelin.zip
javelin.jar
@@ -11,3 +11,8 @@ javelin.jar
nohup.out
backup
error.txt
build/jdk/
build/output/
doc/javadoc
build/static/*/fmedia/

Loading