Skip to content

Commit

Permalink
Fix files
Browse files Browse the repository at this point in the history
  • Loading branch information
James Kingsley committed Nov 26, 2016
1 parent 4f0ac1d commit fd0b049
Show file tree
Hide file tree
Showing 72 changed files with 7,504 additions and 3 deletions.
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,3 @@ tools/intercept/
*.lib
*.exp
*.cache
_posts/
_site/
.sass-cache/
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
44 changes: 44 additions & 0 deletions docs/_posts/2016-06-30-framework-release.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
---
layout: post
title: Framework Release
author: Kingsley
authorUrl: https://github.com/jameslkingsley
banner: images/posts/framework-release/banner.jpg
bannerPos: center 92%
---

## What is Mars?
Mars is a total Zeus replacement providing Arma communities with a customisable editor capable of realtime mission creation and enhancement. Mars provides integrated mod support; enabling the community to expand its capabilities far beyond Zeus' limited modules. With Mars, you can add context options, toolbar buttons, menus, modules, and more. Mars is an extensible in-game editor built for communities.

## What is the framework?
The Mars framework is a set of components that handle all of the tricky parts of a realtime editor for you. Without writing UI's or messing about with controls, you can create new features very quickly. Most of the features currently implemented in the framework are still a work-in-progress but their implementation is unlikely to change.

## What's available?
* [Attributes UI Framework]({{ site.url }}/docs/development/frameworks/attributes/)
* [Context Menus]({{ site.url }}/docs/development/frameworks/context-menus/)
* [Menu Strip Items]({{ site.url }}/docs/development/frameworks/menu-strip/)
* [Toolbar Options]({{ site.url }}/docs/development/frameworks/toolbar/)

## User Interface
As you can probably tell, the Mars interface is practically identical to the Eden interface. This is mainly to reduce the amount of UI work required and also to provide users with a familiar environment. There are still some parts to be built such as the entity list and map but the main parts are functional and relatively bug-free.

![Garrison Units, Suppress Position]({{ site.url }}/images/posts/framework-release/interface_01n.jpg)

Using the attributes framework you can create menus with various control types that are perfectly aligned. You'll never again have to write another UI config or mess about with safezones or grids. Check out the [config](https://github.com/marseditor/mars/blob/master/addons/editor/CfgAttributes.hpp) for the menu shown below.

![Attributes UI]({{ site.url }}/images/posts/framework-release/interface_03.jpg)

Placing objects is also extremely easy. With surface detection you can quickly and easily piece together detailed bases, garrison units and more. Any object can be placed on any surface, you just have to hover over it.

![Surface Detection]({{ site.url }}/images/posts/framework-release/interface_04.jpg)

## Roadmap
There is still a lot more to do, but I'm happy with the progress so far and as you can see below we are currently sitting on this framework release. Over the next couple of months the [1.0 features](https://github.com/marseditor/mars/issues/1) will hopefully all be ticked off, with perhaps some additions. Once we are content with its features we will start testing Mars with communities that would otherwise use Zeus. This is to get feedback on its ease of use and tidy up any bugs there might be. If that all goes to plan and we are confident it's not going to spoil a mission for someone, then queue the 1.0 release.

![Roadmap]({{ site.url }}/images/posts/framework-release/roadmap.jpg)

