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

Pull updates to begin new project #2

Merged
merged 98 commits into from
Apr 21, 2018
Merged

Conversation

CptDraco
Copy link
Owner

No description provided.

xephero and others added 30 commits February 16, 2018 22:01
* Add Triggers in o6s

* update severity for last kiss target

* Fix tabbed indents and fix missing square bracket

* More indenting fixes
This allows users to specify shorter/longer outputs from triggers.  Also,
overriding conditions lets folks narrow (or broaden) when triggers show
up, e.g. see provokes even when you're not a tank or turn off mechanics
triggers for particular roles when they matter less.

Style-wise the capitalization on all the options looks weird, but I'm just
going to leave it for now for the sake of consistency.

Closes #51.
Releases page is now https only, so needs some extra flags and
should use the correct url.
* Create fr.js

New locale 'fr'

* Update fr.js

Added translation for Seal and Unseal.
These names come from ACT and not the game, so they're all in English.
The log doesn't get set up until after the plugin has started.
There's no event for this, so defer cactbot initialization until the
first slow timer.

This allows initialization error messages to not be dropped on the floor.
resource-bar, timer-bar, and timer-icon all currently only allow
flat text.  Allow html entities in these text strings as well.
This closes issue #8.

This also is intended to be used as the way for issue #57 to
replace timeline names in English with French.
This is intended to help solve issue #57.
Triggers can now have localized regexes.  For a given local (e.g. ko)
if there's a regexKo entry on the trigger, that will take precedence
over regex on its own.

Additionally, any trigger field that can be treated as a function
can now also return localized responses as an object, e.g.
instead of:

   return 'Get Out';

...triggers can instead do something like:

   return {en: 'Get Out', fr: 'something french here, etc'};

This change also avoids running Regexes.Parse on every single log line
for every single trigger.  @_@;;

This will help issue #57.
This fixes a typo from 4dd1cc4, whoops.
This prevents Bootshine (35) from matching Hakaze (1D35).
Adding targetable/untargetable lines where appropriate
DrLippe and others added 29 commits March 16, 2018 20:34
Add de.js (german lang)
Uri unescaping, oops.  /o\

Fixes #90.
This is the way it used to work and allows folks working in git
repositories that aren't inside of the ACT folder to have their
user folder work as they'd expect.  If the html-relative doesn't
exist, it'll fall back to DLL-relative.

Fixes #88.
JEDF clients should now work with timeline sync and triggers. 
timeline translation for german client added
Multi-line conditionals need {}.
Two space indent everywhere.
Line up }; with the { indent level.
See comments in #57 for more details.
This should help with issue #57.
This uses the new data parameter from fcc101c to help issue #57.
Tracker regexes can have hyphens in them too.
The path to resize_handle.js

Fixes #102.
If you've seen a mob die, then that's more accurate than a tracker time.
Previously you could only do this on named sounds.
@CptDraco CptDraco merged commit cd5a3b9 into CptDraco:Master Apr 21, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants