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

Add new Themepark #147

Open
wants to merge 75 commits into
base: master
Choose a base branch
from
Open

Add new Themepark #147

wants to merge 75 commits into from

Conversation

purechaose
Copy link
Contributor

Closes #140
Todo:

  • Base map images
  • Spawn points
  • Objective positions
    • Bomb
    • Secure
    • Hostage
  • Correct wall and doorway errors in the map
  • Camera positions
  • Camera LOS
  • Camera previews
  • Ceiling hatch positions
  • Drone tunnels
  • Room labels

purechaose and others added 30 commits December 22, 2017 22:45
@purechaose
Merge pull request #1 from capajon/master
eabff86 
Merge main branch in.
@purechaose
Merge branch 'master' of https://github.com/capajon/r6maps
7113d92
@purechaose
Merge branch 'master' of https://github.com/capajon/r6maps
d96a42b
@purechaose
Fix capajon#115, checking walls in game and editing by hand.
52d958c
@joeyfoo
Villa: add initial map images and data
7e14d8f
@appleparan
add new bomb site of Consulate
0b28abf
@appleparan
fix Korean translation error in Theme park
caede8b
@appleparan
add missing drone hole in Theme park
4a508c1
@joeyfoo
Villa: Add camera locations and names
1266497
@joeyfoo
Villa: Add cameras' LOS
ef1c837
@purechaose
Start working on capajon#90, only missing LOS floor (and window marki…
3a88c40 
…ngs that may never happen)
@purechaose
Add all room names to default lang-terms
76e2110
@purechaose
Add ceiling hatches and code to add hatch scaling when specified
9c38015
@purechaose
Add skylight to villa
04102ac
@purechaose
Add room labels to map, edit some label text
8457079
@purechaose
Add drone tunnels to villa
086e7d1
@purechaose
Add fortress map images, rescaled so hatches are the right size.
60f18a8 
Also add functionality to display a map layer without selecting it.
@purechaose
Add fortress rooms and data skeleton.
476f2f2
@purechaose
Add bombs, hatches, cameras and spawnpoints to fortress.
117eefb
@purechaose
Change spawn ordering to match in game.
10c8ee0
@purechaose
Add external, first floor drone tunnels
3d8ee9e
@purechaose
Fix some drone holes and hatches
b97e14f
@purechaose
Add all objective and drone tunnels
988aa0f
@purechaose
Add room labels and skylights
1845af1
@purechaose
Add fortress cameras LOS
469b3cf
@purechaose
Actually fix capajon#115
cb36d8e
@purechaose
Fix capajon#115, fix capajon#116, start work on capajon#90, close cap…
6b74cdd 
…ajon#122
@purechaose
Merge pr capajon#124 into newest
bbec2d2
@purechaose
Merge pr capajon#125 into newest
8300978
@purechaose
Merge pr capajon#126 into newest
4bcb106
caseymh and others added 27 commits May 20, 2019 11:55
@caseymh
Make shortcut language specific
4cf850b
@purechaose
Fix linting errors
8cbef2f
@purechaose
Fix lang test files and fix lang files having old hereford keys.
6c6b379
@purechaose
Add new Kafe. Still need camera POVs
154a8fc
@purechaose
Remove lang terms for deleted room names
6111c05
@purechaose
Merge pull request #4 from purechaose/newest
ea25de2 
Make master the actual master branch
@purechaose
Adding code documentation
71ee3d4
@fy-meng
[feat] add simplified Chinese translation for Fortress
1cad109
@fy-meng
[feat] add simplified Chinese translation for Hereford rework
a8122e9
@fy-meng
[feat] add simplified Chinese translation for Kafe rework
1b26426
@fy-meng
[feat] add simplified Chinese translation for Outback
1c2e2f8
@purechaose
Add support for index -1 for floor
7cfa01c
@purechaose
First pass on new Kanal. Still needs drone holes
1e99278
@fy-meng
[feat] add simplified Chinese translation for Villa
d152a77
@purechaose
Added drone holes to Kanal
c4f498b
@purechaose
Merge commit 'refs/pull/5/head' of https://github.com/purechaose/r6maps
d76ba7a
@purechaose
Fix some errors, close capajon#143, close capajon#144, correct and close
9a5e6c6 
 #4
@purechaose
Remove unused keys from localization files
0b99a75
@purechaose
Merge branch 'update/kanal/0' of https://github.com/purechaose/r6maps
6581b72
@purechaose
Remove donation links - capajon is MIA
cba617c
@purechaose
Auto-deploy to gh-pages for the new season.
aed6385
@purechaose
Correct sass installation.
6fb9318
@purechaose
Set the token as the right variable
3fa54dc
@purechaose
Corrected deploy dir
df02f86
@purechaose
Maybe this won't delete the build?
864fded
@purechaose
Initial data input for new themepark
69eacd2
@purechaose
Update themepark to Y4S4
eb80748
@purechaose purechaose mentioned this pull request Nov 22, 2019
Open
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.

Add new Kafe
5 participants
@purechaose @joeyfoo @appleparan @caseymh @fy-meng