Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
75 commits
Select commit Hold shift + click to select a range
eabff86
Merge pull request #1 from capajon/master
purechaose Dec 23, 2017
7113d92
Merge branch 'master' of https://github.com/capajon/r6maps
purechaose Jan 1, 2018
d96a42b
Merge branch 'master' of https://github.com/capajon/r6maps
purechaose Jul 6, 2018
52d958c
Fix #115, checking walls in game and editing by hand.
purechaose Jul 18, 2018
7e14d8f
Villa: add initial map images and data
joeyfoo Oct 1, 2018
0b28abf
add new bomb site of Consulate
appleparan Oct 5, 2018
caede8b
fix Korean translation error in Theme park
appleparan Oct 5, 2018
4a508c1
add missing drone hole in Theme park
appleparan Oct 5, 2018
1266497
Villa: Add camera locations and names
joeyfoo Oct 13, 2018
ef1c837
Villa: Add cameras' LOS
joeyfoo Oct 13, 2018
3a88c40
Start working on #90, only missing LOS floor (and window markings tha…
purechaose Dec 5, 2018
76e2110
Add all room names to default lang-terms
purechaose Dec 6, 2018
9c38015
Add ceiling hatches and code to add hatch scaling when specified
purechaose Dec 6, 2018
04102ac
Add skylight to villa
purechaose Dec 6, 2018
8457079
Add room labels to map, edit some label text
purechaose Dec 6, 2018
086e7d1
Add drone tunnels to villa
purechaose Dec 6, 2018
60f18a8
Add fortress map images, rescaled so hatches are the right size.
purechaose Dec 11, 2018
476f2f2
Add fortress rooms and data skeleton.
purechaose Dec 11, 2018
117eefb
Add bombs, hatches, cameras and spawnpoints to fortress.
purechaose Dec 12, 2018
10c8ee0
Change spawn ordering to match in game.
purechaose Dec 12, 2018
3d8ee9e
Add external, first floor drone tunnels
purechaose Dec 12, 2018
b97e14f
Fix some drone holes and hatches
purechaose Dec 12, 2018
988aa0f
Add all objective and drone tunnels
purechaose Dec 12, 2018
1845af1
Add room labels and skylights
purechaose Dec 12, 2018
469b3cf
Add fortress cameras LOS
purechaose Dec 13, 2018
cb36d8e
Actually fix #115
purechaose Dec 15, 2018
6b74cdd
Fix #115, fix #116, start work on #90, close #122
purechaose Dec 15, 2018
bbec2d2
Merge pr #124 into newest
purechaose Dec 15, 2018
8300978
Merge pr #125 into newest
purechaose Dec 15, 2018
4bcb106
Merge pr #126 into newest
purechaose Dec 15, 2018
66f57da
Merge commit 'refs/pull/128/head' of https://github.com/capajon/r6map…
purechaose Dec 17, 2018
09ccefd
Merge villa updates as WIP for pr #128
purechaose Dec 17, 2018
5fba239
Add new hereford (close #133)
purechaose Jan 16, 2019
bb15e47
Merge fortress in with correct border-1 image
purechaose Jan 16, 2019
cd644db
Merge hereford update into newest, close #133
purechaose Jan 16, 2019
e5779b4
Getting some data in while we wait for map images
purechaose Feb 19, 2019
07230a9
Update map thumbnails up to Wind Bastion
purechaose Feb 19, 2019
211fbc8
Add labels and some cameras and objectives
purechaose Mar 23, 2019
ee282c0
Add everything but camera LOS, hostage and secure
purechaose Mar 23, 2019
0170e46
Merge branch 'newest' into update/outback/0
purechaose Mar 23, 2019
5380cfb
Add thumbnail for outback
purechaose Mar 23, 2019
e34d551
Add truck to level 2 of garage and fix railings
purechaose Mar 24, 2019
11eb438
Fix some mislabeled doors on level 1
purechaose Mar 24, 2019
783d9e3
Fix misc issues and add camera LOS and objs
purechaose Mar 24, 2019
0f511ab
Add toggle button to toggle labels
caseymh May 17, 2019
ffacd85
Added support for languages.
caseymh May 20, 2019
4cf850b
Make shortcut language specific
caseymh May 20, 2019
8cbef2f
Fix linting errors
purechaose Jun 18, 2019
6c6b379
Fix lang test files and fix lang files having old hereford keys.
purechaose Jun 18, 2019
154a8fc
Add new Kafe. Still need camera POVs
purechaose Jun 19, 2019
6111c05
Remove lang terms for deleted room names
purechaose Jun 19, 2019
ea25de2
Merge pull request #4 from purechaose/newest
purechaose Jul 6, 2019
71ee3d4
Adding code documentation
purechaose Aug 31, 2019
1cad109
[feat] add simplified Chinese translation for Fortress
fy-meng Sep 1, 2019
a8122e9
[feat] add simplified Chinese translation for Hereford rework
fy-meng Sep 1, 2019
1b26426
[feat] add simplified Chinese translation for Kafe rework
fy-meng Sep 1, 2019
1c2e2f8
[feat] add simplified Chinese translation for Outback
fy-meng Sep 1, 2019
7cfa01c
Add support for index -1 for floor
purechaose Sep 1, 2019
1e99278
First pass on new Kanal. Still needs drone holes
purechaose Sep 1, 2019
d152a77
[feat] add simplified Chinese translation for Villa
fy-meng Sep 1, 2019
c4f498b
Added drone holes to Kanal
purechaose Sep 1, 2019
d76ba7a
Merge commit 'refs/pull/5/head' of https://github.com/purechaose/r6maps
purechaose Sep 1, 2019
9a5e6c6
Fix some errors, close #143, close #144, correct and close #4
purechaose Sep 1, 2019
0b99a75
Remove unused keys from localization files
purechaose Sep 1, 2019
6581b72
Merge branch 'update/kanal/0' of https://github.com/purechaose/r6maps
purechaose Sep 1, 2019
cba617c
Remove donation links - capajon is MIA
purechaose Sep 1, 2019
aed6385
Auto-deploy to gh-pages for the new season.
purechaose Nov 10, 2019
6fb9318
Correct sass installation.
purechaose Nov 10, 2019
3fa54dc
Set the token as the right variable
purechaose Nov 10, 2019
df02f86
Corrected deploy dir
purechaose Nov 10, 2019
864fded
Maybe this won't delete the build?
purechaose Nov 10, 2019
69eacd2
Initial data input for new themepark
purechaose Nov 21, 2019
eb80748
Update themepark to Y4S4
purechaose Nov 22, 2019
20d2a3e
Quick patch to fix a drone hole
purechaose Nov 22, 2019
6b1e6d8
Fix themepark translation extra keys
purechaose Mar 16, 2020
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
29 changes: 19 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
language: node_js
node_js:
- 4.3.1
sudo: false
script:
- npm run test
env:
global:
branches:
except:
#Stops ci from running on tag commits and branches
- "/^v?[0-9]+\\.[0-9]+\\.[0-9]+.*$/"
- "10"

cache: npm

jobs:
include:
- stage: test
script: npm run test
- stage: deploy
if: branch = master
before_script: gem install sass
script: npm run build
deploy:
provider: pages
local_dir: site
github_token: $GITHUB_TOKEN
skip_cleanup: true
on:
branch: master
131 changes: 12 additions & 119 deletions dev/js/lang-terms/lang-terms.de.js
Original file line number Diff line number Diff line change
Expand Up @@ -482,50 +482,16 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
marketRooftops: 'Markt-Dächer'
},
hereford: {
spawnTrainingCourse: 'Ausbildungsparcours',
spawnParking: 'Parkplatz',
spawnShootingRange: 'SchieBplatz',
armory: 'Waffenlager',
lockers: 'Spinde',
corridor: 'Korridor',
shootingRange: 'SchieBplatz',
mainStairs: 'Haupt-<br/>treppe',
maintenanceArea: 'Wartungs-<br/>bereich',
briefingRoom: 'Briefing-<br/>Raum',
basementEntrance: 'Keller-<br/>eingang',
garage: 'Garage',
TVRoom: 'Fernsehraum',
garageCorridor: 'Garagenkorridor',
kitchen: 'Küche',
corridor1: 'Korridor<br/>1',
diningRoom: 'Ess-<Br/>zimmer',
pianoLounge: 'Klavier-Lounge',
office: 'Büro',
masterBedroom: 'Haupt-<br/>schlafzimmer',
backAccess: 'Hinterein-<br/>gang',
laundryRoom: 'Wasch-<br/>küche',
bathroom: 'Toilette',
kidsBedroom: 'Kinder-<br/>schlafzimmer',
ballisticMatDepot: 'Ballistikmatten-<br/>Depot',
storage: 'Lager',
storageCorridor: 'Lager-<br/>korridor',
dummyDepot: 'Attrappendepot',
workshop: 'Arbeitsraum',
shootingRangeEastEntrance: 'SchieBplatz<br/>Osteingang',
shootingRangeWestEntrance: 'SchieBplatz<br/>Westeingang',
tireSetting: 'Reifenstapel',
observationRamp: 'Beobachtungs-plattform',
barracks: 'Kaserne',
busBackAlley: 'Bus-<br/>Hintergasse',
rappelTower: 'Abseilturm',
terrace: 'Terrasse',
frontAccess: 'Vordereingang',
chapelGate: 'Kapellentor',
forkliftArea: 'Gabelstapler-<br/>Bereich',
sideStairsAlley: 'Seitentreppen-<br/>gasse',
sideStairs: 'Seiten-<br/>treppen',
garageTop: 'Garagendach',
rooftop: 'Dach',
parkingEntrance: 'Parkplatz-einfahrt'
rooftop: 'Dach'
},
house: {
spawnConstructionSite: 'Baustelle',
Expand Down Expand Up @@ -568,27 +534,15 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
rooftop: 'Dach'
},
kafe: {
spawnRiverDocks: 'Fluss-Docks',
spawnChristmasMarket: 'Weihnachtsmarkt',
spawnPark: 'Parkgasse',
riverDocks: 'Fluss-Docks',
christmasMarket: 'Weihnachtsmarkt',
park: 'Parkgasse',
laundryRoom: 'Waschküche',
frontStairs: 'Vordere<br/>Treppe',
bakery: 'Bäckerei',
bakeryKitchen: 'Bäckerei<br/>Küche',
kitchenPrep: 'Küche<br/>vorbereitung',
kitchenGrill: 'Küchengrill',
kitchenPickUp: 'Küchen-<br/>ausgabe',
coldRoom: 'Kühl-<br/>raum',
diningRoom: 'Esszimmer',
backStairs: 'Hintere<br/>Treppe',
coldRoomCorridor: 'Kühl-<br/>raum-<br/>korridor',
VIPSection: 'VIP-<br/>Bereich',
barStairs: 'Bar-<br/>Treppe',
storage: 'Lager',
museumEntrance: 'Museums-<br/>eingang',
miningRoom: 'Bergbauraum',
trainMuseum: 'Bahnmuseum',
pillarDiningRoom: 'Säulen-Speisezimmer',
mainCorridor: 'Haupt-<br/>korridor',
readingRoomCorridor: 'Lesezimmer-korridor',
readingRoom: 'Lesezimmer',
Expand All @@ -598,7 +552,6 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
bar: 'Bar',
barBackstore: 'Bar-<br/>Lager',
washrooms: 'Toilette',
washroomCorridor: 'Korridor Toilette',
cocktailLounge: 'Cocktail-<br/>Lounge',
cocktailLoungeEntrance: 'Cocktail-<br/>Lounge-<br/>Eingang',
westMainStreet: 'Westliche Hauptstraße',
Expand All @@ -609,66 +562,35 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
cafeRoofTop: 'Café-Dach',
terrace: 'Terrasse',
backAlley: 'Seitengasse',
garrage: 'Garage',
parkAlley: 'Parkgasse'
garage: 'Garage'
},
kanal: {
spawnFloatingDock: 'Schwimm-Dock',
spawnSailboats: 'Segelboote',
spawnConstructionSite: 'Baustelle',
boatGarage: 'Bootsgarage',
boatSupplies: 'Bootsvorräte',
floatingDock: 'Schwimm-Dock',
sailboats: 'Segelboote',
constructionSite: 'Baustelle',
pipes: 'Undichte Rohre',
boatSuppliesHallway: 'Boots-<br/>borräte-<br/>Gang',
lockerRoom: 'Umkleideraum',
coastGuardStairs: 'Küstenwache-<br/>Treppe',
showers: 'Duschen',
loadingDock: 'Laderampe',
machineHallway: 'Maschinen-<br/>Gang',
controlCenterStairs: 'Kontroll-<br/>zentrum-<br/>Treppe',
holdingRoom: 'Güterraum',
holdingRoomHallway: 'Güterraum-<br/>Gang',
radio: 'Funk',
coastGuardOffice: 'Küstenwache<br/>Büro',
archives: 'Archiv',
coastGuardHall: 'Küsten-<br/>wache<br/>Gang',
mainEntrance: 'Haupt-<br/>eingang',
lounge: 'Lounge',
bridge: 'Brücke',
modelRoom: 'Modellraum',
securityRoom: 'Sicherheits-<br/>raum',
projectorRoom: 'Projektorraum',
mapsOffice: 'Kartenbüro',
mapsOfficeHallway: 'Kartenbüro-<br/>Gang',
kitchen: 'Küche',
cafeteria: 'Cafeteria',
plantsHallway: 'Pflanzengang',
thirdFloorExit: 'Ausgang<br/>zweiter<br/>Stock',
controlRoom: 'Kontrollraum',
electricRoom: 'Elektrik',
controlRoomHallway: 'Kontrollraum-Gang',
serverRoom: 'Server-<br/>Raum',
lockgate: 'Schleusentor',
lockGate: 'Schleusentor',
quayContainers: 'Kai-Container',
lockgateTunnel: 'Schleusentor-<br/>Tunnel',
waterWalkway: 'Steg',
quayConstruction: 'Kai-<br/>Baustelle',
constructionSite: 'Baustelle',
lockGateTunnel: 'Schleusentor-<br/>Tunnel',
constructionEntrance: 'Baustellen-<br/>eingang',
parkingAlley: 'Parkplatzgasse',
parkingEntrance: 'Parkplatz-<br/>einfahrt',
middleRoad: 'Mittlere<br/>Straße',
forkliftAlley: 'Gabelstapler-<br/>Gasse',
frontLawn: 'Vorgarten',
basementStairs: 'Kellertreppe',
coastGuardRoof: 'Küstenwache-<br/>Dache',
roofBrickPile: 'Ziegelhaufen<br/>Dach',
balcony: 'Balkon',
controlCenterRoof: 'Kontrollzentrum-<br/>Dach',
dockStairs: 'Dock-Treppe',
parking: 'Parkplatz',
boatCrane: 'Bootskran',
mapArchives: 'Karten-<br/>archiv'
parking: 'Parkplatz'
},
oregon: {
spawnJunkyard: 'Schrottplatz',
Expand Down Expand Up @@ -815,56 +737,27 @@ var R6MLangTermsGerman = (function(R6MLangTerms, undefined) {
coveredWalkway: 'Überdachter<br/>Weg'
},
themepark: {
arcadeRoof: 'Spielhallendach',
arcadeEntrance: 'Spielhallen<br/>eingang',
arcadeStairs: 'Spielhallentreppe',
arcadeToilet: 'Spielhallen-<br/>WC',
barrelRoom: 'Fasslager',
backAlley: 'Seitengasse',
bumperCars: 'Autoscooter',
bunk: 'Schlafbereich',
bunkToilet: 'Schlafbereich-WC',
cafe: 'Café',
cafeCorridor: 'Café-Korridor',
cafeStairs: 'Café-<br/>Treppe',
cafeTerrace: 'Café-<br/>Terrasse',
cashStash: 'Bargeldlager',
coffinRoom: 'Sargraum',
controlRoom: 'Kontroll<br/>raum',
crypt: 'Gruft',
dayCare: 'Kindertagesstätte',
drugLab: 'Drogen<br/>labor',
drugStorage: 'Drogen<br/>lager',
executionRoom: 'Exekutionsraum',
fuelStorage: 'Treibstofflager',
gallery: 'Galerie',
gargoyle: 'Gargoyle',
gargoyleStorage: 'Gargoyle-<br/>Lager',
guestInfo: 'Gästeinformation',
hauntedBalcony: 'Spukbalkon',
hauntedDining: 'Spuk<br/>restaurant',
hauntedEntrance: 'Spukeingang',
hauntedRoof: 'Spukdach',
hauntedShop: 'Spukladen',
hauntedStairs: 'Spuktreppe',
initiationRoom: 'Initiations<br/>raum',
jointCorridor: 'Verbindrungs<br/>korridor',
liftCar: 'Lift<br/>kabine',
loadingDeck: 'Ladebucht',
lockerRoom: 'Umlkeide<br/>raum',
mainEntrance: 'Haupteingang',
office: 'Büro',
officeToilet: 'Büro-WC',
palms: 'Palmen',
propStorage: 'Requisitenlager',
railOverlook: 'Über den<br/>Gleisen',
railCorridor: 'Gleiskorridor',
railPlatform: 'Bahnsteig',
railRamp: 'Gleisrampe',
roboCircuit: 'Robo-Arena',
serviceCorridor: 'Deinst<br/>korridor',
serviceEntry: 'Service-Eingang',
southExit: 'Südausgang',
sweetShop: 'Süßigkeitenladen',
teacups: 'Teetassen',
upperArcade: 'Obere<br/>Spielhalle',
Expand Down
Loading