Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jon's pr #106

Open
wants to merge 59 commits into
base: master
Choose a base branch
from
Open

jon's pr #106

wants to merge 59 commits into from

Commits on Dec 30, 2020

  1. level one work

    @Fezz-xiii
    Fezz-xiii committed Dec 30, 2020
    Configuration menu
    Copy the full SHA
    e53f004 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2021

  1. changes and tweaks to stageOne & framework for stageOneTwo

    @Fezz-xiii
    Fezz-xiii committed Jan 1, 2021
    Configuration menu
    Copy the full SHA
    cb59f8b View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2021

  1. more tweaks to dmg | fixed reference errors

    @Fezz-xiii
    Fezz-xiii committed Jan 3, 2021
    Configuration menu
    Copy the full SHA
    e1d1312 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2021

  1. changes to enDmg

    @Fezz-xiii
    Fezz-xiii committed Jan 4, 2021
    Configuration menu
    Copy the full SHA
    821a78e View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2021

  1. general update

    @Fezz-xiii
    Fezz-xiii committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    a01de7b View commit details
    Browse the repository at this point in the history

  2. implemented objects in place of arrays as function arguments

    @Fezz-xiii
    Fezz-xiii committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    27a97b5 View commit details
    Browse the repository at this point in the history

  3. more changes to implement objects

    @Fezz-xiii
    Fezz-xiii committed Jan 6, 2021
    Configuration menu
    Copy the full SHA
    86dcbe2 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2021

  1. refactoring

    @Fezz-xiii
    Fezz-xiii committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    dab1c0c View commit details
    Browse the repository at this point in the history

  2. minor tweaks and bug fixes, loop is running kinda

    @Fezz-xiii
    Fezz-xiii committed Jan 25, 2021
    Configuration menu
    Copy the full SHA
    642a139 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2021

  1. heroStats obj now to host character stats

    @Fezz-xiii
    Fezz-xiii committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    4bb85d5 View commit details
    Browse the repository at this point in the history

  2. constitutionRoll replaces addHealth and minusHealth

    @Fezz-xiii
    Fezz-xiii committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    7ec55dd View commit details
    Browse the repository at this point in the history

  3. savepoint

    @Fezz-xiii
    Fezz-xiii committed Mar 21, 2021
    Configuration menu
    Copy the full SHA
    e6ca280 View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2021

  1. dmg() runs as expected

    @Fezz-xiii
    Fezz-xiii committed Apr 2, 2021
    Configuration menu
    Copy the full SHA
    e8b2f35 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2021

  1. tweaks to dmg

    @Fezz-xiii
    Fezz-xiii committed Apr 4, 2021
    Configuration menu
    Copy the full SHA
    cd29ba1 View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2021

  1. fix dmg, endmg, dodge, working on constitution roll

    @Fezz-xiii
    Fezz-xiii committed Apr 5, 2021
    Configuration menu
    Copy the full SHA
    c215c9a View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2021

  1. testing

    @Fezz-xiii
    Fezz-xiii committed Apr 16, 2021
    Configuration menu
    Copy the full SHA
    d18bdbb View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2021

  1. combine hero and ememy stats into a singular workable object

    @Fezz-xiii
    Fezz-xiii committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    78a47c6 View commit details
    Browse the repository at this point in the history

  2. refactor fight function pt 1

    @Fezz-xiii
    Fezz-xiii committed Jun 15, 2021
    Configuration menu
    Copy the full SHA
    a5e1da3 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. housekeeping

    @Fezz-xiii
    Fezz-xiii committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    5343019 View commit details
    Browse the repository at this point in the history

  2. updated readme.md

    @Rvndyr
    Rvndyr committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    d1174c1 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from Rvndyr/master 

    updated readme.md
    @jonnicwolf
    jonnicwolf authored Jun 25, 2021
    Configuration menu
    Copy the full SHA
    350bc26 View commit details
    Browse the repository at this point in the history

  4. updated readme with instructions on how to install and run

    @Rvndyr
    Rvndyr committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    30926fe View commit details
    Browse the repository at this point in the history

  5. fixed the 'project setup' in readme

    @Rvndyr
    Rvndyr committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    57a02a7 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #2 from Rvndyr/master

    @jonnicwolf
    jonnicwolf authored Jun 25, 2021
    Configuration menu
    Copy the full SHA
    2e2d783 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2021

  1. dmg is now attack

    @Fezz-xiii
    Fezz-xiii committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    a4b9bb5 View commit details
    Browse the repository at this point in the history

  2. bug fixes on dmg.js

    @Fezz-xiii
    Fezz-xiii committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    bef96ea View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2021

  1. enDmg refactor

    @Fezz-xiii
    Fezz-xiii committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    5b82471 View commit details
    Browse the repository at this point in the history

  2. comment out some lines im working on

    @Fezz-xiii
    Fezz-xiii committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    4e8031c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:jonnicwolf/FSW-Text-Based-Adventure

    @Fezz-xiii
    Fezz-xiii committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    0fa2ea1 View commit details
    Browse the repository at this point in the history

  4. dmg.js working as expected

    @Fezz-xiii
    Fezz-xiii committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    ee783ee View commit details
    Browse the repository at this point in the history

  5. enemyDmg.js working as expected

    @Fezz-xiii
    Fezz-xiii committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    6a88680 View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2021

  1. change ln18+ options[i] to options[index]

    @Fezz-xiii
    Fezz-xiii committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    7d76525 View commit details
    Browse the repository at this point in the history

  2. fight.js attack option runs

    @Fezz-xiii
    Fezz-xiii committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    0f9ee51 View commit details
    Browse the repository at this point in the history

  3. display cleanup

    @Fezz-xiii
    Fezz-xiii committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    49c8ead View commit details
    Browse the repository at this point in the history

  4. housekeeping

    @Fezz-xiii
    Fezz-xiii committed Jun 28, 2021
    Configuration menu
    Copy the full SHA
    3fdbed6 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2021

  1. reassign character health value ln28 & ln37 @fight.js

    @Fezz-xiii
    Fezz-xiii committed Jun 29, 2021
    Configuration menu
    Copy the full SHA
    fb598fa View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2021

  1. dmg div constant 150 -> 50 to curb excessive high damage rolls

    @Fezz-xiii
    Fezz-xiii committed Jul 3, 2021
    Configuration menu
    Copy the full SHA
    fce910c View commit details
    Browse the repository at this point in the history

