Skip to content

Tick Repeat/Delay updates #156

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

Merged
merged 22 commits into from
Dec 4, 2016
Merged

Tick Repeat/Delay updates #156

Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c87e739
Fixes for issue #142.
satoon101 Sep 16, 2016
bdc5cad
Updated doc-strings in listeners.tick.
satoon101 Sep 18, 2016
f406100
Fix for issue #145.
satoon101 Sep 18, 2016
1af9e70
Merge branch 'master' into tick_update
satoon101 Sep 23, 2016
e624cfd
Fix for issue #145.
satoon101 Sep 23, 2016
bf006a1
Fix for issue #145.
satoon101 Sep 23, 2016
a0befb3
Fix for issue #145.
satoon101 Sep 23, 2016
0780cd7
Fixed possible unexpected behaviour when canceling delays at the end …
Ayuto Sep 26, 2016
170d32d
Merged branch 'master' into tick_update
satoon101 Oct 8, 2016
9fffd19
Merge branch 'master' into tick_update
satoon101 Oct 22, 2016
f205f76
Fix for issue #145.
satoon101 Oct 22, 2016
e3d7959
Fix for issue #145.
satoon101 Oct 22, 2016
9d2ab71
Fix for issue #145.
satoon101 Oct 22, 2016
602f0d5
Fixed possible error when using <function> named _execute for a Delay…
satoon101 Oct 22, 2016
7ae2cc1
Merge branch 'master' into tick_update
Oct 23, 2016
8c66dc2
Updated Entity.delay for upcoming changes.
Oct 23, 2016
a782779
Merge branch 'master' into tick_update
Oct 26, 2016
a069e35
Merge remote-tracking branch 'refs/remotes/origin/master' into tick_u…
Ayuto Nov 16, 2016
86e2a1a
Updated documentation
Ayuto Nov 16, 2016
9dd2cf8
Infinity update
Ayuto Nov 16, 2016
b6440ef
Fixed total_time_remaining raising an error when the repeat stopped
Ayuto Nov 16, 2016
da6492d
Added getters for interval, adjusted_loops and original_loops
Ayuto Dec 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into tick_update 
# Conflicts:
#	addons/source-python/packages/source-python/entities/entity.py
  • Loading branch information
L'In20Cible committed Oct 26, 2016
commit a78277917e2abb74171e9c5b07ef96cf05d45119
2 changes: 1 addition & 1 deletion addons/source-python/packages/source-python/entities/entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def _callback(*args, **kwargs):
callback(*args, **kwargs)

# Get the delay instance...
delay = Delay(delay, callback, args, kwargs, cancel_on_level_end)
delay = Delay(delay, _callback, args, kwargs, cancel_on_level_end)

# Add the delay to the dictionary...
_entity_delays[self.index].add(delay)
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.