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.

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

Fix npcs #3

Open
wants to merge 343 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
343 commits
Select commit Hold shift + click to select a range
6499580
Fixes Ant Queen crashes
Veradictus Nov 6, 2017
1621776
AoE Fixes & Queen Ant functional
Veradictus Nov 10, 2017
d02f213
Hit Callback for Players
Veradictus Nov 11, 2017
6364753
Combat Formula
Veradictus Nov 13, 2017
88fb263
New armour, de-hardcoded `drawEntityFore`, adds special attacks, stun…
Veradictus Nov 13, 2017
b0e5d27
Fixes bug where chests were replaced with a pickle
Veradictus Nov 13, 2017
90a3338
Fixes warping bug, combat bug and interface misalignment
Veradictus Nov 15, 2017
e797024
Fixes overlay bug
Veradictus Nov 15, 2017
05bd504
Adds Crypto Miner
Veradictus Nov 17, 2017
7d28198
Fix spelling error
spoobert Nov 19, 2017
a6098b7
Merge pull request #58 from spoobert/master
Veradictus Nov 19, 2017
46ed696
Fixes WSAD movement & NPC talking, adds timeout, fixes combat healing
Veradictus Nov 24, 2017
b97c6cd
Merge remote-tracking branch 'origin/master'
Veradictus Nov 24, 2017
c254707
Fixes pendant, mob not attacking, blank initial attack bugs
Veradictus Nov 24, 2017
eb9881f
Crypto Rewards
Veradictus Dec 16, 2017
5518bdd
Fixes interfaces not disappearing & inability to attack after picking…
Veradictus Dec 19, 2017
e2e08c2
Great Squid & Improvements to stunning mechanism
Veradictus Dec 20, 2017
3ff7f11
Tenebris Plugin and enhancements
Veradictus Dec 22, 2017
70b4b60
Refactoring and Shop
Veradictus Jan 4, 2018
8d80c2b
Adds isPositionAdjacent and removes annoying cursor target when you move
design1online Jan 10, 2018
07ed3bf
disable drawing target cell
design1online Jan 10, 2018
6eb6e11
Remove all references to crypto
design1online Jan 10, 2018
20838b5
getting rid of horrible advocut font, yuck
design1online Jan 10, 2018
0f7df8d
changing game name
design1online Jan 10, 2018
f95c9c9
fixing font on footer
design1online Jan 10, 2018
1974e14
Missed some name changes
design1online Jan 10, 2018
774eeae
Removing empty folders
design1online Jan 10, 2018
1bbb8a2
Updating tutorial NPC message
design1online Jan 10, 2018
c0f9ef8
Adding dog sprite
design1online Jan 10, 2018
7e457e2
Removing crypto files missed from server folder
design1online Jan 10, 2018
9f7cc77
Removing stroke class from elements
design1online Jan 10, 2018
13a1df4
Fixing dog sprite error
design1online Jan 10, 2018
dc6d162
Removing crypto reference
design1online Jan 10, 2018
782933d
removing docs tests
design1online Jan 10, 2018
807c6c5
fixing bugs
design1online Jan 10, 2018
1b7f86e
Updating title to picture
design1online Jan 12, 2018
a8ad783
Removing awful parchment background
design1online Jan 12, 2018
9d4d3ab
Updating readme file logo
design1online Jan 14, 2018
bec8939
Delete wtfadventure.png
design1online Jan 14, 2018
5594ed0
overwriting cached image
design1online Jan 14, 2018
c3f0647
Updating background image
design1online Jan 14, 2018
0937342
Adding new spinner
design1online Jan 14, 2018
3218b11
Adding new smaller logo
design1online Jan 14, 2018
dae5927
Adding node and mysql start scripts
design1online Jan 14, 2018
3d54e67
Updating readme and fixing package.json syntax error
design1online Jan 15, 2018
38fa1f6
Updating readme and license
design1online Jan 15, 2018
45fcaa7
Adding new interface images
design1online Jan 15, 2018
7960737
login image changes wip
design1online Jan 15, 2018
048ba7a
change #parchment to #login and #login to #loginButton
design1online Jan 15, 2018
240fd95
more login ui changes wip
design1online Jan 15, 2018
18e4a1e
login page ui changes wip
design1online Jan 16, 2018
026291b
Adding license changes
design1online Jan 17, 2018
0072b3d
Moving spritesheet to img/common folder
design1online Jan 17, 2018
2071676
wip
design1online Jan 19, 2018
87f1170
wip
design1online Jan 23, 2018
45e3e17
Fixing login page
design1online Jan 23, 2018
6ba1be3
fixing game container
design1online Jan 23, 2018
3295828
Hiding cursor for now
design1online Jan 23, 2018
330ffe9
wip: login layout and image changes
design1online Jan 24, 2018
9c5fa44
wip: game interface, loader positioning, audio bug
design1online Jan 24, 2018
65b8f46
Fixing container sizing and zoom
design1online Jan 24, 2018
56226d2
Fixing button position and border opacity
design1online Jan 24, 2018
838ec2f
Merge pull request #1 from design1online/login-changes
design1online Jan 24, 2018
6b37640
Initial hud changes
design1online Jan 25, 2018
fedb279
Merge branch 'master' into hud-changes
design1online Jan 25, 2018
a74c53a
Moving overlay to left hud bar
design1online Jan 25, 2018
af8ca2d
wip: join page changes
design1online Jan 27, 2018
ebf4a5f
hud changes?
design1online Dec 1, 2018
3d65729
More hud improvements, new images
Dec 2, 2018
061dcaa
wip
Dec 2, 2018
7db8950
hud adjustments
Dec 2, 2018
8f302a0
wip hud updates
Dec 8, 2018
b7ac3b6
Fixing login display when theres an error
Dec 8, 2018
2731248
Fixed invalid login message
Dec 9, 2018
a38f54f
Fixing autoheal issue
Dec 9, 2018
a83573c
Updating pointer graphic
Dec 9, 2018
6efb383
Removing hud placeholder text
Dec 9, 2018
1acbc74
Moving new class creation out of function params
Dec 9, 2018
157f1ec
File format updates
Dec 30, 2018
ca35b93
Merge pull request #2 from design1online/file-formatting-changes
design1online Dec 30, 2018
c8c7de5
Removing npm-debug log and adding it to .gitignore
Dec 30, 2018
8de467e
Merge pull request #3 from design1online/npm-log
design1online Dec 30, 2018
c6c2548
WIP
Dec 31, 2018
744178b
wip
Dec 31, 2018
e40e8a7
WIP
Dec 31, 2018
ca86049
wip
Dec 31, 2018
728c8a3
wip
Dec 31, 2018
711485e
wip and adding eslint
Dec 31, 2018
c11f763
Updating to es6
Dec 31, 2018
54843cd
wip
Dec 31, 2018
3ffb2c0
converting to es6
Jan 1, 2019
acb649b
Replacing self.varname with this.varname
Jan 1, 2019
06eeedb
Updating constructors names
Jan 1, 2019
4cd9fa9
updating to use es6
Jan 1, 2019
0bdff48
es6 updates
Jan 1, 2019
b63e469
wip es6 conversion
Jan 3, 2019
1516b9d
wip es6 conversion
Jan 3, 2019
d268a7a
wip es6 conversion
Jan 3, 2019
e9aec7f
wip es6 conversion
Jan 3, 2019
5807422
wip es6 conversion
Jan 3, 2019
d523f2e
wip es6 conversion
Jan 5, 2019
ca444b9
es6 updates
Jan 5, 2019
3dcae2c
es6 updates
Jan 5, 2019
b29186f
es6 updates
Jan 5, 2019
944a480
es6 updates
Jan 6, 2019
b1627a5
es6 updates
Jan 7, 2019
0f6b7c6
es6 updates
Jan 8, 2019
a479983
wip es6 conversion
Jan 8, 2019
e010c60
fixing super() references
Jan 8, 2019
ad56966
wip es6
Jan 8, 2019
7eb0c77
wip
Jan 8, 2019
ca1a0cc
Merge pull request #4 from design1online/update-to-babel-es6
design1online Jan 8, 2019
ef1105d
Adding esdoc
Jan 8, 2019
641589e
Adding documentation
Jan 8, 2019
998c1d0
Updating esdoc blocks
Jan 9, 2019
eb663e6
Adding docs
Jan 9, 2019
c81d6a9
Adding docs
Jan 9, 2019
cc0f570
Merge pull request #5 from design1online/update-to-babel-es6
design1online Jan 9, 2019
7b28ea6
coverage badge
Jan 9, 2019
ab52900
coverage badge
Jan 9, 2019
8a687fc
removing badge
Jan 9, 2019
905dbd8
circleci config file
Jan 9, 2019
73422eb
circleci config
Jan 9, 2019
4870b73
Adding semver for linter tests
Jan 9, 2019
90e52a1
Fixing tools file
Jan 9, 2019
a42c3c3
CircleCI Badge
Jan 9, 2019
e43d981
Adding documentation badge
Jan 9, 2019
a7592b2
Updating circleci config to use npm instead of yarn
Jan 9, 2019
81b57b7
Fixing esdoc command
Jan 9, 2019
fd3bf2e
Updating
Jan 9, 2019
4ba1e82
adding todo
Jan 9, 2019
a3ec7ee
Updating docs
Jan 9, 2019
2cf161e
Fixing repo link
Jan 9, 2019
9c92412
fixing repo link
Jan 9, 2019
01a570e
adding license badge
Jan 9, 2019
f619718
Adding Jest unit tests and coverage badge
Jan 10, 2019
bb78900
Fixing linter command
Jan 10, 2019
299e5eb
Merge pull request #6 from design1online/jest-unit-tests
design1online Jan 10, 2019
d1044a7
Fixing badge url paths
Jan 10, 2019
05e5dae
Updating docs
Jan 10, 2019
afb2832
adding unit tests to documentation, adding wallabyjs
Jan 10, 2019
cb8afde
Updating docs, more unit tests
Jan 10, 2019
24b5949
Adding wallabyjs
Jan 12, 2019
72c7996
Merge pull request #7 from design1online/doc-tests-and-wallabyjs
design1online Jan 12, 2019
8930ec9
updating docs
Jan 12, 2019
01e1759
updating code coverage
Jan 12, 2019
26c2d44
Updating docs and tests
Jan 12, 2019
3f2cebf
updating docs
Jan 12, 2019
2bd7cb7
updating docs
Jan 14, 2019
0984167
Update README.md
design1online Mar 12, 2019
6dd1f9e
Fixing client config file name
Mar 13, 2019
1ab5981
Updating with better setup instructions
Mar 13, 2019
003ab58
Fixing browsersync constantly reloading
Mar 13, 2019
46a638f
Fixing jQuery imports not working properly
Mar 14, 2019
cf52fcc
Fixes hasClass errors
Mar 14, 2019
3023ce7
minor version bump for jquery bugfixes
Mar 14, 2019
3740284
Fixing dictionaries
Mar 15, 2019
0a08ec0
updating docs
Mar 15, 2019
465641d
Updating docs
Mar 15, 2019
c6c85cf
Updating packages
Jun 9, 2019
6b94b12
Updating esdoc for chat controller, fixing esdocs command to be plural
Jun 9, 2019
1f18593
Updating doc blocks
Jun 10, 2019
05cb34e
Updating docs
Jun 10, 2019
821f7bd
WIP
Jun 25, 2019
5bce738
wip
Jun 27, 2019
6370e6d
wip
Jul 2, 2019
3cc34b0
combining fixes
Jul 7, 2019
1311bef
Updating log functionality
Jul 7, 2019
5e04c0c
WIP
Jul 7, 2019
8b92f3a
Adding more log messages to figure out whats wrong with the renderer
Jul 8, 2019
4f868e1
wip
Sep 2, 2019
e242b88
fixing renderer ticks
Sep 29, 2019
145076f
Fixing player not showing up
Sep 29, 2019
800b224
Fixing auto-binding of event listeners
Oct 20, 2019
008a319
Merge branch 'master' into trying-to-fix-shit
design1online Oct 25, 2019
d76d86f
string conversion fix
Oct 26, 2019
c75ab2e
Merge branch 'trying-to-fix-shit' of github.com:design1online/WTF-Adv…
Oct 26, 2019
082ae98
adding padEnd function for circleci :(
Oct 26, 2019
5d122c1
Merge pull request #15 from design1online/trying-to-fix-shit
design1online Oct 26, 2019
538608c
Adding missing docblock
Oct 26, 2019
9bd1bd6
Merge pull request #16 from design1online/trying-to-fix-shit
design1online Oct 26, 2019
37be556
Updating code coverage
Oct 26, 2019
3b69ea7
Merge pull request #17 from design1online/trying-to-fix-shit
design1online Oct 26, 2019
f9efcb9
Updating docs
Oct 26, 2019
83c790f
Adding docs
Oct 27, 2019
ae75a6b
Merge pull request #18 from design1online/docs
design1online Oct 27, 2019
f5dcc4b
Removed unnecessary sentance
design1online Nov 27, 2019
5ef8efa
Adding doc blocks
Nov 27, 2019
dcf02c0
Create nodejs.yml
design1online Dec 4, 2019
e57d5e3
fixing shit
Jul 26, 2020
34d2032
reverting astar file for now
Jul 26, 2020
6a17243
Merge pull request #24 from design1online/update-packages
design1online Jul 26, 2020
170beda
Merge branch 'master' into updating-docs
Jul 26, 2020
cd822c0
updating docs
Jul 26, 2020
a713c5b
updating coverage docs
Jul 26, 2020
ad8092a
Merge branch 'main' into design1online-patch-1
Aug 2, 2020
f88c893
Fixing unit tests
Aug 2, 2020
3485bcb
Updating to node 8 on circle CI
Aug 2, 2020
d4b6ff9
Updating circleci again
Aug 2, 2020
fb0b8d5
removing circleci
Aug 2, 2020
d556d15
updating readme file
Aug 2, 2020
b9a7fa4
Merge pull request #20 from design1online/design1online-patch-1
design1online Aug 2, 2020
55aea0e
Fixing extra square brackets
Aug 2, 2020
041e1e3
Fixing pathing issue when no entity
Aug 2, 2020
999d278
Merge branch 'main' into fix-pathing-issue
design1online Aug 2, 2020
a9b70ec
Merge pull request #26 from design1online/fix-pathing-issue
design1online Aug 2, 2020
5b66c17
Updating rendering scale factor to center on laptops
Aug 2, 2020
d939b32
Merge pull request #27 from design1online/fix-centering
design1online Aug 2, 2020
51ef9b5
Fixing tilesets not being fully loaded when switching to the game view
Aug 12, 2020
8072d56
Updating node workflow to separate out tests from build process
Aug 12, 2020
d35b8a7
updating docs
Aug 12, 2020
bd877de
merge conflicts
Aug 12, 2020
4bbe78f
Updating documentation
Aug 12, 2020
0c445bf
Merge pull request #29 from design1online/updating-docs
design1online Aug 12, 2020
68d6dc0
Fixing browsersync audio
Aug 12, 2020
21827df
Updating npm dependancies
Aug 12, 2020
048e897
removing unused webpack file
Aug 12, 2020
8062a26
Merge pull request #30 from design1online/fixing-audio-browsersync
design1online Aug 12, 2020
e80f004
Merge pull request #31 from design1online/removing-unused-webpack-file
design1online Aug 12, 2020
64f2e7a
Fixing coverage badge references
Aug 12, 2020
9f92e93
updating webpack files
Aug 12, 2020
aae9b11
fixing coverage and badge
Aug 12, 2020
812f5cb
Fixing test badge again :(
Aug 12, 2020
c19f0ce
Updating package.lock
Aug 12, 2020
563e275
coverage conflicts
Aug 12, 2020
665e121
fixing coverage conflicts
Aug 12, 2020
e1708f2
Merge pull request #32 from design1online/update-dependancies
design1online Aug 12, 2020
ea1535e
Adding tmx files and tilesheets that are missing
Aug 13, 2020
0783644
Adding links to the source repos
Aug 13, 2020
3f391c8
Merge pull request #33 from design1online/adding-tmx-files
design1online Aug 13, 2020
f3e92f9
Merge branch 'main' into fix-tilesets-not-loading
Aug 13, 2020
366e4c9
fixing tests not running
Aug 13, 2020
8a99521
Merge pull request #28 from design1online/fix-tilesets-not-loading
design1online Aug 13, 2020
4a166d8
Disabling broken tutorial for now
Aug 13, 2020
67db7fd
Fixing scrolling issue, audio error and removing debug on renderer
Aug 13, 2020
b284b49
updating dependencies
Oct 29, 2020
92fe763
Merge pull request #38 from design1online/update-dependencies
design1online Oct 29, 2020
3b1d08f
Bump dot-prop from 4.2.0 to 4.2.1
dependabot[bot] Oct 29, 2020
c524c9f
Bump lodash.merge from 4.6.1 to 4.6.2
dependabot[bot] Oct 29, 2020
a6c5c83
fixing dependencies again
Oct 29, 2020
01969bf
Merge pull request #40 from design1online/update-dependencies
design1online Oct 29, 2020
dfeb63a
Merge pull request #39 from design1online/dependabot/npm_and_yarn/dot…
design1online Oct 29, 2020
431fdcc
Merge pull request #36 from design1online/dependabot/npm_and_yarn/lod…
design1online Oct 29, 2020
e56bcfb
Updating docs for Sprites and Pointer
Oct 29, 2020
f6f5b3a
Updating zoning controller docs
Oct 29, 2020
0ceb982
lots more good doc updates
Oct 29, 2020
04ae455
Fixing lots more docs, yay
Oct 29, 2020
9a67f35
WIP: fixes the NPCs not showing up
Dec 16, 2020
08ac6aa
Fixing items and chests
Dec 16, 2020
a5b19f9
Fixes NPCs and Mobs and Items not appearing
Dec 17, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file removed .DS_Store
Binary file not shown.
9 changes: 9 additions & 0 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"presets": ["@babel/preset-env"],
"plugins": ["@babel/plugin-transform-runtime"],
"env": {
"production": {
"presets": ["minify"]
}
}
}
49 changes: 49 additions & 0 deletions .esdoc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"source": "./",
"destination": "./docs",
"includes": ["\\.js$"],
"excludes": [
"node_modules",
"build",
"world_client.js",
"coverage",
"docs/script",
"setupTests.js",
"src/client/js/__tests__",
"wallaby.config.js",
"webpack.config.js",
"webpack.prod.config.js"
],
"plugins": [
{ "name": "esdoc-ecmascript-proposal-plugin", "option": { "all": true } },
{
"name": "esdoc-standard-plugin",
"option": {
"test": {
"source": "./",
"interfaces": ["describe", "it", "context", "suite", "test"],
"includes": ["(spec|Spec|test|Test)\\.js$"],
"excludes": ["node_modules","build"]
},
"lint": { "enable": true },
"coverage": { "enable": true },
"accessor": {
"access": ["public", "protected", "package", "private"],
"autoPrivate": true
},
"undocumentIdentifier": { "enable": true },
"unexportedIdentifier": { "enable": false },
"typeInference": { "enable": true },
"brand": {
"logo": "./assets/img/wtflogo-small.png",
"title": "WTF Adventure",
"description": "documentation for your wtf needs",
"repository": "https://github.com/design1online/WTF-Adventure",
"site": "http://design1online.com",
"author": "https://design1online.com",
"image": "http://design1online.com/logo.png"
}
}
}
]
}
14 changes: 14 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"extends": "airbnb-base",
"env": {
"jest": true
},
"rules": {
"class-methods-use-this": [
"error",
{
"exceptMethods": [],
},
],
}
}
27 changes: 27 additions & 0 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Node CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [8.x, 10.x, 12.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: npm build
run: |
npm ci
npm run build --if-present
- name: Running unit tests
run: npm test
env:
CI: true
19 changes: 10 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/nbproject/private/
/iOSClient/nbproject/private/
/server/nbproject/private/
/shared/nbproject/private/
/tools/nbproject/private/
/client/nbproject/private/
/Learning/nbproject/private/
/node_modules
/client-build
build
node_modules
cordova
.idea
.DS_Store
dump.rdb
server/config.json
data/config.json
npm-debug.log
.external-ecmascript.js
1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/Tap Tap Adventure.iml

This file was deleted.

103 changes: 0 additions & 103 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/jsLibraryMappings.xml

This file was deleted.

14 changes: 0 additions & 14 deletions .idea/libraries/Tap_Tap_Adventure_node_modules.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

Loading