Commit Graph

20 Commits

Author SHA1 Message Date
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
ZomgPonies
60994c591d /tg/ Wire Datum method pass 1: APC, Airlocks, Vending Machines\ 2013-11-10 13:14:22 -05:00
ZomgPonies
8a529ab74c Nano UI for Air Alarms 2013-09-29 20:58:19 -04:00
ZomgPonies
3ea972025a DNA modifier Nano UI update 2013-09-19 16:21:15 -04:00
ZomgPonies
3bb7a173cf A bunch of nano UI fixes + new Chem Dispenser UI! 2013-09-09 18:40:26 -04:00
ZomgPonies
c1222034ee BS12 -> Ponies merge 2013-09-09 10:51:16 -04:00