Commit graph

647 commits

Author SHA1 Message Date
b
b4a633b4c9 Merge branch 'dev' of https://github.com/hppeng-wynn/hppeng-wynn.github.io into dev 2021-01-07 20:41:54 -06:00
b
7a4d047ed5 Fix merge conflicts 2021-01-07 20:41:52 -06:00
ferricles
7c0f47afbd fixed double declaration 2021-01-07 18:41:28 -08:00
b
00f380fe87 Fix minor bug in skillpoint engine, add assign skillpoint 2021-01-07 20:40:12 -06:00
ferricles
c5f037d1c6 fixed merge conflicts 2021-01-07 18:35:49 -08:00
ferricles
a1ab532ba1 statMap functional, melee damage calc functional but overestimates elemental damage 2021-01-07 18:34:07 -08:00
b
f3c2cefd5a Bump version number 2021-01-07 19:17:39 -06:00
b
f139e8b231 Merge branch 'master' into dev 2021-01-07 19:16:22 -06:00
b
7dd53b149b Clear hash when resetting 2021-01-07 19:16:06 -06:00
b
12d9741d93 Add markers for elements 2021-01-07 19:14:56 -06:00
b
1623b422b2 Better UI, wynndata styling 2021-01-07 19:02:12 -06:00
b
4312515a11 Reworking item displays 2021-01-07 16:44:52 -06:00
ferricles
126bcf875c dummy commit 2021-01-07 13:32:36 -08:00
b
ce3904d0ab fix typo... 2021-01-07 04:36:10 -06:00
b
14852cc431 Change pipe to underscore character 2021-01-07 04:31:02 -06:00
b
b51b3c6482 Add IDs to builds, save state starting 2021-01-07 04:23:54 -06:00
b
77e9d77742 Fix merge conflicts 2021-01-07 02:45:41 -06:00
b
86bd75833e add id map 2021-01-07 02:34:31 -06:00
ferricles
76dee6948f fixed merge issues and minor typos 2021-01-07 00:17:53 -08:00
ferricles
f6de78e416 fully functional builder 2021-01-07 00:11:54 -08:00
b
ef96d77b2f Fix negative skillpoints in skillpoint engine 2021-01-07 01:08:16 -06:00
b
55ba7f4fc2 Skillpoints engine 2021-01-07 00:41:41 -06:00
b
2b95c69176 Adding comments to skp test script 2021-01-06 20:02:28 -06:00
b
19f0e4c776 Removed material info from db, add test script for builder 2021-01-06 20:00:21 -06:00
b
e864314eea Update TODO 2021-01-06 18:36:11 -06:00
ferricles
1097f571ca getting ready to pull 2021-01-06 16:12:34 -08:00
b
e731d84ada Fix merge conflicts 2021-01-06 18:10:34 -06:00
b
4aca42d959 Refactor to move db load stuff out 2021-01-06 18:08:28 -06:00
ferricles
35ee0c8def weird merge issues fixed 2021-01-06 16:04:57 -08:00
ferricles
f0b715a9a2 added on to building 2021-01-06 16:04:16 -08:00
b
87b6212eab Separate out build.js 2021-01-06 18:02:10 -06:00
ferricles
8510cdb515 fixed merge issues 2021-01-06 15:33:02 -08:00
ferricles
da64e40645 complete barebones build tool 2021-01-06 15:31:35 -08:00
b
f08e42411a Fix item_fields 2021-01-06 17:00:13 -06:00
ferricles
c1324cef53 Merge branch 'master' of https://github.com/hppeng-wynn/hppeng-wynn.github.io 2021-01-06 14:54:50 -08:00
ferricles
f03970d8a2 error fixing and dropdowns no default to No Items 2021-01-06 14:54:48 -08:00
b
b1b3007720 Fix merge conflicts 2021-01-06 16:53:03 -06:00
b
e3ff007cc2 Bump db version, use displayName properly 2021-01-06 16:51:02 -06:00
ferricles
5015389ce0 began building builds for real 2021-01-06 14:46:00 -08:00
ferricles
21ef3d59ff Added barebones build class 2021-01-06 12:54:15 -08:00
ferricles
f6e68a74b8 fixed merge issues 2021-01-06 08:23:21 -08:00
ferricles
1da33f59f3 basic constructor in build 2021-01-06 08:21:55 -08:00
b
e794b51fcf Content 2021-01-06 06:48:41 -06:00
CalixTang
299eaf1144 oops 2021-01-06 00:42:26 -08:00
CalixTang
1e7e13b966 Skill Points and build class 2021-01-06 00:40:51 -08:00
b
e3dbc5e90a Actual stuff, example files 2021-01-06 00:10:27 -06:00
b
e2d7be1dab Add readme test 2021-01-05 23:13:07 -06:00