Code

Update r6maps to newest version#134

Code

Open

purechaose wants to merge 80 commits intocapajon:mastercapajon/r6maps:masterfrom purechaose:newestpurechaose/r6maps:newestCopy head branch name to clipboard

+6,859-1,785

Commits

Commits on Dec 23, 2017

• Merge pull request #1 from capajon/master

  Show description for eabff86
  purechaose

  authored
  eabff86

  Copy full SHA for eabff86

Commits on Jan 1, 2018

• Merge branch 'master' of https://github.com/capajon/r6maps

  purechaose

  committed
  7113d92

  Copy full SHA for 7113d92

Commits on Jul 6, 2018

• Merge branch 'master' of https://github.com/capajon/r6maps

  purechaose

  committed
  d96a42b

  Copy full SHA for d96a42b

Commits on Jul 18, 2018

• Fix capajon#115, checking walls in game and editing by hand.

  purechaose

  committed
  52d958c

  Copy full SHA for 52d958c

Commits on Oct 1, 2018

• Villa: add initial map images and data

  joeyfoo

  committed
  7e14d8f

  Copy full SHA for 7e14d8f

Commits on Oct 5, 2018

• add new bomb site of Consulate

  appleparan

  committed
  0b28abf

  Copy full SHA for 0b28abf

• fix Korean translation error in Theme park

  appleparan

  committed
  caede8b

  Copy full SHA for caede8b

• add missing drone hole in Theme park

  appleparan

  committed
  4a508c1

  Copy full SHA for 4a508c1

Commits on Oct 13, 2018

• Villa: Add camera locations and names

  joeyfoo

  committed
  1266497

  Copy full SHA for 1266497

• Villa: Add cameras' LOS

  joeyfoo

  committed
  ef1c837

  Copy full SHA for ef1c837

Commits on Dec 5, 2018

• Start working on capajon#90, only missing LOS floor (and window markings that may never happen)

  purechaose

  committed
  3a88c40

  Copy full SHA for 3a88c40

Commits on Dec 6, 2018

• Add all room names to default lang-terms

  purechaose

  committed
  76e2110

  Copy full SHA for 76e2110

• Add ceiling hatches and code to add hatch scaling when specified

  purechaose

  committed
  9c38015

  Copy full SHA for 9c38015

• Add skylight to villa

  purechaose

  committed
  04102ac

  Copy full SHA for 04102ac

• Add room labels to map, edit some label text

  purechaose

  committed
  8457079

  Copy full SHA for 8457079

• Add drone tunnels to villa

  purechaose

  committed
  086e7d1

  Copy full SHA for 086e7d1

Commits on Dec 11, 2018

• Add fortress map images, rescaled so hatches are the right size.

  Show description for 60f18a8
  purechaose

  committed
  60f18a8

  Copy full SHA for 60f18a8

• Add fortress rooms and data skeleton.

  purechaose

  committed
  476f2f2

  Copy full SHA for 476f2f2

Commits on Dec 12, 2018

• Add bombs, hatches, cameras and spawnpoints to fortress.

  purechaose

  committed
  117eefb

  Copy full SHA for 117eefb

• Change spawn ordering to match in game.

  purechaose

  committed
  10c8ee0

  Copy full SHA for 10c8ee0

• Add external, first floor drone tunnels

  purechaose

  committed
  3d8ee9e

  Copy full SHA for 3d8ee9e

• Fix some drone holes and hatches

  purechaose

  committed
  b97e14f

  Copy full SHA for b97e14f

• Add all objective and drone tunnels

  purechaose

  committed
  988aa0f

  Copy full SHA for 988aa0f

• Add room labels and skylights

  purechaose

  committed
  1845af1

  Copy full SHA for 1845af1

Commits on Dec 13, 2018

• Add fortress cameras LOS

  purechaose

  committed
  469b3cf

  Copy full SHA for 469b3cf

Commits on Dec 15, 2018

• Actually fix capajon#115

  purechaose

  committed
  cb36d8e

  Copy full SHA for cb36d8e

• Fix capajon#115, fix capajon#116, start work on capajon#90, close capajon#122

  purechaose

  committed
  6b74cdd

  Copy full SHA for 6b74cdd

• Merge pr capajon#124 into newest

  purechaose

  committed
  bbec2d2

  Copy full SHA for bbec2d2

• Merge pr capajon#125 into newest

  purechaose

  committed
  8300978

  Copy full SHA for 8300978

• Merge pr capajon#126 into newest

  purechaose

  committed
  4bcb106

  Copy full SHA for 4bcb106

Commits on Dec 17, 2018

• Merge commit 'refs/pull/128/head' of https://github.com/capajon/r6maps into newest

  purechaose

  committed
  66f57da

  Copy full SHA for 66f57da

• Merge villa updates as WIP for pr capajon#128

  purechaose

  committed
  09ccefd

  Copy full SHA for 09ccefd

Commits on Jan 16, 2019

