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.

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

Jump to bottom

Merge the Regulations and Guidelines into official #530

Merged
merged 99 commits into from
Jan 1, 2018
Merged

Merge the Regulations and Guidelines into official #530

merged 99 commits into from
Jan 1, 2018

Conversation

Laura-O
Copy link
Member

@Laura-O Laura-O commented Jan 1, 2018

No description provided.

jfly and others added 30 commits November 9, 2016 14:03
@jfly
Tweaked language to allow for multiple official versions of our
326d237 
scrambling software(s).
@lgarron
Change Article Z preamble to avoid ambiguity. Fixes #412.
6573adf
@pedrosino
Update A1 to clarify attempt and solve
3e00707
@Laura-O
Add placement recomendation for MBLD #444
315144c
@Laura-O
A7g+: attempt -> solve
d223aa6
@Laura-O
3d3: switch order tiles and stickers
fbb6a8b
@Laura-O
Add 3k1 #294
7ccf46b
@Laura-O
8a4: clarify announcement deadlines
6b3716e
@lgarron
Merge pull request #476 from Laura-O/fix-415
6f08ab8 
8a4: clarify announcement deadlines #415
@lgarron
Merge pull request #475 from Laura-O/fix-372
27bab2e 
A7g+: attempt -> solve
@lgarron
Merge pull request #474 from Laura-O/fix-280
df22ae5 
3d3: switch order tiles and stickers
@AlbertoPdRF @Laura-O
Move A6f+ to the regulations (A6f1) #466 (#473)
1402a4b 
* Move A6f+ to the regulations (A6fa) #466
@Laura-O
A1a2++: events -> rounds
7473a1b
@Claster
Merge pull request #477 from Laura-O/fix-457
9532f0c 
A1a2++: events -> rounds #457
@AlbertoPdRF @Laura-O
Cleanup about cutoffs. (#467)
e1df7ee 
* Fixes #426 
* Fixes #429.
@AlbertoPdRF
Merge pull request #472 from Laura-O/fix-294
a93e8aa 
Add 3k1 #294
@AlbertoPdRF
Merge pull request #470 from Laura-O/fix-444
8ff4d88 
Add placement recomendation for MBLD #403 #444
@Laura-O
Define default round formats, closes #453
1d99d03
@Laura-O
Clarify headphone use
1f115c2
@Claster
Disallow time limit + cumulative time limit. Fix #374.
e8fead7
@Claster
DNF for remaining attempts after disqualification. Fix #392.
8cae8c0
@AlbertoPdRF @Laura-O
Fix #467 mistake. (#478)
ede6f75 
* Fix #467 mistake.

On #467 I made a mistake: instead of getting rid of ranking based cutoffs, I got rid of the possibility to advance to the next round by ranking of the preceding round.

* Addressing Jeremy's proposal on #467.
@Laura-O
Allow competitors to talk to delegates Fixes #297
650625c
@Laura-O
Add missing word in labels
a259ebd
@AlbertoPdRF
Merge pull request #487 from Laura-O/fix-368
33d17a7 
Add missing word in labels Fixes #368
@AlbertoPdRF
Merge branch 'Fixes-2017' into article-z-discretion
5508aef
@AlbertoPdRF
Merge pull request #398 from jfly/multiple-official-versions-of-tnoodle
4cc88eb 
Tweaked language to allow for multiple official versions of the scrambling software.
@AlbertoPdRF
Merge pull request #413 from thewca/article-z-discretion
fcc3d85 
Change Article Z preamble to avoid ambiguity. Fixes #412.
@AlbertoPdRF
Update wca-regulations.md
6841411
@Laura-O
The delegate -> a delegate
df793f6
viroulep and others added 28 commits November 21, 2017 21:57
@viroulep
Merge pull request #479 from Laura-O/fix-453
375fce2 
Update 9b
@Laura-O
Remove E3b+
8179fb8
@Laura-O
Clarify 'the delegate', fixes #499
0f91da5
@viroulep
Merge pull request #501 from Laura-O/fix-469
f09903c 
Add restrictions to Z4, #469
@Claster
Merge pull request #513 from Laura-O/clarify-delegate
c7f70d4 
Clarify 'the delegate', fixes #499
@AlbertoPdRF
Merge pull request #514 from Laura-O/fix-e3b
f8fa6c8 
Remove E3b+
@Laura-O
Clarify similar Clock pieces, fixes #409
a9eedb0
@Laura-O
Clarify C1b Fixes #464
925d6a4
@Laura-O
3l: forbid logos for bld events
3b8e723
@Laura-O
Refactor 3k
72afb6a
@Claster
Merge pull request #512 from Laura-O/clock-pieces
a76e4b9 
Clarify similar Clock pieces, fixes #409
@Laura-O
D1b + A3c3+ manipulate -> operate
fa36cd1
@Laura-O
Add guideline 3l++
46bf1b2
@viroulep
Merge pull request #515 from Laura-O/feet-manipualte
0900daa 
D1b manipulate -> operate
@Claster
Merge pull request #516 from Laura-O/3k1+bld
621ae07 
Forbid logos in blindfolded events and clarify 3k
@viroulep
Add the Translation disclaimer
fd6e2f8
@viroulep
Clarify moves definition for square one.
110451a
@lgarron
Merge pull request #517 from viroulep/fix-362
ad93ffc 
Add the Translation disclaimer
@Claster
Merge pull request #511 from Laura-O/c1b
4d89467 
Clarify C1b Fixes #464
@Claster
Merge pull request #518 from viroulep/fix-364
ab62593 
Clarify moves definition for square one.
@Laura-O
A1a2++++: cannot -> must not
709dbcc
@Laura-O
A7c2: make 2nd sentence consistent
3a6f563
@AlbertoPdRF
Merge pull request #522 from Laura-O/acannot
68cc4f4 
A1a2++++: cannot -> must not
@AlbertoPdRF
Merge pull request #523 from Laura-O/andsign
90d6e1b 
A7c2: make 2nd sentence consistent
@Laura-O
Improve A7c*
3c3e952
@viroulep
Merge pull request #524 from Laura-O/a7c-improvement
7608f96 
Improve A7c*
@Laura-O
Fix 9p2+ (#527)
bf0555c
@Laura-O
Remove restrictions from 8a8 (#528)
c1d781d
@Laura-O Laura-O merged commit f32f992 into official Jan 1, 2018
@lgarron lgarron deleted the Fixes-2017 branch March 10, 2018 02:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@Laura-O @pedrosino @jfly @lgarron @AlbertoPdRF @Claster @viroulep