Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions GlowScriptOffline/GlowScript.html
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<script type="text/javascript" src="glowscript_libraries/jquery.min.js"></script>
<script type="text/javascript" src="glowscript_libraries/jquery-ui.custom.min.js"></script>
<script type="text/javascript" src="glowscript_libraries/editor.js"></script>
<script type="text/javascript" src="glowscript_libraries/RSrun.2.9.min.js"></script>
<script type="text/javascript" src="glowscript_libraries/glow.2.9.min.js" charset="UTF-8"></script>
<script type="text/javascript" src="glowscript_libraries/RSrun.3.0.min.js"></script>
<script type="text/javascript" src="glowscript_libraries/glow.3.0.min.js" charset="UTF-8"></script>
<script type="text/javascript" src="glowscript_libraries/split.min.js"></script>
<script type="text/javascript" src="glowscript_libraries/Roboto_Medium_ttf_sans.js"></script>
<script type="text/javascript" src="glowscript_libraries/NimbusRomNo9L_Med_otf_serif.js"></script>
Expand All @@ -60,7 +60,7 @@
<input type="file" id="read_local_file"/>

<script>
var gsversion = 2.9
var gsversion = 3.0
var printpane = false
var exporting = false // not currently in export mode
var lastprintwidth = null
Expand Down Expand Up @@ -230,7 +230,6 @@
'<div id="' + divid + '" class="glowscript">\n' +
'<meta http-equiv="Content-Type" content="text/html; charset=utf-8">' +
'<link type="text/css" href="'+exporturl+'css/redmond/' + verdir + '/jquery-ui.custom.css" rel="stylesheet" />\n' +
'<link href="https://fonts.googleapis.com/css?family=Inconsolata" rel="stylesheet" type="text/css" />\n' +
'<link type="text/css" href="' + exporturl + 'css/ide.css" rel="stylesheet" />\n' +
'<scr'+'ipt type="text/javascript" src="' + exporturl + 'lib/jquery/' + verdir + '/jquery.min.js"></scr'+'ipt>\n' +
'<scr'+'ipt type="text/javascript" src="' + exporturl + 'lib/jquery/' + verdir + '/jquery-ui.custom.min.js"></scr'+'ipt>\n' +
Expand Down

Large diffs are not rendered by default.

3 changes: 0 additions & 3 deletions GlowScriptOffline/glowscript_libraries/compiler.2.9.min.js

This file was deleted.

3 changes: 3 additions & 0 deletions GlowScriptOffline/glowscript_libraries/compiler.3.0.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Binary file added GlowScriptOffline3.0.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion build-tools/Symbols.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GlowScript 2.9
GlowScript 3.0
var ver = glowscript.version

console.log( glowscript.glowscript )
Expand Down
2 changes: 1 addition & 1 deletion build_original.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
shader_file = "\n".join(shader_file)
open("lib/glow/shaders.gen.js", "wb").write(shader_file)

version = "2.9"
version = "3.0"
# TODO: Extract this information from run.js

glowscript_libraries = {
Expand Down
64 changes: 0 additions & 64 deletions docs/GlowScriptDocs/MathJax.html

This file was deleted.

36 changes: 0 additions & 36 deletions docs/GlowScriptDocs/Templates/template.dwt

This file was deleted.

Loading