Code

Pull updates to begin new project#2

Code

Merged

CptDraco merged 98 commits intoCptDraco:MasterCptDraco/cactbot:Masterfrom quisquous:masterquisquous/cactbot:masterCopy head branch name to clipboardApr 21, 2018

+3,704-708

Commits

Commits on Feb 17, 2018

• Shortening O5 timeline names (#49)

  

  xephero

  authored and

  quisquous

  committed
  3e414c5

  Copy full SHA for 3e414c5

• Adding timelines for Sigmascape 6-8N (#53)

  

  xephero

  authored and

  quisquous

  committed
  1e024f0

  Copy full SHA for 1e024f0

• Cleanup o5678n reset lines

  quisquous

  committed
  e3468c5

  Copy full SHA for e3468c5

• O8S naming cleanup (#55)

  

  xephero

  authored and

  quisquous

  committed
  39bcd24

  Copy full SHA for 39bcd24

Commits on Feb 18, 2018

• Triggers for o6s (#54)

  Show description for e805da9
  

  imynwulf

  authored and

  quisquous

  committed
  e805da9

  Copy full SHA for e805da9

• o7n: replace missile with prey

  quisquous

  committed
  47842c2

  Copy full SHA for 47842c2

• raidboss: add preRun functions

  quisquous

  committed
  4d926a7

  Copy full SHA for 4d926a7

• raidboss: Allow overrides for condition and texts

  Show description for c7d2618
  quisquous

  committed
  c7d2618

  Copy full SHA for c7d2618

• Add tts for general provoke/shirk/etc triggers

  Show description for f1a5df8
  quisquous

  committed
  f1a5df8

  Copy full SHA for f1a5df8

Commits on Feb 20, 2018

• ucu: Fix adds phase rp text mistake OOPS

  quisquous

  committed
  d71136d

  Copy full SHA for d71136d

Commits on Feb 21, 2018

• raidboss: o6s triggers

  quisquous

  committed
  9819837

  Copy full SHA for 9819837

• o5s: Add more sync windows in case somebody misses the train coming back

  quisquous

  committed
  31d4f3c

  Copy full SHA for 31d4f3c

• fractal hard: don't call knockback on first death spin

  quisquous

  committed
  532e090

  Copy full SHA for 532e090

• o7s: make more program names specific

  quisquous

  committed
  3ee721a

  Copy full SHA for 3ee721a

Commits on Feb 22, 2018

• o5s: narrow sync times after add phase

  quisquous

  committed
  9408ebf

  Copy full SHA for 9408ebf

Commits on Feb 23, 2018

• Fix https update check

  Show description for 1d72f55
  quisquous

  committed
  1d72f55

  Copy full SHA for 1d72f55

• Bump version to 0.6.3

  quisquous

  committed
  56ab69f

  Copy full SHA for 56ab69f

Commits on Feb 24, 2018

• Create fr.js (#58)

  Show description for b78cb3f
  

  Amiral-Benson

  authored and

  quisquous

  committed
  b78cb3f

  Copy full SHA for b78cb3f

• Logic fixes in lang/fr

  quisquous

  committed
  9558220

  Copy full SHA for 9558220

• Move zone names out of locale-specific lang files

  Show description for e52af68
  quisquous

  committed
  e52af68

  Copy full SHA for e52af68

• Add sigmascape zones to well fed regex

  quisquous

  committed
  5f5fb0a

  Copy full SHA for 5f5fb0a

• Fix cactbot initialization race

  Show description for a956ead
  quisquous

  committed
  a956ead

  Copy full SHA for a956ead

Commits on Feb 25, 2018

• Support html entities in custom elements

  Show description for 4ff2e30
  quisquous

  committed
  4ff2e30

  Copy full SHA for 4ff2e30

• raidboss: Allow timeline names to be overridden

  Show description for 0dfc514
  quisquous

  committed
  0dfc514

  Copy full SHA for 0dfc514

• oopsy: fix test bootshine trigger misapplying

  quisquous

  committed
  4dd1cc4

  Copy full SHA for 4dd1cc4

• raidboss: Allow timeline syncs to be overridden

  Show description for 1d4e899
  quisquous

  committed
  1d4e899

  Copy full SHA for 1d4e899

• raidboss: add support for localized triggers

  Show description for 6c2c560
  quisquous

  committed
  6c2c560

  Copy full SHA for 6c2c560

• oopsy: re-re-fix test bootshine typo

  Show description for 642935f
  quisquous

  committed
  642935f

  Copy full SHA for 642935f

• oopsy: ability ids can only match entire ids

  Show description for 070ed8a
  quisquous

  committed
  070ed8a

  Copy full SHA for 070ed8a

• raidboss: O8S timeline tweaks (#62)

  Show description for 2d3bd53
  

  xephero

  authored and

  quisquous

  committed
  2d3bd53

  Copy full SHA for 2d3bd53

Commits on Feb 26, 2018

• Add DispatchToJS lock to prevent races

  Show description for 62539c1
  quisquous

  committed
  62539c1

  Copy full SHA for 62539c1

• raidboss: Fix triggers returning integers

  Show description for bdc103a
  quisquous

  committed
  bdc103a

  Copy full SHA for bdc103a

Commits on Feb 27, 2018

• Custom User Config Local Directory (#64)

  Show description for ce679ad
  

  ezsoftware

  authored and

  quisquous

  committed
  ce679ad

  Copy full SHA for ce679ad

• Minor fixes after pull #64

  quisquous

  committed
  e369074

  Copy full SHA for e369074

• Allow blank as a custom user directory default

  Show description for a44d546
  quisquous

  committed
  a44d546

  Copy full SHA for a44d546

• Simplify user location messages

  Show description for 18faff3
  quisquous

  committed
  18faff3

  Copy full SHA for 18faff3

• Refactor SendFastRateEvents preamble/cleanup

  Show description for 1988cf3
  quisquous

  committed
  1988cf3

  Copy full SHA for 1988cf3

• Automatically add onDOMContentReady listener

  Show description for 476ea6d
  quisquous

  committed
  476ea6d

  Copy full SHA for 476ea6d

• Wait for user config before initializing overlay

  Show description for 3f8e28c
  quisquous

  committed
  3f8e28c

  Copy full SHA for 3f8e28c

Commits on Mar 2, 2018

• util: make_timeline.py improvements (#67)

  Show description for 42d4cfa
  

  xephero

  authored and

  quisquous

  committed
  42d4cfa

  Copy full SHA for 42d4cfa

Commits on Mar 3, 2018

• oopsy: belated 4.2 flag value updates

  Show description for 293afe2
  quisquous

  committed
  293afe2

  Copy full SHA for 293afe2

• oopsy: Add all nameless autos as ids

  Show description for 8a12ec2
  quisquous

  committed
  8a12ec2

  Copy full SHA for 8a12ec2

• oopsy: reset first puller on countdown start/cancel

  Show description for 94005e4
  quisquous

  committed
  94005e4

  Copy full SHA for 94005e4

• readme: add more details to install instructions

  quisquous

  authored
  bcd0b43

  Copy full SHA for bcd0b43

• Add fr.js to overlay html files

  Show description for 4f9cc6d
  quisquous

  committed
  4f9cc6d

  Copy full SHA for 4f9cc6d

Commits on Mar 4, 2018

• raidboss: fix localization return values

  Show description for 4410aad
  quisquous

  committed
  4410aad

  Copy full SHA for 4410aad

• Read data files in unicode

  Show description for d63fa1c
  quisquous

  committed
  d63fa1c

  Copy full SHA for d63fa1c

• raidboss: fr localization for test triggers

  Show description for 05d786d
  

  Amiral-Benson

  authored and

  quisquous

  committed
  05d786d

  Copy full SHA for 05d786d

• Add french engage replaceSync for test timeline

  Show description for d4e6500
  quisquous

  committed
  d4e6500

  Copy full SHA for d4e6500

Commits on Mar 7, 2018

• raidboss: add load/run o7s triggers

  quisquous

  committed
  05aa3c1

  Copy full SHA for 05aa3c1

Commits on Mar 9, 2018

• raidboss: O7S timeline fixes (#72)

  Show description for e01f152
  

  xephero

  authored and

  quisquous

  committed
  e01f152

  Copy full SHA for e01f152

Commits on Mar 10, 2018

• raidboss: fix o7s visual continuity times

  Show description for 17c5b20
  quisquous

  committed
  17c5b20

  Copy full SHA for 17c5b20

• raidboss: add suppressSeconds to triggers

  Show description for 4181e12
  quisquous

  committed
  4181e12

  Copy full SHA for 4181e12

• raidboss: Clean up triggers to use suppressSeconds

  quisquous

  committed
  b26126d

  Copy full SHA for b26126d

• raidboss: better ucu fireball logic

  Show description for a88566c
  quisquous

  committed
  a88566c

  Copy full SHA for a88566c

Commits on Mar 11, 2018

• Adding O8S timeline syncs (#66)

  Show description for 0b11a8e
  

  xephero

  authored and

  quisquous

  committed
  0b11a8e

  Copy full SHA for 0b11a8e

• Support mixing remote url with local user files

  Show description for 1632347
  quisquous

  committed
  1632347

  Copy full SHA for 1632347

Commits on Mar 13, 2018

• Log dll versions and locations when starting cactbot

  Show description for 6cafe06
  quisquous

  committed
  6cafe06

  Copy full SHA for 6cafe06

Commits on Mar 14, 2018

• raidboss: more o8s triggers

  quisquous

  committed
  0131325

  Copy full SHA for 0131325

• raidboss: improve mana release triggers for tts

  Show description for e432f65
  quisquous

  committed
  e432f65

  Copy full SHA for e432f65

• raidboss: fix o7s rot triggers

  quisquous

  committed
  052523e

  Copy full SHA for 052523e

• Bump version to 0.6.4

  quisquous

  committed
  2588d33

  Copy full SHA for 2588d33

Commits on Mar 15, 2018

• Fix null config directory preventing overlays from starting

  Show description for 61ac106
  quisquous

  committed
  61ac106

  Copy full SHA for 61ac106

• Bump version to 0.6.5

  quisquous

  committed
  1d737d0

  Copy full SHA for 1d737d0

Commits on Mar 17, 2018

• de: Create de.js (#84)

  Show description for d57e1e9
  

  DrLippe

  authored and

  quisquous

  committed
  d57e1e9

  Copy full SHA for d57e1e9

• de: Update jobs.html (#79)

  Show description for 70daf77
  

  DrLippe

  authored and

  quisquous

  committed
  70daf77

  Copy full SHA for 70daf77

• de: Update pull_counter.html (#80)

  Show description for 74beeb2
  

  DrLippe

  authored and

  quisquous

  committed
  74beeb2

  Copy full SHA for 74beeb2

• de: Update oopsyraidsy.html (#81)

  Show description for 6bf1c0f
  

  DrLippe

  authored and

  quisquous

  committed
  6bf1c0f

  Copy full SHA for 6bf1c0f

• de: Update xephero-cactbot.html (#82)

  Show description for 2e47ac9
  

  DrLippe

  authored and

  quisquous

  committed
  2e47ac9

  Copy full SHA for 2e47ac9

• de: Update raidboss.html (#83)

  Show description for 0b8223b
  

  DrLippe

  authored and

  quisquous

  committed
  0b8223b

  Copy full SHA for 0b8223b

Commits on Mar 24, 2018

• Allow spaces in cactbot user config dir locations

  Show description for a78e1e8
  quisquous

  committed
  a78e1e8

  Copy full SHA for a78e1e8

• Try loading user files html-relative before dll-relative

  Show description for f47dff8
  quisquous

  committed
  f47dff8

  Copy full SHA for f47dff8

• Localize o5s for de/fr/jp (#85)

  Show description for 792804b
  

  DrLippe

  authored and

  quisquous

  committed
  792804b

  Copy full SHA for 792804b

• Clean up formatting from pull #85

  Show description for b1b6e30
  quisquous

  committed
  b1b6e30

  Copy full SHA for b1b6e30

• Fix fr engage message in pull #85

  Show description for 5ea0ce7
  quisquous

  committed
  5ea0ce7

  Copy full SHA for 5ea0ce7

• Split out regexes by language after pull #85

  quisquous

  committed
  4022e58

  Copy full SHA for 4022e58

Commits on Mar 25, 2018

• Register languages before initializing overlay

  quisquous

  committed
  ca2a6db

  Copy full SHA for ca2a6db

• Add more ignore zones to xephero dps

  quisquous

  committed
  608e259

  Copy full SHA for 608e259

• oopsy: ignore pvp and eureka

  quisquous

  committed
  8e36dee

  Copy full SHA for 8e36dee

Commits on Mar 26, 2018

• raidboss: eureka triggers

  quisquous

  committed
  f3f5a76

  Copy full SHA for f3f5a76

Commits on Mar 27, 2018

• Fix typo in o2s.js

  Show description for 29c3cfb
  quisquous

  authored
  29c3cfb

  Copy full SHA for 29c3cfb

Commits on Apr 7, 2018

• raidboss: add fafnir eureka trigger

  quisquous

  committed
  04dd9ee

  Copy full SHA for 04dd9ee

• o8s: Fix hyperdrive and ultimate embrace triggers

  Show description for 3343605
  quisquous

  committed
  3343605

  Copy full SHA for 3343605

• raidboss: pass locale through as data.lang

  Show description for fcc101c
  quisquous

  committed
  fcc101c

  Copy full SHA for fcc101c

• o8s: add fr translation for mana release

  Show description for 73666ff
  quisquous

  committed
  73666ff

  Copy full SHA for 73666ff

Commits on Apr 10, 2018

• jobs: Add option for showing hp/mp for other jobs

  quisquous

  committed
  b60f04b

  Copy full SHA for b60f04b

Commits on Apr 14, 2018

• Add eureka map module

  quisquous

  committed
  f2b104e

  Copy full SHA for f2b104e

• eureka: make resize helper match real thing

  quisquous

  committed
  690d8f2

  Copy full SHA for 690d8f2

• eureka: be more permissive with tracker regexes

  Show description for 7c5707d
  quisquous

  committed
  7c5707d

  Copy full SHA for 7c5707d

• eureka: prevent console error when changing zones

  quisquous

  committed
  1f38181

  Copy full SHA for 1f38181

Commits on Apr 15, 2018

• rdmty: fix resize handle not appearing

  Show description for 2ce25b4
  quisquous

  committed
  2ce25b4

  Copy full SHA for 2ce25b4

Commits on Apr 21, 2018

• eureka: add ability to import times from web tracker (#103)

  

  christianhood

  authored and

  quisquous

  committed
  fe6215e

  Copy full SHA for fe6215e

• eureka: Split out tracker names explicitly

  quisquous

  committed
  73140a7

  Copy full SHA for 73140a7

• eureka: split out tracker vs local times

  Show description for 48d1bb9
  quisquous

  committed
  48d1bb9

  Copy full SHA for 48d1bb9

• eureka: add more readme information

  quisquous

  committed
  e367be6

  Copy full SHA for e367be6

• eureka: add star in NM readme text

  quisquous

  authored
  b9af51b

  Copy full SHA for b9af51b

• raidboss: allow sound volume settings for infoText

  Show description for db93426
  quisquous

  committed
  db93426

  Copy full SHA for db93426

• eureka: add wraith counter

  quisquous

  committed
  7c3a568

  Copy full SHA for 7c3a568