Commits · f79c1189228140607be8cbeb8e92f517fe83242b · wyykak / ygopro

12 Sep, 2021 3 commits
- Merge branch 'server' into full-view · f79c1189
  nanahira authored Sep 12, 2021
  
  f79c1189
- Merge branch 'master' into server · d3bea35f
  nanahira authored Sep 12, 2021
  
  d3bea35f
- ref · 0ca05198
  nanahira authored Sep 12, 2021
  
  0ca05198
10 Sep, 2021 2 commits
- Merge branch 'param-deck-category' of /home/nanahira/ygo/versions/ygopro-yuzu · f8ad44e6
  nanahira authored Sep 10, 2021
  
  f8ad44e6
- add --deck-category · 324a1b5c
  Yuzurisa authored Sep 10, 2021
  
  324a1b5c
08 Sep, 2021 2 commits
- check the filename generated from the playername (#2372) · 7c71bf63
  mercury233 authored Sep 08, 2021
  
  7c71bf63
- update default font path (#2373) · 732662cc
  mercury233 authored Sep 08, 2021
  
  732662cc
06 Sep, 2021 22 commits
- Merge branch 'master' into full-view · cec8a12c
  nanahira authored Sep 06, 2021
  
  cec8a12c
- Merge branch 'master' into server · a3d4c6c1
  nanahira authored Sep 06, 2021
  
  a3d4c6c1
- fix · 55ed1e12
  nanahira authored Sep 06, 2021
  
  55ed1e12
- Merge branch 'server' into full-view · 0f792570
  nanahira authored Sep 06, 2021
  
  0f792570
- Merge branch 'master' into server · f7050ecd
  nanahira authored Sep 06, 2021
  
  f7050ecd
- always allow custom cards · f25417da
  nanahira authored Sep 06, 2021
  
  f25417da
- Merge branch 'server' into full-view · 0a7b54c8
  nanahira authored Sep 06, 2021
  
  0a7b54c8
- fix test card · 8537eec0
  nanahira authored Sep 06, 2021
  
  8537eec0
- Merge branch 'server' into full-view · 1bd7bd3e
  nanahira authored Sep 06, 2021
  
  1bd7bd3e
- Merge branch 'master' into server · c45c7020
  nanahira authored Sep 06, 2021
  
  c45c7020
- version · 39a001fc
  nanahira authored Sep 06, 2021
  
  39a001fc
- Merge branch 'server' into full-view · f854dcc2
  nanahira authored Sep 06, 2021
  
  f854dcc2
- Merge branch 'server' of github.com:moecube/ygopro into server · 025a453a
  nanahira authored Sep 06, 2021
  
  025a453a
- Merge branch 'master' into server · 7064fc4b
  nanahira authored Sep 06, 2021
  
  7064fc4b
- Merge branch 'server-merge-1353' of ../versions/ygopro-dynamic into server · c9b0fe6f
  nanahira authored Sep 06, 2021
  
  c9b0fe6f
- allow custom cards in everywhere · 600b4728
  nanahira authored Sep 06, 2021
  
  600b4728
- Merge branch 'master' of github.com:Fluorohydride/ygopro · 1aefe75c
  nanahira authored Sep 06, 2021
  
  1aefe75c
- Revert "add CCG support" · e1051204
  mercury233 authored Sep 02, 2021
```
This reverts commit db332d1b.
```
  e1051204
- ref · f06849b3
  nanahira authored Sep 06, 2021
  
  f06849b3
- db · f8c27e68
  nanahira authored Sep 06, 2021
  
  f8c27e68
- Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server · 98b56b0c
  mercury233 authored Sep 06, 2021
  
  98b56b0c
- version · caad336e
  mercury233 authored Sep 06, 2021
  
  caad336e
05 Sep, 2021 2 commits
- fix deck export filename · 301569f7
  mercury233 authored Sep 05, 2021
  
  301569f7
- remove rand(), random_shuffle() · 14bd1f7f
  salix5 authored Sep 05, 2021
  
  14bd1f7f
04 Sep, 2021 2 commits
- fix string · b62918d8
  mercury233 authored Sep 04, 2021
  
  b62918d8
- fix ot mark · a0ca3ca8
  mercury233 authored Sep 04, 2021
  
  a0ca3ca8
02 Sep, 2021 7 commits
- Merge branch 'master' of https://github.com/Fluorohydride/ygopro into server · ba5af7f5
  mercury233 authored Sep 02, 2021
  
  ba5af7f5
- Merge branch 'server' of git.mycard.moe:mycard/ygopro into server · bd61f452
  mercury233 authored Sep 02, 2021
  
  bd61f452
- Merge branch 'server-merge-1353' into 'server' · c80aa6c6
  mercury233 authored Sep 02, 2021
```
A merge for 1353

See merge request mycard/ygopro!9
```
  c80aa6c6
- Revert "add CCG support" · 51983cf5
  mercury233 authored Sep 02, 2021
```
This reverts commit db332d1b.
```
  51983cf5
- Revert "fix" · 773a37c2
  mercury233 authored Sep 02, 2021
```
This reverts commit c2c9379d.
```
  773a37c2
- Revert "allow ccg in ocg" · a9b6919d
  mercury233 authored Sep 02, 2021
```
This reverts commit a94f9b84.
```
  a9b6919d
- Revert "rework logic" · 59c699c6
  mercury233 authored Sep 02, 2021
```
This reverts commit efbaa3ef.
```
  59c699c6