Skip to content

Update and simplify install procedure #130

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

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

Update and simplify install procedure #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 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
3a88c40
Start working on #90, only missing LOS floor (and window markings tha…
purechaose Dec 5, 2018
4c62dee
Run with new version of npm, node, simplify install intructions.
purechaose Dec 5, 2018
3626499
Fix README.md
purechaose Dec 5, 2018
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
3 changes: 1 addition & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ r6maps.com is designed to be a quick reference for Rainbow Six Siege maps. Plea

### Dependencies
- [npm/Nodejs](https://www.npmjs.com/get-npm)
+ [UglifyJS3](https://www.npmjs.com/package/uglifyjs) for cli (Try `npm install uglify-js -g`)
- [Ruby](https://www.ruby-lang.org/en/)
+ [gem](https://rubygems.org/pages/download)
+ sass (`gem install sass`)

To check the dependencies, just type `uglifyjs` or `scss`. If the program waits for input, your dependencies are installed correctly. (`uglifyjs` might already be installed from `npm install`, see below).
To check the dependencies, just type `scss`. If the program waits for input, your dependencies are installed correctly.

### Building and running
- Install npm and install packages: `npm install`
Expand Down
2 changes: 1 addition & 1 deletion dev/js/main/main.map-data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ var R6MMainData = (function(R6MLangTerms, undefined){
{ floor: 1, top: -99, left: -305, rotate: 90, size: DRONE_MED },
{ floor: 1, top: -392, left: -188, rotate: 0, size: DRONE_MED },
{ floor: 1, top: -391, left: 158, rotate: 0, size: DRONE_MED },
{ floor: 1, top: -253, left: 262, rotate: 0, size: DRONE_MED },
{ floor: 1, top: -253, left: 220, rotate: 0, size: DRONE_MED },
{ floor: 1, top: -215, left: 108, rotate: 90, size: DRONE_SMALL },
{ floor: 1, top: -103, left: 330, rotate: 0, size: 39 },
{ floor: 1, top: -83, left: 331, rotate: 90, size: 58 }
Expand Down
Loading