Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
poeticAndroid committed Jul 16, 2018
2 parents b0745db + 0138077 commit 3c1d647
Show file tree
Hide file tree
Showing 20 changed files with 223 additions and 146 deletions.
2 changes: 1 addition & 1 deletion COMPILE.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Open terminal and type:

$ cd path/to/this/folder/
$ npm install
$ npm start
$ npm run build-desktop

Open your browser to http://localhost:8000/

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 codeartisticninja
Copyright (c) 2018 poeticandroid

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ CyberTerminal
A fantasy terminal for the [fantasy internet](https://fantasyinternet.github.io/).

[![icon](./src/images/icon.gif)
💾Get the latest version](https://github.com/FantasyInternet/cyberterminal/releases)
💾Get the latest version](https://github.com/FantasyInternet/cyberterminal/releases/latest)

Made by [codeartistic.ninja](http://the.codeartistic.ninja/)
Made by [poetic android](http://poeticandroid.online/)

Keyboard shortcuts
------------------
Expand Down
4 changes: 2 additions & 2 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ CyberTerminal
A fantasy terminal for the [fantasy internet](https://fantasyinternet.github.io/).

[![icon](./src/images/icon.gif)
💾Get the latest version](https://github.com/FantasyInternet/cyberterminal/releases)
💾Get the latest version](https://github.com/FantasyInternet/cyberterminal/releases/latest)

Made by [codeartistic.ninja](http://the.codeartistic.ninja/)
Made by [poetic android](http://poeticandroid.online/)

Keyboard shortcuts
------------------
Expand Down
11 changes: 5 additions & 6 deletions docs/classes/_script__lib_cyberterminal_.cyberterminal.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ ___

**addMachine**(): [MachineWorker](../interfaces/_script__lib_machineworker_.machineworker.md)

*Defined in [script/_lib/CyberTerminal.ts:90](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L90)*
*Defined in [script/_lib/CyberTerminal.ts:79](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L79)*

**Returns:** [MachineWorker](../interfaces/_script__lib_machineworker_.machineworker.md)

Expand All @@ -88,7 +88,7 @@ ___

**connectTo**(url: *`string`*): `Promise`<`void`>

*Defined in [script/_lib/CyberTerminal.ts:43](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L43)*
*Defined in [script/_lib/CyberTerminal.ts:36](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L36)*

**Parameters:**

Expand All @@ -105,7 +105,7 @@ ___

**removeMachine**(): `void`

*Defined in [script/_lib/CyberTerminal.ts:101](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L101)*
*Defined in [script/_lib/CyberTerminal.ts:91](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L91)*

**Returns:** `void`

Expand All @@ -114,16 +114,15 @@ ___

### setAddress

**setAddress**(url: *`string`*, push: *`boolean`*): `void`
**setAddress**(url: *`string`*): `void`

*Defined in [script/_lib/CyberTerminal.ts:125](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L125)*
*Defined in [script/_lib/CyberTerminal.ts:116](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/CyberTerminal.ts#L116)*

**Parameters:**

| Param | Type |
| ------ | ------ |
| url | `string` |
| push | `boolean` |

**Returns:** `void`

Expand Down
55 changes: 37 additions & 18 deletions docs/classes/_script__lib_electronsys_.electronsys.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ Sys implementation for electron app. See [Sys](../interfaces/__lib_sys_.sys.md)
* [setDisplayMode](_script__lib_electronsys_.electronsys.md#setdisplaymode)
* [setNativeMouse](_script__lib_electronsys_.electronsys.md#setnativemouse)
* [setTextInput](_script__lib_electronsys_.electronsys.md#settextinput)
* [showLink](_script__lib_electronsys_.electronsys.md#showlink)
* [startTone](_script__lib_electronsys_.electronsys.md#starttone)
* [stopTone](_script__lib_electronsys_.electronsys.md#stoptone)
* [waitForVsync](_script__lib_electronsys_.electronsys.md#waitforvsync)
Expand Down Expand Up @@ -177,7 +178,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[addEventListener](_script__lib_websys_.websys.md#addeventlistener)*

*Defined in [script/_lib/WebSys.ts:449](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L449)*
*Defined in [script/_lib/WebSys.ts:456](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L456)*

**Parameters:**

Expand All @@ -199,7 +200,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[createMachine](_script__lib_websys_.websys.md#createmachine)*

*Defined in [script/_lib/WebSys.ts:252](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L252)*
*Defined in [script/_lib/WebSys.ts:246](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L246)*

**Returns:** [WebMachineWorker](_script__lib_websys_.webmachineworker.md)

Expand Down Expand Up @@ -235,7 +236,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[drawBitmap](_script__lib_websys_.websys.md#drawbitmap)*

*Defined in [script/_lib/WebSys.ts:90](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L90)*
*Defined in [script/_lib/WebSys.ts:84](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L84)*

**Parameters:**

Expand All @@ -256,7 +257,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[focusInput](_script__lib_websys_.websys.md#focusinput)*

*Defined in [script/_lib/WebSys.ts:395](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L395)*
*Defined in [script/_lib/WebSys.ts:389](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L389)*

**Parameters:**

Expand All @@ -275,7 +276,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[head](_script__lib_websys_.websys.md#head)*

*Defined in [script/_lib/WebSys.ts:354](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L354)*
*Defined in [script/_lib/WebSys.ts:348](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L348)*

**Parameters:**

Expand Down Expand Up @@ -311,7 +312,7 @@ ___

### openWeb

**openWeb**(path: *`string`*): `any`
**openWeb**(path: *`string`*): `boolean`

*Implementation of [Sys](../interfaces/_script__lib_sys_.sys.md).[openWeb](../interfaces/_script__lib_sys_.sys.md#openweb)*

Expand All @@ -325,7 +326,7 @@ ___
| ------ | ------ |
| path | `string` |

**Returns:** `any`
**Returns:** `boolean`

___
<a id="post"></a>
Expand All @@ -336,7 +337,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[post](_script__lib_websys_.websys.md#post)*

*Defined in [script/_lib/WebSys.ts:317](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L317)*
*Defined in [script/_lib/WebSys.ts:311](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L311)*

**Parameters:**

Expand All @@ -358,7 +359,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[print](_script__lib_websys_.websys.md#print)*

*Defined in [script/_lib/WebSys.ts:98](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L98)*
*Defined in [script/_lib/WebSys.ts:92](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L92)*

**Parameters:**

Expand Down Expand Up @@ -401,7 +402,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[replaceTextInput](_script__lib_websys_.websys.md#replacetextinput)*

*Defined in [script/_lib/WebSys.ts:422](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L422)*
*Defined in [script/_lib/WebSys.ts:416](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L416)*

**Parameters:**

Expand All @@ -418,7 +419,7 @@ ___

### setAddress

**setAddress**(url: *`string`*, push: *`boolean`*): `void`
**setAddress**(url: *`string`*): `void`

*Implementation of [Sys](../interfaces/_script__lib_sys_.sys.md).[setAddress](../interfaces/_script__lib_sys_.sys.md#setaddress)*

Expand All @@ -431,7 +432,6 @@ ___
| Param | Type |
| ------ | ------ |
| url | `string` |
| push | `boolean` |

**Returns:** `void`

Expand All @@ -444,7 +444,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[setDisplayMode](_script__lib_websys_.websys.md#setdisplaymode)*

*Defined in [script/_lib/WebSys.ts:51](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L51)*
*Defined in [script/_lib/WebSys.ts:45](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L45)*

**Parameters:**

Expand All @@ -469,7 +469,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[setNativeMouse](_script__lib_websys_.websys.md#setnativemouse)*

*Defined in [script/_lib/WebSys.ts:440](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L440)*
*Defined in [script/_lib/WebSys.ts:434](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L434)*

**Parameters:**

Expand All @@ -488,7 +488,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[setTextInput](_script__lib_websys_.websys.md#settextinput)*

*Defined in [script/_lib/WebSys.ts:413](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L413)*
*Defined in [script/_lib/WebSys.ts:407](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L407)*

**Parameters:**

Expand All @@ -501,6 +501,25 @@ ___

**Returns:** `void`

___
<a id="showlink"></a>

### showLink

**showLink**(url: *`string`*): `HTMLElement`

*Inherited from [WebSys](_script__lib_websys_.websys.md).[showLink](_script__lib_websys_.websys.md#showlink)*

*Defined in [script/_lib/WebSys.ts:443](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L443)*

**Parameters:**

| Param | Type |
| ------ | ------ |
| url | `string` |

**Returns:** `HTMLElement`

___
<a id="starttone"></a>

Expand All @@ -510,7 +529,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[startTone](_script__lib_websys_.websys.md#starttone)*

*Defined in [script/_lib/WebSys.ts:388](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L388)*
*Defined in [script/_lib/WebSys.ts:382](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L382)*

**Returns:** `void`

Expand All @@ -523,7 +542,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[stopTone](_script__lib_websys_.websys.md#stoptone)*

*Defined in [script/_lib/WebSys.ts:391](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L391)*
*Defined in [script/_lib/WebSys.ts:385](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L385)*

**Returns:** `void`

Expand All @@ -536,7 +555,7 @@ ___

*Inherited from [WebSys](_script__lib_websys_.websys.md).[waitForVsync](_script__lib_websys_.websys.md#waitforvsync)*

*Defined in [script/_lib/WebSys.ts:246](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L246)*
*Defined in [script/_lib/WebSys.ts:240](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L240)*

**Returns:** `Promise`<`Object`>

Expand Down
12 changes: 6 additions & 6 deletions docs/classes/_script__lib_mouseinput_.mouseinput.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Class for taking care of mouse input

**new MouseInput**(sys: *[Sys](../interfaces/_script__lib_sys_.sys.md)*): [MouseInput](_script__lib_mouseinput_.mouseinput.md)

*Defined in [script/_lib/MouseInput.ts:22](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L22)*
*Defined in [script/_lib/MouseInput.ts:20](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L20)*

**Parameters:**

Expand Down Expand Up @@ -83,7 +83,7 @@ ___

**● sys**: *[Sys](../interfaces/_script__lib_sys_.sys.md)*

*Defined in [script/_lib/MouseInput.ts:24](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L24)*
*Defined in [script/_lib/MouseInput.ts:22](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L22)*

___

Expand Down Expand Up @@ -115,7 +115,7 @@ ___

**addEventListener**(fn: *`Function`*): `void`

*Defined in [script/_lib/MouseInput.ts:32](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L32)*
*Defined in [script/_lib/MouseInput.ts:36](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L36)*

**Parameters:**

Expand All @@ -132,7 +132,7 @@ ___

**blur**(): `void`

*Defined in [script/_lib/MouseInput.ts:27](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L27)*
*Defined in [script/_lib/MouseInput.ts:31](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L31)*

**Returns:** `void`

Expand All @@ -143,7 +143,7 @@ ___

**focus**(): `void`

*Defined in [script/_lib/MouseInput.ts:26](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L26)*
*Defined in [script/_lib/MouseInput.ts:30](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L30)*

**Returns:** `void`

Expand All @@ -154,7 +154,7 @@ ___

**removeEventListener**(fn: *`Function`*): `void`

*Defined in [script/_lib/MouseInput.ts:39](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L39)*
*Defined in [script/_lib/MouseInput.ts:43](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/MouseInput.ts#L43)*

**Parameters:**

Expand Down
12 changes: 6 additions & 6 deletions docs/classes/_script__lib_websys_.webmachineworker.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@

**new WebMachineWorker**(): [WebMachineWorker](_script__lib_websys_.webmachineworker.md)

*Defined in [script/_lib/WebSys.ts:675](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L675)*
*Defined in [script/_lib/WebSys.ts:683](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L683)*

**Returns:** [WebMachineWorker](_script__lib_websys_.webmachineworker.md)

Expand All @@ -53,7 +53,7 @@ ___

*Implementation of [MachineWorker](../interfaces/_script__lib_machineworker_.machineworker.md).[baseUrl](../interfaces/_script__lib_machineworker_.machineworker.md#baseurl)*

*Defined in [script/_lib/WebSys.ts:675](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L675)*
*Defined in [script/_lib/WebSys.ts:683](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L683)*

___
<a id="worker"></a>
Expand All @@ -62,7 +62,7 @@ ___

**● worker**: *`Worker`*

*Defined in [script/_lib/WebSys.ts:674](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L674)*
*Defined in [script/_lib/WebSys.ts:682](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L682)*

___

Expand All @@ -76,7 +76,7 @@ ___

*Implementation of [MachineWorker](../interfaces/_script__lib_machineworker_.machineworker.md).[onMessage](../interfaces/_script__lib_machineworker_.machineworker.md#onmessage)*

*Defined in [script/_lib/WebSys.ts:685](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L685)*
*Defined in [script/_lib/WebSys.ts:693](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L693)*

**Parameters:**

Expand All @@ -93,7 +93,7 @@ ___

**send**(msg: *`any`*, transferables?: * `any`[] &#124; `undefined`*): `void`

*Defined in [script/_lib/WebSys.ts:681](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L681)*
*Defined in [script/_lib/WebSys.ts:689](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L689)*

**Parameters:**

Expand All @@ -113,7 +113,7 @@ ___

*Implementation of [MachineWorker](../interfaces/_script__lib_machineworker_.machineworker.md).[terminate](../interfaces/_script__lib_machineworker_.machineworker.md#terminate)*

*Defined in [script/_lib/WebSys.ts:691](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L691)*
*Defined in [script/_lib/WebSys.ts:699](https://github.com/FantasyInternet/cyberterminal/blob/HEAD/src/script/_lib/WebSys.ts#L699)*

**Returns:** `void`

Expand Down
Loading

0 comments on commit 3c1d647

Please sign in to comment.