• Add new hereford (close capajon#133)

  purechaose

  committed
  5fba239

  Copy full SHA for 5fba239

• Merge fortress in with correct border-1 image

  purechaose

  committed
  bb15e47

  Copy full SHA for bb15e47

• Merge hereford update into newest, close capajon#133

  purechaose

  committed
  cd644db

  Copy full SHA for cd644db

Commits on Feb 19, 2019

• Getting some data in while we wait for map images

  purechaose

  committed
  e5779b4

  Copy full SHA for e5779b4

• Update map thumbnails up to Wind Bastion

  purechaose

  committed
  07230a9

  Copy full SHA for 07230a9

Commits on Mar 23, 2019

• Add labels and some cameras and objectives

  purechaose

  committed
  211fbc8

  Copy full SHA for 211fbc8

• Add everything but camera LOS, hostage and secure

  purechaose

  committed
  ee282c0

  Copy full SHA for ee282c0

• Merge branch 'newest' into update/outback/0

  purechaose

  committed
  0170e46

  Copy full SHA for 0170e46

• Add thumbnail for outback

  purechaose

  committed
  5380cfb

  Copy full SHA for 5380cfb

Commits on Mar 24, 2019

• Add truck to level 2 of garage and fix railings

  purechaose

  committed
  e34d551

  Copy full SHA for e34d551

• Fix some mislabeled doors on level 1

  purechaose

  committed
  11eb438

  Copy full SHA for 11eb438

• Fix misc issues and add camera LOS and objs

  purechaose

  committed
  783d9e3

  Copy full SHA for 783d9e3

Commits on May 17, 2019

• Add toggle button to toggle labels

  caseymh

  committed
  0f511ab

  Copy full SHA for 0f511ab

Commits on May 20, 2019

• Added support for languages.

  Show description for ffacd85
  caseymh

  committed
  ffacd85

  Copy full SHA for ffacd85

• Make shortcut language specific

  caseymh

  committed
  4cf850b

  Copy full SHA for 4cf850b

Commits on Jun 18, 2019

• Fix linting errors

  purechaose

  committed
  8cbef2f

  Copy full SHA for 8cbef2f

• Fix lang test files and fix lang files having old hereford keys.

  purechaose

  committed
  6c6b379

  Copy full SHA for 6c6b379

Commits on Jun 19, 2019

• Add new Kafe. Still need camera POVs

  purechaose

  committed
  154a8fc

  Copy full SHA for 154a8fc

• Remove lang terms for deleted room names

  purechaose

  committed
  6111c05

  Copy full SHA for 6111c05

Commits on Jul 6, 2019

• Merge pull request #4 from purechaose/newest

  Show description for ea25de2
  purechaose

  authored
  ea25de2

  Copy full SHA for ea25de2

Commits on Aug 31, 2019

• Adding code documentation

  purechaose

  committed
  71ee3d4

  Copy full SHA for 71ee3d4

Commits on Sep 1, 2019

• [feat] add simplified Chinese translation for Fortress

  fy-meng

  committed
  1cad109

  Copy full SHA for 1cad109

• [feat] add simplified Chinese translation for Hereford rework

  fy-meng

  committed
  a8122e9

  Copy full SHA for a8122e9

• [feat] add simplified Chinese translation for Kafe rework

  fy-meng

  committed
  1b26426

  Copy full SHA for 1b26426

• [feat] add simplified Chinese translation for Outback

  fy-meng

  committed
  1c2e2f8

  Copy full SHA for 1c2e2f8

• Add support for index -1 for floor

  purechaose

  committed
  7cfa01c

  Copy full SHA for 7cfa01c

• First pass on new Kanal. Still needs drone holes

  purechaose

  committed
  1e99278

  Copy full SHA for 1e99278

• [feat] add simplified Chinese translation for Villa

  fy-meng

  committed
  d152a77

  Copy full SHA for d152a77

• Added drone holes to Kanal

  purechaose

  committed
  c4f498b

  Copy full SHA for c4f498b

• Merge commit 'refs/pull/5/head' of https://github.com/purechaose/r6maps

  purechaose

  committed
  d76ba7a

  Copy full SHA for d76ba7a

• Fix some errors, close capajon#143, close capajon#144, correct and close #4

  purechaose

  committed
  9a5e6c6

  Copy full SHA for 9a5e6c6

• Remove unused keys from localization files

  purechaose

  committed
  0b99a75

  Copy full SHA for 0b99a75

• Merge branch 'update/kanal/0' of https://github.com/purechaose/r6maps

  purechaose

  committed
  6581b72

  Copy full SHA for 6581b72

• Remove donation links - capajon is MIA

  purechaose

  committed
  cba617c

  Copy full SHA for cba617c

• [fix] fix simplified Chinese and Korean sans-serif fallback problem

  fy-meng

  committed
  37e5728

  Copy full SHA for 37e5728

Commits on Nov 10, 2019

• Auto-deploy to gh-pages for the new season.

  purechaose

  committed
  aed6385

  Copy full SHA for aed6385

• Correct sass installation.

  purechaose

  committed
  6fb9318

  Copy full SHA for 6fb9318

• Set the token as the right variable

  purechaose

  committed
  3fa54dc

  Copy full SHA for 3fa54dc

• Corrected deploy dir

  purechaose

  committed
  df02f86

  Copy full SHA for df02f86

• Maybe this won't delete the build?

  purechaose

  committed
  864fded

  Copy full SHA for 864fded

Commits on Nov 11, 2019

• Merge pull request #6 from fy-meng/master

  Show description for 8dc56ce
  purechaose

  authored
  8dc56ce

  Copy full SHA for 8dc56ce

Commits on Nov 21, 2019

• Removed ruby dependency by using node-sass instead of the ruby gem.

  mcferrill

  committed
  0fa700d

  Copy full SHA for 0fa700d

• Initial data input for new themepark

  purechaose

  committed
  69eacd2

  Copy full SHA for 69eacd2

Commits on Nov 22, 2019

• Update themepark to Y4S4

  purechaose

  committed
  eb80748

  Copy full SHA for eb80748

• Close #7

  purechaose

  committed
  131d286

  Copy full SHA for 131d286

• Merge branch 'update/themepark/0' of https://github.com/purechaose/r6maps

  purechaose

  committed
  bc51f53

  Copy full SHA for bc51f53

• Quick patch to fix a drone hole

  purechaose

  committed
  20d2a3e

  Copy full SHA for 20d2a3e

• Merge branch 'update/themepark/0' of https://github.com/purechaose/r6maps

  purechaose

  committed
  cc67ac5

  Copy full SHA for cc67ac5