Commits on Jul 20, 2021

  1. testing display algo for dialogue + housekeeping

    @Fezz-xiii
    Fezz-xiii committed Jul 20, 2021
    Configuration menu
    Copy the full SHA
    8c449a3 View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2021

  1. start-dialogue @test.js works

    @Fezz-xiii
    Fezz-xiii committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    bd88044 View commit details
    Browse the repository at this point in the history

  2. pickYes/No fixed

    @Fezz-xiii
    Fezz-xiii committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    235cd80 View commit details
    Browse the repository at this point in the history

  3. minor bug fixes

    @Fezz-xiii
    Fezz-xiii committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    de97ac1 View commit details
    Browse the repository at this point in the history

  4. delay quest start until showDialogue runs

    @Fezz-xiii
    Fezz-xiii committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    4bc61ff View commit details
    Browse the repository at this point in the history

  5. place all dialogues in arrays to organise them

    @Fezz-xiii
    Fezz-xiii committed Aug 19, 2021
    Configuration menu
    Copy the full SHA
    337006f View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2021

  1. work on stageOne dialogue && more

    @Fezz-xiii
    Fezz-xiii committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    73f048e View commit details
    Browse the repository at this point in the history

  2. levelOne dialogues cleanup

    @Fezz-xiii
    Fezz-xiii committed Aug 26, 2021
    Configuration menu
    Copy the full SHA
    11ac98c View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2021

  1. aggregate corefunctions for easier imports

    @Fezz-xiii
    Fezz-xiii committed Aug 27, 2021
    Configuration menu
    Copy the full SHA
    19599d0 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2021

  1. dodge refactored

    @jonnicwolf
    jonnicwolf committed Oct 7, 2021
    Configuration menu
    Copy the full SHA
    e3c0963 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2021

  1. start working

    @jonnicwolf
    jonnicwolf committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    ab76865 View commit details
    Browse the repository at this point in the history

  2. ln 16 -> switch statement

    @jonnicwolf
    jonnicwolf committed Oct 8, 2021
    Configuration menu
    Copy the full SHA
    01e1c6a View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2021

  1. connect nameInput to levelone dialogue

    @jonnicwolf
    jonnicwolf committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    5628e60 View commit details
    Browse the repository at this point in the history

  2. bug fix: hero was undefined

    @jonnicwolf
    jonnicwolf committed Oct 10, 2021
    Configuration menu
    Copy the full SHA
    0da757c View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2021

  1. start working, timing issues fixed

    @jonnicwolf
    jonnicwolf committed Oct 11, 2021
    Configuration menu
    Copy the full SHA
    19366ef View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2021

  1. file and readme cleanup

    @jonnicwolf
    jonnicwolf committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    e596a1a View commit details
    Browse the repository at this point in the history

  2. testing on start

    @jonnicwolf
    jonnicwolf committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    23b855a View commit details
    Browse the repository at this point in the history

  3. package.json updates

    @jonnicwolf
    jonnicwolf committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    fca45bb View commit details
    Browse the repository at this point in the history

  4. start module now runs

    @jonnicwolf
    jonnicwolf committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    c13dba8 View commit details
    Browse the repository at this point in the history

  5. nameInput moved to corefunctions library

    @jonnicwolf
    jonnicwolf committed Dec 8, 2021
    Configuration menu
    Copy the full SHA
    ee0bd43 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2021

  1. typo levelOne lb 17

    @jonnicwolf
    jonnicwolf committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    ba1e47f View commit details
    Browse the repository at this point in the history

  2. housekeeping

    @jonnicwolf
    jonnicwolf committed Dec 9, 2021
    Configuration menu
    Copy the full SHA
    b736c4a View commit details
    Browse the repository at this point in the history