Commit Graph

105 Commits

Author SHA1 Message Date
Markolie
09fc2bc54f Add caching to crew monitor 2015-08-11 15:24:49 +02:00
Mark van Alphen
8f19323fdd Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into alarms
Conflicts:
	code/__HELPERS/lists.dm
2015-08-03 23:59:45 +02:00
Markolie
a2f8141036 NanoUI power monitor/AI subsystem, mapfix 2015-08-03 03:38:38 +02:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
e35431da34 Port Bay's appearance changer 2015-08-01 23:22:20 +02:00
Markolie
7b9488309d Update crew monitor to Bay's latest 2015-07-29 03:37:51 +02:00
Markolie
8ac25a71e5 NanoUI portable scrubber/pump 2015-07-28 22:22:26 +02:00
Markolie
b8a7ca7d1b Update NanoUI to be up-to-date with Bay 2015-07-28 21:04:44 +02:00
Markolie
154a282a0d NanoUI caching for cameras/crew manifest 2015-07-28 19:54:17 +02:00
Markolie
56989c8fbd Convert multi shuttle UI's to NanoUI 2015-07-28 04:39:00 +02:00
Markolie
b9c2f52471 Update NanoUI map, add verb to Mapping menu in debug mode 2015-07-28 00:02:59 +02:00
PJB3005
257e77c400 /vg/ Multitool menu port!
With 100% better squashing.

I hope.
2015-05-14 22:34:02 +02:00
ZomgPonies
9e57d2424f Merge pull request #528 from TheDZD/nano_pai
NanoUI pAIs
2015-03-08 13:23:05 -04:00
DZD
d2d0627d43 NanoUI pAIs 2015-03-06 18:34:45 -05:00
Markolie
6352d2abd9 Remove qdel from ghost images, clarify qdel debug, nanoUI runtime fix 2015-03-04 15:09:12 +01:00
Markolie
d7a2559065 Bug fixes galore 2015-03-01 20:35:07 +01:00
Markolie
6b70bfec74 NanoUI update 2015-03-01 04:22:12 +01:00
Markolie
b28f791f8f (Porta) turret update, map area update 2015-03-01 02:10:32 +01:00
Markolie
982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie
ad167dc541 Announcement system overhaul, crew monitor system overhaul, add portable crew monitor 2015-02-16 19:03:29 +01:00
Markolie
c507158b8f Camera code update, fix runtime 2015-02-10 15:42:47 +01:00
Mark Aherne
992ceecd4e NanoUI updates.
* Map gen verb is now limited to those with server access.
* Added Z layer support.

Conflicts:
	code/modules/admin/admin_verbs.dm
	nano/images/nanomap.png
2014-07-21 18:54:19 -04:00
Mark Aherne
9a62de164d Update NanoUI Live Map.
* Simplified how items are positioned on the map (e.g. ((value.x - 1) * 8) is now just value.x, scaling is applied later).
* Added four zoom levels (x1.0 to x2.5, triggered by links in the template).
* Moved the "Generate NanoUI Map" into the Server tab, to prevent it being used by admins accidentally.

Conflicts:
	nano/images/nanomap.png
2014-07-19 10:51:01 -04:00
Mark Aherne
ec29e88224 Added a station map to NanoUI, this map can be used by any NanoUI to display live/dynamic elements on a map.
The map functionality has been added to the crew monitor console to show active crew trackers, this is working but needs refinement (icons etc.).

Conflicts:
	code/modules/nano/nanoui.dm
2014-07-19 02:11:44 -04:00
Mark Aherne
17aafd91e4 Layout update for NanoUI.
The layout HTML (which was mainly used for the title bar) is no longer hard coded in nanoui.dm.
Layouts are now dynamic and each consists of a template and stylesheet (CSS) file.
Multiple layouts can exist, they can be switched to using the set_layout_key proc. See the proc comments for more info.
Added "default" and "basic" layouts, "basic" has no title bar.
Moved image source assets (GIMP and Flash files) into a separate source folder so that they are not sent to the client.

Conflicts:
	code/modules/nano/nanoui.dm
2014-07-15 07:30:37 -04:00
Mark Aherne
d97aa66947 Fixed comments for new JS files in nanoui.dm.
Changed the BYOND cache path in "To BYOND Cache.bat" to a dynamic path.

Conflicts:
	code/modules/nano/nanoui.dm
2014-07-15 07:27:15 -04:00
Mark Aherne
292615bc4e Remove testing debug messages from nanomanager.
Conflicts:
	code/modules/nano/nanomanager.dm
