Diffusion Zed 093c1fbf82d4

[Repo Maintenance] Merging with builder-hotglue branch.
093c1fbf82d4Unpublished
Actions

Unpublished Commit · Learn More

No further details are available.

Description

[Repo Maintenance] Merging with builder-hotglue branch.

Details

Provenance

dereckson

Authored on

Parents

rZED722e616f0aac: [Scene] * New scene file for HyperShip C0 * Adding GeoSceneIndex class file (cf.
rZEDf1856803b6d9: [Repo Maintenance] Merging branches builder-hotglue.

Branches

Unknown

Tags

Unknown

Event Timeline

Merged Changes

f1856803b6d9 [Repo Maintenance] Merging branches builder-hotglue.
Author
dereckson
Browse Repository
No Builds
No Audits
e8b677d1e5a2 [Geo] New GeoZone methods: load_from_row, search
Author
dereckson
Browse Repository
No Builds
No Audits
94b949a7e78f [AJAX] * New do.php requests: /polarz_local_move (contains a debug die) and…
Author
dereckson
Browse Repository
No Builds
No Audits
bd945956b3ce [Geo] * New GeoPointPolarZ clas * New GeoOctoctub methods: get_base_vector and…
Author
dereckson
Browse Repository
No Builds
No Audits
09a24885c484 [Content] New 2600 content
Author
dereckson
Browse Repository
No Builds
No Audits
7368b287f3d1 [Cleaning] * Removing extra white spaces / version info
Author
dereckson
Browse Repository
No Builds
No Audits
56f202f94573 Closing builder-hotglue branche.
Author
dereckson
Browse Repository
No Builds
No Audits
5ae0156bbe03 [HOTGLUE] * Builder controller can now call HOTGLUE * Config tuning * Closing…
Author
dereckson
Browse Repository
No Builds
No Audits
cd41a92a895e [hotglue] * config detecting server name
Author
dereckson
Browse Repository
No Builds
No Audits
a1d11cbda817 [Scenes] Fixing documentation issue
Author
dereckson
Browse Repository
No Builds
No Audits
e4b040867336 [HotGlue] * Adding %DOWN and %UP url aliases
Author
dereckson
Browse Repository
No Builds
No Audits
16cf2106051f [HotGlue] * Adding move shorcuts links (links can now be %EAST or %MOVE 1,1,0)…
Author
dereckson
Browse Repository
No Builds
No Audits
6466a8696405 [Apps] * Importing 3rd party application: hotglue 1.0 prerelease (GPL)
Author
dereckson
Browse Repository
No Builds
No Audits

Changes (242)

Path

Size

README

apps/

hotglue/

common_8inc_8php.html

config_8inc_8php.html

controller_8inc_8php.html

html__parse_8inc_8php.html

module__download_8inc_8php.html

module__glue_8inc_8php.html

module__iframe_8inc_8php.html

module__image_8inc_8php.html

module__object_8inc_8php.html

module__page_8inc_8php.html

module__page__browser_8inc_8php.html

module__revisions__browser_8inc_8php.html

module__text_8inc_8php.html

module__video_8inc_8php.html

modules_8inc_8php.html

controller_8inc_8php.tex

doxygen.sty

files.tex

html_8inc_8php.tex

html__parse_8inc_8php.tex

index_8php.tex

json_8php.tex

log_8inc_8php.tex

module__download_8inc_8php.tex

module__glue_8inc_8php.tex

module__iframe_8inc_8php.tex

module__image_8inc_8php.tex

module__object_8inc_8php.tex

module__page_8inc_8php.tex

module__page__browser_8inc_8php.tex

module__revisions__browser_8inc_8php.tex

module__text_8inc_8php.tex

module__video_8inc_8php.tex

modules_8inc_8php.tex

colorpicker-transparent.png

download.png

farbtastic-marker.png

jquery-ui-1.8.6.custom.js

jquery-ui-1.8.6.custom.min.js

jquery.xcolor-1.2.1.js

json.php

log.inc.php

module_download.inc.php

module_glue.inc.php

module_iframe.inc.php

module_image.inc.php

module_object.inc.php

module_page.inc.php

module_page_browser.inc.php

module_revisions_browser.inc.php

module_text.inc.php

module_user_css.inc.php

module_video.inc.php

module_webvideo.inc.php

object-transparency.png

page-set-startpage.png

revisions_browser-edit.js

revisions_browser.css

revisions_browser.js

revisions_browser.png

text

text-align.png

text-background-color.png

text-background-transparent.png

text-letter-spacing.png

text-word-spacing.png

video-autoplay-off.png

video-autoplay-on.png

video-controls-off.png

video-controls-on.png

webvideo-autoplay-off.png

webvideo-autoplay-on.png

webvideo-edit.css

webvideo-edit.js

webvideo-handle.png

webvideo-loop-off.png

	apps/	hotglue/	css/
		css/	zed/

	create_page.css
	perso.css

	apps/	hotglue/
	css/	zed/

	robots.txt
	perso.css

content/

scenes/

B00001001.tpl

B00001001/

couloir/

users/

	2600/
	1148/

NeuromancerIceDream1440x900.jpg

NeuromancerIceDream1440x900Square.jpg

controllers/

dev/

img/

map/

map-kub-top-build.png

includes/

content/

geo/

js/

builder/

map.js

lang/

en/

scenes.conf

skins/

zed/

builder_hotglue.tpl

builder_map.tpl

iframe.tpl

rZED093c1fbf82d4

View Options

README

View Options

apps/hotglue/COPYING

View Options

apps/hotglue/INSTALL

View Options

apps/hotglue/README

View Options

apps/hotglue/common.inc.php

View Options

apps/hotglue/config.inc.php

View Options

apps/hotglue/controller.inc.php

View Options

apps/hotglue/css/.htaccess

View Options

apps/hotglue/css/create_page.css

View Options

apps/hotglue/css/edit.css

View Options

apps/hotglue/css/farbtastic.css

View Options

apps/hotglue/css/glue.css

View Options

apps/hotglue/css/main.css

View Options

apps/hotglue/css/reset.css

View Options

apps/hotglue/css/reset.min.css

View Options

apps/hotglue/doc/.htaccess

View Options

apps/hotglue/doc/Doxyfile

View Options

apps/hotglue/doc/html/common_8inc_8php.html

View Options

apps/hotglue/doc/html/config_8inc_8php.html

View Options

apps/hotglue/doc/html/controller_8inc_8php.html

View Options

apps/hotglue/doc/html/doxygen.css

View Options

apps/hotglue/doc/html/doxygen.png

View Options

apps/hotglue/doc/html/files.html

View Options

apps/hotglue/doc/html/globals.html

View Options

apps/hotglue/doc/html/globals_enum.html

View Options

apps/hotglue/doc/html/globals_func.html

View Options

apps/hotglue/doc/html/globals_vars.html

View Options

apps/hotglue/doc/html/html_8inc_8php.html

View Options

apps/hotglue/doc/html/html__parse_8inc_8php.html

View Options

apps/hotglue/doc/html/index.html

View Options

apps/hotglue/doc/html/index_8php.html

View Options

apps/hotglue/doc/html/json_8php.html

View Options

apps/hotglue/doc/html/log_8inc_8php.html

View Options

apps/hotglue/doc/html/module__download_8inc_8php.html

View Options

apps/hotglue/doc/html/module__glue_8inc_8php.html

View Options

apps/hotglue/doc/html/module__iframe_8inc_8php.html

View Options

apps/hotglue/doc/html/module__image_8inc_8php.html

View Options

apps/hotglue/doc/html/module__object_8inc_8php.html

View Options

apps/hotglue/doc/html/module__page_8inc_8php.html

View Options

apps/hotglue/doc/html/modulepagebrowser_8inc_8php.html

View Options

apps/hotglue/doc/html/modulerevisionsbrowser_8inc_8php.html

View Options

apps/hotglue/doc/html/module__text_8inc_8php.html

View Options

apps/hotglue/doc/html/module__video_8inc_8php.html

View Options

apps/hotglue/doc/html/modules_8inc_8php.html

View Options

apps/hotglue/doc/html/tab_b.gif

View Options

apps/hotglue/doc/html/tab_l.gif

View Options

apps/hotglue/doc/html/tab_r.gif

View Options

apps/hotglue/doc/html/tabs.css

View Options

apps/hotglue/doc/html/util_8inc_8php.html

View Options

apps/hotglue/doc/latex/FreeSans.ttf

View Options

apps/hotglue/doc/latex/Makefile

View Options

apps/hotglue/doc/latex/common_8inc_8php.tex

View Options

apps/hotglue/doc/latex/config_8inc_8php.tex

View Options

apps/hotglue/doc/latex/controller_8inc_8php.tex

View Options

apps/hotglue/doc/latex/doxygen.sty

View Options

apps/hotglue/doc/latex/files.tex

View Options

apps/hotglue/doc/latex/html_8inc_8php.tex

View Options

apps/hotglue/doc/latex/html__parse_8inc_8php.tex

View Options

apps/hotglue/doc/latex/index_8php.tex

View Options

apps/hotglue/doc/latex/json_8php.tex

View Options

apps/hotglue/doc/latex/log_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__download_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__glue_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__iframe_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__image_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__object_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__page_8inc_8php.tex

View Options

apps/hotglue/doc/latex/modulepagebrowser_8inc_8php.tex

View Options

apps/hotglue/doc/latex/modulerevisionsbrowser_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__text_8inc_8php.tex

View Options

apps/hotglue/doc/latex/module__video_8inc_8php.tex

View Options

apps/hotglue/doc/latex/modules_8inc_8php.tex

View Options

apps/hotglue/doc/latex/refman.tex

View Options

apps/hotglue/doc/latex/util_8inc_8php.tex

View Options

apps/hotglue/htaccess-dist

View Options

apps/hotglue/html.inc.php

View Options

apps/hotglue/html_parse.inc.php

View Options

apps/hotglue/img/.htaccess

View Options

apps/hotglue/img/background-color.png

View Options

apps/hotglue/img/colorpicker-transparent.png

View Options

apps/hotglue/img/download.png

View Options

apps/hotglue/img/farbtastic-marker.png

View Options

apps/hotglue/img/farbtastic-mask.png

View Options

apps/hotglue/img/farbtastic-wheel.png

View Options

apps/hotglue/img/favicon.ico

View Options

apps/hotglue/img/upload.png

View Options

apps/hotglue/index.php

View Options

apps/hotglue/js/.htaccess

View Options

apps/hotglue/js/create_page.js

View Options

apps/hotglue/js/edit.js

View Options

apps/hotglue/js/farbtastic.js

View Options

apps/hotglue/js/farbtastic.min.js

View Options

apps/hotglue/js/glue.js

View Options

apps/hotglue/js/jquery-1.4.4.js

View Options

apps/hotglue/js/jquery-1.4.4.min.js

View Options

apps/hotglue/js/jquery-ui-1.8.6.custom.js

View Options

apps/hotglue/js/jquery-ui-1.8.6.custom.min.js

View Options

apps/hotglue/js/jquery.xcolor-1.2.1.js

View Options

apps/hotglue/json.php

View Options

apps/hotglue/log.inc.php

View Options

apps/hotglue/module_download.inc.php

View Options

apps/hotglue/module_glue.inc.php

View Options

apps/hotglue/module_iframe.inc.php

View Options

apps/hotglue/module_image.inc.php

View Options

apps/hotglue/module_object.inc.php

View Options

apps/hotglue/module_page.inc.php

View Options

apps/hotglue/module_page_browser.inc.php

View Options

apps/hotglue/module_revisions_browser.inc.php

View Options

apps/hotglue/module_text.inc.php

View Options

apps/hotglue/module_user_css.inc.php

View Options

apps/hotglue/module_video.inc.php

View Options

apps/hotglue/module_webvideo.inc.php

View Options

apps/hotglue/modules.inc.php

View Options

apps/hotglue/modules/.htaccess

View Options

apps/hotglue/modules/code/code.png

View Options

apps/hotglue/modules/download/download-edit.js

View Options

apps/hotglue/modules/download/download-file.png

View Options

apps/hotglue/modules/download/download-public.png

View Options

apps/hotglue/modules/download/download.css

View Options

apps/hotglue/modules/iframe/iframe-edit.css

View Options

apps/hotglue/modules/iframe/iframe-edit.js

View Options

apps/hotglue/modules/iframe/iframe-scroll.png

View Options

apps/hotglue/modules/iframe/iframe-url.png

View Options

apps/hotglue/modules/iframe/iframe.png

View Options

apps/hotglue/modules/image/image-edit.js

View Options

apps/hotglue/modules/image/image-pos.png

View Options

apps/hotglue/modules/image/image-ratio.png

View Options

apps/hotglue/modules/image/image-tile.png

View Options

apps/hotglue/modules/object/object-clone.png

View Options

apps/hotglue/modules/object/object-delete.png

View Options

apps/hotglue/modules/object/object-edit.js

View Options

apps/hotglue/modules/object/object-link.png

View Options

apps/hotglue/modules/object/object-symlink.png

View Options

apps/hotglue/modules/object/object-transparency.png

View Options

apps/hotglue/modules/object/object-zindex.png

View Options

apps/hotglue/modules/page/page-delete.png

View Options

apps/hotglue/modules/page/page-edit.js

View Options

apps/hotglue/modules/page/page-grid.png

View Options

apps/hotglue/modules/page/page-new.png

View Options

apps/hotglue/modules/page/page-set-startpage.png

View Options

apps/hotglue/modules/page/page-title.png

View Options

apps/hotglue/modules/page/page-url.png

View Options

apps/hotglue/modules/page_browser/page_browser-edit.js

View Options

apps/hotglue/modules/page_browser/page_browser.css

View Options

apps/hotglue/modules/page_browser/page_browser.js

View Options

apps/hotglue/modules/page_browser/page_browser.png

View Options

apps/hotglue/modules/revisions_browser/revisions_browser-edit.js

View Options

apps/hotglue/modules/revisions_browser/revisions_browser.css

View Options

apps/hotglue/modules/revisions_browser/revisions_browser.js

View Options

apps/hotglue/modules/revisions_browser/revisions_browser.png

View Options

apps/hotglue/modules/text/text-align.png

View Options

apps/hotglue/modules/text/text-background-color.png

View Options

apps/hotglue/modules/text/text-background-transparent.png

View Options

apps/hotglue/modules/text/text-edit.css

View Options

apps/hotglue/modules/text/text-edit.js

View Options

apps/hotglue/modules/text/text-font-color.png

View Options

apps/hotglue/modules/text/text-font-face.png

View Options

apps/hotglue/modules/text/text-font-size.png

View Options

apps/hotglue/modules/text/text-font-style.png

View Options

apps/hotglue/modules/text/text-letter-spacing.png

View Options

apps/hotglue/modules/text/text-line-height.png

View Options

apps/hotglue/modules/text/text-padding.png

View Options

apps/hotglue/modules/text/text-scroll-off.png

View Options

apps/hotglue/modules/text/text-scroll-on.png

View Options

apps/hotglue/modules/text/text-word-spacing.png

View Options

apps/hotglue/modules/text/text.png

View Options

apps/hotglue/modules/user_css/user_css.css

View Options

apps/hotglue/modules/user_css/user_css.js

View Options

apps/hotglue/modules/video/video-autoplay-off.png

View Options

apps/hotglue/modules/video/video-autoplay-on.png

View Options

apps/hotglue/modules/video/video-controls-off.png

View Options

apps/hotglue/modules/video/video-controls-on.png

View Options

apps/hotglue/modules/video/video-edit.css

View Options

apps/hotglue/modules/video/video-edit.js

View Options

apps/hotglue/modules/video/video-loop-off.png

View Options

apps/hotglue/modules/video/video-loop-on.png

View Options

apps/hotglue/modules/video/video-mute-off.png

View Options

apps/hotglue/modules/video/video-mute-on.png

View Options

apps/hotglue/modules/video/video-ratio.png

View Options

apps/hotglue/modules/video/video.css

View Options

apps/hotglue/modules/video/video.png

View Options

apps/hotglue/modules/webvideo/webvideo-autoplay-off.png

View Options

apps/hotglue/modules/webvideo/webvideo-autoplay-on.png

View Options

apps/hotglue/modules/webvideo/webvideo-edit.css

View Options

apps/hotglue/modules/webvideo/webvideo-edit.js

View Options

apps/hotglue/modules/webvideo/webvideo-handle.png

View Options

apps/hotglue/modules/webvideo/webvideo-loop-off.png

View Options

apps/hotglue/modules/webvideo/webvideo-loop-on.png

View Options

apps/hotglue/modules/webvideo/webvideo.png

View Options

apps/hotglue/robots.txt

View Options

apps/hotglue/util.inc.php

View Options

content/scenes/B00001001.tpl

View Options

content/scenes/B00001001/couloir/info.png

View Options

content/scenes/B00001001/tower.js

View Options

content/scenes/B00001002.tpl

View Options

content/scenes/B00001002_C0.tpl

View Options

content/users/2600/NeuromancerIceDream1440x900.jpg

View Options

content/users/2600/NeuromancerIceDream1440x900Square.jpg

View Options

controllers/builder.php

View Options

controllers/footer.php

View Options

controllers/home.php

View Options

dev/quux.php

View Options

do.php

View Options

img/map/map-kub-top-build.png

View Options

img/map/map-kub-top-mine.png

View Options

img/map/map-kub-top.png

View Options

img/map/zone-build.png

View Options

img/map/zone-edit.png

View Options

img/map/zone-goto.png

View Options

includes/content/zone.php

View Options

includes/geo/octocube.php

View Options

includes/geo/pointPolarZ.php

View Options

includes/geo/scene.php

View Options

index.php

View Options

js/builder/map.js

View Options

lang/en/scenes.conf

View Options

skins/zed/builder_hotglue.tpl

View Options

skins/zed/builder_map.tpl

View Options

[Repo Maintenance] Merging with builder-hotglue branch.093c1fbf82d4UnpublishedActions

Unpublished Commit · Learn More

Description

Details

Event Timeline

Merged Changes

Changes (242)

rZED093c1fbf82d4

README

apps/hotglue/COPYING

apps/hotglue/INSTALL

apps/hotglue/README

apps/hotglue/common.inc.php

apps/hotglue/config.inc.php

apps/hotglue/controller.inc.php

apps/hotglue/css/.htaccess

apps/hotglue/css/create_page.css

apps/hotglue/css/edit.css

apps/hotglue/css/farbtastic.css

apps/hotglue/css/glue.css

apps/hotglue/css/main.css

apps/hotglue/css/reset.css

apps/hotglue/css/reset.min.css

apps/hotglue/doc/.htaccess

apps/hotglue/doc/Doxyfile

apps/hotglue/doc/html/common_8inc_8php.html

apps/hotglue/doc/html/config_8inc_8php.html

apps/hotglue/doc/html/controller_8inc_8php.html

apps/hotglue/doc/html/doxygen.css

apps/hotglue/doc/html/doxygen.png

apps/hotglue/doc/html/files.html

apps/hotglue/doc/html/globals.html

apps/hotglue/doc/html/globals_enum.html

apps/hotglue/doc/html/globals_func.html

apps/hotglue/doc/html/globals_vars.html

apps/hotglue/doc/html/html_8inc_8php.html

apps/hotglue/doc/html/html__parse_8inc_8php.html

apps/hotglue/doc/html/index.html

apps/hotglue/doc/html/index_8php.html

apps/hotglue/doc/html/json_8php.html

apps/hotglue/doc/html/log_8inc_8php.html

apps/hotglue/doc/html/module__download_8inc_8php.html

apps/hotglue/doc/html/module__glue_8inc_8php.html

apps/hotglue/doc/html/module__iframe_8inc_8php.html

apps/hotglue/doc/html/module__image_8inc_8php.html

apps/hotglue/doc/html/module__object_8inc_8php.html

apps/hotglue/doc/html/module__page_8inc_8php.html

apps/hotglue/doc/html/module__page__browser_8inc_8php.html

apps/hotglue/doc/html/module__revisions__browser_8inc_8php.html

apps/hotglue/doc/html/module__text_8inc_8php.html

apps/hotglue/doc/html/module__video_8inc_8php.html

apps/hotglue/doc/html/modules_8inc_8php.html

apps/hotglue/doc/html/tab_b.gif

apps/hotglue/doc/html/tab_l.gif

apps/hotglue/doc/html/tab_r.gif

apps/hotglue/doc/html/tabs.css

apps/hotglue/doc/html/util_8inc_8php.html

apps/hotglue/doc/latex/FreeSans.ttf

apps/hotglue/doc/latex/Makefile

apps/hotglue/doc/latex/common_8inc_8php.tex

apps/hotglue/doc/latex/config_8inc_8php.tex

apps/hotglue/doc/latex/controller_8inc_8php.tex

apps/hotglue/doc/latex/doxygen.sty

apps/hotglue/doc/latex/files.tex

apps/hotglue/doc/latex/html_8inc_8php.tex

apps/hotglue/doc/latex/html__parse_8inc_8php.tex

apps/hotglue/doc/latex/index_8php.tex

apps/hotglue/doc/latex/json_8php.tex

apps/hotglue/doc/latex/log_8inc_8php.tex

apps/hotglue/doc/latex/module__download_8inc_8php.tex

apps/hotglue/doc/latex/module__glue_8inc_8php.tex

apps/hotglue/doc/latex/module__iframe_8inc_8php.tex

apps/hotglue/doc/latex/module__image_8inc_8php.tex

apps/hotglue/doc/latex/module__object_8inc_8php.tex

apps/hotglue/doc/latex/module__page_8inc_8php.tex

apps/hotglue/doc/latex/module__page__browser_8inc_8php.tex

apps/hotglue/doc/latex/module__revisions__browser_8inc_8php.tex

apps/hotglue/doc/latex/module__text_8inc_8php.tex

apps/hotglue/doc/latex/module__video_8inc_8php.tex

apps/hotglue/doc/latex/modules_8inc_8php.tex

[Repo Maintenance] Merging with builder-hotglue branch.
093c1fbf82d4Unpublished
Actions

apps/hotglue/doc/html/modulepagebrowser_8inc_8php.html

apps/hotglue/doc/html/modulerevisionsbrowser_8inc_8php.html

apps/hotglue/doc/latex/modulepagebrowser_8inc_8php.tex

apps/hotglue/doc/latex/modulerevisionsbrowser_8inc_8php.tex