## Contributing
While I could write all of the features myself, it would take considerably less time if there were other developers working on it with me. If you are familiar with the ACE/CBA development environment and are interested in Mars, then I encourage you to contribute. There is a comprehensive list of features that need to be built over on the [GitHub issues](https://github.com/marseditor/mars/issues/1) page. If you have an idea that's not on the list, you can submit it as a feature request or speak to me directly - I'm eager to hear what you can come up with.

**Feel free to also join the Mars [Discord](https://discord.gg/0vfzEmmrAOu1T2uk) and [Slack](https://mars-slackin.herokuapp.com/) servers to discuss, develop and troubleshoot.**
<br />Thank you for reading and stay tuned for more to come.
29 changes: 29 additions & 0 deletions docs/_posts/2016-11-13-marsrep-0001.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
layout: post
title: MARSREP 0001
author: Kingsley
authorUrl: https://github.com/jameslkingsley
banner: images/posts/marsrep-0001/banner.jpg
bannerPos: center 30%
bannerDim: true
---

## First community test
Mars was kindly tested in a couple of communities recently; [ARCOMM](http://www.arcomm.co/) and [DDCA3](https://ddca3.com/). While still very buggy and not feature-complete, the feedback was mostly positive. There are some significant issues with FPS at the moment, where your game would freeze when highlighting units, but other than that it is currently a usable infantry controller.

Moving forward I definitely want more groups to try it out; the usability feedback is incredibly useful. The development process is ongoing so there will never be a final version - there are endless possibilities for what you can add to it (within the constraints of Arma). One thing I'm particularly excited about implementing is an `attachTo` system for when you need biplane dog fights with M2's. It's the little things in life, right?

Below you'll find some screenshots I took while using it with around 15 players and 2 headless clients. The AI were very responsive and setting up a mission on-the-go took less than 5 minutes. The players on the ground said the AI felt more aggressive than usual - certainly a step up from Zeus.

<iframe width="1000" height="563" src="https://www.youtube.com/embed/hepzndGzhho" frameborder="0" allowfullscreen></iframe>

![Screenshot 1]({{ site.url }}/images/posts/marsrep-0001/ps1.jpg)
![Screenshot 2]({{ site.url }}/images/posts/marsrep-0001/ps3.jpg)
![Screenshot 3]({{ site.url }}/images/posts/marsrep-0001/ps4.jpg)

## Looking ahead
By the end of 2016 I'm hoping to have the FPS issues resolved and a much more stable build for groups to try out. There are still lots of AI commands to add, particularly for vehicles but now that the underlying framework is solid those _shouldn't_ take long to implement.

If you have an idea for Mars then feel free to post it on the [feature requests](https://github.com/marseditor/mars/issues/32). It's nice to be able to see the progress of the baseline features and what people are interested in most.

If you're not on Mars' Discord server then I urge you to [join](https://discord.gg/0vfzEmmrAOu1T2uk)! There's also a [Twitter](https://twitter.com/marsmod) account for Mars now so I also urge you to follow that for sporadic updates and terrible attempts at humour.
76 changes: 76 additions & 0 deletions docs/_site/404/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
<!DOCTYPE html>

<html>
<head>
<title>404 - Page not found - Mars - Arma 3 Mod</title>

<meta charset="utf-8" />
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0'>


<meta name="description" content="Mars gives players full control over how their mission is played, in real time.">
<meta property="og:description" content="Mars gives players full control over how their mission is played, in real time." />

<meta name="author" content="Mars" />


<meta property="og:title" content="404 - Page not found" />
<meta property="twitter:title" content="404 - Page not found" />


<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<link rel="stylesheet" href="https://mars.arcomm.co/css/font-awesome.min.css" type="text/css">
<link rel="stylesheet" type="text/css" href="https://mars.arcomm.co/style.css">
<link rel="alternate" type="application/rss+xml" title="Mars - Mars gives players full control over how their mission is played, in real time." href="https://mars.arcomm.co/feed.xml">
<link rel="icon" type="image/png" href="https://raw.githubusercontent.com/jameslkingsley/Mars/master/extras/logo/favicon.png">

<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="https://mars.arcomm.co/js/toc.js"></script>

</head>

<body>
<header>
<div class="logo">
<div class="nav_left">
<a href="https://github.com/marseditor/mars" class="fa fa-github"></a>
<a href="https://twitter.com/marsmod" class="fa fa-twitter"></a>
</div>
<a href="https://mars.arcomm.co" class="logo_img">
<span class="mars-version">1.0.0</span>
</a>
<div class="nav_right">
<a href="https://mars.arcomm.co/docs" class="nav_link" style="padding-right: 0 !important">Docs</a>
<a href="https://mars.arcomm.co/news" class="nav_link">News</a>
<a href="https://mars.arcomm.co/faq" class="nav_link">FAQ</a>
</div>
</div>
</header>

<div class="separator"></div>

<main>
<div class="inner">
<article class="page">
<div class="entry">
<p>Sorry, we can’t find that page that you’re looking for. You can try again by going <a href="/">back to the homepage</a>.</p>

<p>[<img src="/images/404.jpg" alt="Constructocat by https://github.com/jasoncostello" style="width: 400px;" />](/)</p>

</div>
</article>

</div>

<footer></footer>
</main>



</body>
</html>
Binary file added docs/_site/assets/roadmap.psd
Binary file not shown.
4 changes: 4 additions & 0 deletions docs/_site/css/font-awesome.min.css

Large diffs are not rendered by default.

132 changes: 132 additions & 0 deletions docs/_site/docs/development/frameworks/attributes/button/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
<!DOCTYPE html>

<html>
<head>
<title>Button - Mars - Arma 3 Mod</title>

<meta charset="utf-8" />
<meta content='text/html; charset=utf-8' http-equiv='Content-Type'>
<meta http-equiv='X-UA-Compatible' content='IE=edge'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0'>


<meta name="description" content="Mars gives players full control over how their mission is played, in real time.">
<meta property="og:description" content="Mars gives players full control over how their mission is played, in real time." />

<meta name="author" content="Mars" />


<meta property="og:title" content="Button" />
<meta property="twitter:title" content="Button" />


<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->

<link rel="stylesheet" href="https://mars.arcomm.co/css/font-awesome.min.css" type="text/css">
<link rel="stylesheet" type="text/css" href="https://mars.arcomm.co/style.css">
<link rel="alternate" type="application/rss+xml" title="Mars - Mars gives players full control over how their mission is played, in real time." href="https://mars.arcomm.co/feed.xml">
<link rel="icon" type="image/png" href="https://raw.githubusercontent.com/jameslkingsley/Mars/master/extras/logo/favicon.png">

<script src="https://ajax.googleapis.com/ajax/libs/jquery/2.2.4/jquery.min.js"></script>
<script src="https://mars.arcomm.co/js/toc.js"></script>

</head>

<body>
<header>
<div class="logo">
<div class="nav_left">
<a href="https://github.com/marseditor/mars" class="fa fa-github"></a>
<a href="https://twitter.com/marsmod" class="fa fa-twitter"></a>
</div>
<a href="https://mars.arcomm.co" class="logo_img">
<span class="mars-version">1.0.0</span>
</a>
<div class="nav_right">
<a href="https://mars.arcomm.co/docs" class="nav_link" style="padding-right: 0 !important">Docs</a>
<a href="https://mars.arcomm.co/news" class="nav_link">News</a>
<a href="https://mars.arcomm.co/faq" class="nav_link">FAQ</a>
</div>
</div>
</header>

<div class="separator"></div>

<main>
<div class="inner">
<div class="toc_wrapper">
<div class="toc_title">Contents</div>
<div id="toc"></div>
</div>

<span class="docs_title">Button</span>
<div class="docs_content" id="content"><h1 id="properties">Properties</h1>

<table>
<thead>
<tr>
<th>Name</th>
<th>Type</th>
<th>Default</th>
<th>Description</th>
</tr>
</thead>
<tbody>
<tr>
<td>condition</td>
<td>string</td>
<td>"true"</td>
<td>Condition that must return true to show the control.</td>
</tr>
<tr>
<td>textPlain</td>
<td>string</td>
<td>""</td>
<td>Text to show on the button</td>
</tr>
<tr>
<td>textCode</td>
<td>string</td>
<td>""</td>
<td>Code that returns the text to show on the button</td>
</tr>
<tr>
<td>action</td>
<td>string</td>
<td>""</td>
<td>Code to run when pressing button</td>
</tr>
</tbody>
</table>

<h1 id="examples">Examples</h1>
<div class="highlighter-rouge"><pre class="highlight"><code><span class="k">class</span> <span class="nc">Button</span> <span class="p">{</span>
<span class="n">condition</span> <span class="o">=</span> <span class="s">"alive player"</span><span class="p">;</span>
<span class="n">type</span> <span class="o">=</span> <span class="s">"BUTTON"</span><span class="p">;</span>
<span class="n">textCode</span> <span class="o">=</span> <span class="s">"name player"</span><span class="p">;</span>
<span class="n">action</span> <span class="o">=</span> <span class="s">"hint format ['Your name is %1', name player]"</span><span class="p">;</span>
<span class="p">};</span>
</code></pre>
</div>
</div>

<script>
$(document).ready(function(e) {
$("#toc").toc({
headers: "#content h1, #content h2, #content h3, #content h4",
showEffect: "none"
});
});
</script>

</div>

<footer></footer>
</main>



</body>
</html>
Loading

0 comments on commit fd0b049

Please sign in to comment.