2014-07-15 07:25:20 -04:00
Mark Aherne
8cbb71eba6 Continued work in progress on a major revision of the NanoUI templating system. 2014-07-15 07:23:01 -04:00
Mark Aherne
9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system.
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
2014-07-15 07:22:15 -04:00
Mark Aherne
fc1d61ac98 Work in progress on a major revision of the NanoUI templating system. 2014-07-15 07:10:46 -04:00
Mark Aherne
128c310933 Work in progress on a major revision of the NanoUI templating system.
Conflicts:
	nano/js/nano_base_helpers.js
	nano/templates/advanced_airlock_console.tmpl
	nano/templates/door_access_console.tmpl
	nano/templates/escape_pod_console.tmpl
	nano/templates/identification_computer.tmpl
	nano/templates/omni_filter.tmpl
	nano/templates/omni_mixer.tmpl
	nano/templates/pda.tmpl
	nano/templates/simple_docking_console_pod.tmpl
	nano/templates/transfer_valve.tmpl
2014-07-15 07:10:30 -04:00
Mark Aherne
99eb85fae4 This change to nanomanager optimizes the sending of nanoui assets to clients.
The flist (file list) proc was being used multiple times for each client user logon, this now only occurs once when the server starts.
Hopefully this fixes the nanoui assets issue which occurs during peak usage.

Conflicts:
	code/modules/nano/nanomanager.dm
2014-07-13 07:04:09 -04:00
d3athrow
528ffcef1d Fixes a nano runtime when the oldMob is null during a user_transfer
Conflicts:
	code/modules/nano/nanomanager.dm
2014-04-23 11:48:14 -04:00
Rob Nelson
8fb14a26e9 Initial commit of media suite
Conflicts:
	baystation12.dme
	code/controllers/configuration.dm
	code/game/area/areas.dm
	code/modules/client/client defines.dm
2014-03-10 19:01:41 -04:00
Rob Nelson
7b7cfb605d Comm console is now NanoUI. Fixes github #489, hopefully.
Conflicts:
	code/game/machinery/computer/communications.dm
	code/modules/nano/nanoui.dm
2014-02-15 15:33:45 -05:00
ZomgPonies
4261fa0ae4 Missed a spot 2014-01-20 04:11:31 -05:00
Rob Nelson
520a2cd401 NanoUI changes from Faerdan
Conflicts:
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/reagents/Chemistry-Machinery.dm
2014-01-20 02:02:31 -05:00
Mark Aherne (Faerdan)
a2049081bf NanoUI Caching and SMES tweaks
* Made NanoUI caching code neater, added check for directories (which are ignored).
* Moved SET to between MIN and MAX on SMES UI.

Conflicts:
	code/modules/nano/nanomanager.dm
2014-01-12 21:29:40 -05:00
Mark Aherne (Faerdan)
06541aecc5 NanoUI assets are now sent to the client automatically.
* NanoUI now finds and sends it's assets to the client (css, images, javascript and templates).

Part of my effort to make creating NanoUIs as simple as possible. This removes the need to add new NanoUI assets (such as templates) to the client send_resources proc.

Conflicts:
	code/modules/client/client procs.dm
	code/modules/nano/nanomanager.dm
2014-01-12 21:28:14 -05:00
Rob Nelson
a971c74d85 Disable nanoUI debugging, for now. 2014-01-12 21:22:56 -05:00
Mark Aherne (Faerdan)
e55ba73100 Minor fix for NanoUI
* I was passing src instead of src_object in try_update_ui, this is fixed now.
* Changed checks to use the isnul procl, just to be sure.
2014-01-08 21:22:00 -05:00
Mark Aherne (Faerdan)
4aef8764a8 NanoUI fix.
* Moved the receiveUpdateData JavaScript into the head so that it's loaded first.

This is to prevent an error which occurs if an update is recieved from the server before the UI is fully loaded.
2014-01-08 08:04:06 -05:00
Mark Aherne (Faerdan)
8d64095078 NanoUI Updates.
* Restructured HTML in an attempt to fix the "blank UI" issue.
* Added a crap ton of debugging messages.
* Added a loading message to the UI.

Conflicts:
	code/modules/nano/nanoui.dm
	nano/js/nano_update.js
2014-01-07 23:28:51 -05:00
Mark Aherne (Faerdan)
5d04a41151 NanoUI updates.
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
2014-01-05 23:28:52 -05:00
Mark Aherne (Faerdan)
0a29d579c6 Updated how NanoUI renders templates, using JSRender without the JSViews data-linking. This makes it much easier to create NanoUIs
as you don't need to provide the full data structure up-front, part of an effort to make NanoUI more accessible.

I have removed the carets (^) from all templates as they are not used any more.

For safety I moved the src_object and user checks from the master controller to the nanoui process proc.

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	nano/js/libraries/2-jsviews.js
	nano/templates/chem_dispenser.tmpl
	nano/templates/telescience_console.tmpl
2014-01-05 00:48:28 -05:00
ZomgPonies
ca011ee962 NanoUI update 2014-01-04 03:50:54 -05:00
ZomgPonies
f562ac1b5f Small NanoUI fixes 2014-01-03 20:58:00 -05:00
ZomgPonies
2573088771 PDA NanoUI 2013-12-22 16:03:21 -05:00
ZomgPonies
03f9ef0903 Moar nanoUI runtime fixes 2013-11-30 18:18:45 -05:00
ZomgPonies
fffcd7e49b Atmos Computer NanoUI 2013-11-18 01:17:59 -05:00