Ryan Huffman
|
d777e4be53
|
Merge branch 'master' of git://github.com/highfidelity/hifi into 19783
Conflicts:
interface/src/scripting/WindowScriptingInterface.cpp
interface/src/scripting/WindowScriptingInterface.h
|
2014-07-25 15:53:36 -07:00 |
|
Atlante45
|
c07ba9fec5
|
Added browser as a tool
|
2014-07-17 17:50:56 -07:00 |
|
Atlante45
|
7ab8b5a843
|
Added S3 browser
|
2014-07-17 17:12:54 -07:00 |
|
Atlante45
|
60f242118e
|
Code cleanup
|
2014-07-16 11:52:12 -07:00 |
|
Atlante45
|
f960b4fff3
|
new windows JS interface
|
2014-07-16 11:32:18 -07:00 |
|
Ryan Huffman
|
874b542c0c
|
Add import/export/paste model functionality to editModels.js
|
2014-07-09 04:13:53 -07:00 |
|
Ryan Huffman
|
5a5e628536
|
Add Window.browse to scripting environment
|
2014-05-01 10:51:58 -07:00 |
|
Ryan Huffman
|
a7dd19183e
|
Add default values for alert, confirm, and prompt
|
2014-04-30 19:02:28 -07:00 |
|
Ryan Huffman
|
9a44b2b2fb
|
Remove unneeded include in WindowScriptingInterface
|
2014-04-30 09:40:50 -07:00 |
|
Ryan Huffman
|
b9f296ddb3
|
Add WindowScriptingInterface and LocationScriptingInterface
|
2014-04-30 09:38:30 -07:00 |
|