ZappoMan
f53df4c597
removed velocity, gravity, etc from models
2014-04-30 14:18:35 -07:00
Ryan Huffman
6c3e1c6aa5
Update LoginDialog to be type Qt::WindowModality
...
Currently the login window will cover other windows, in particular
the "welcome" window that pops up for new users. This allows those
windows to be interacted with while still blocking interaction with the
main window.
2014-04-30 13:54:41 -07:00
ZappoMan
be3d307b27
added cmake support for STREAMABLE
2014-04-30 13:48:09 -07:00
Ryan Huffman
701fcd3542
Fix invalid check for null object in registerGetterSetter
2014-04-30 11:29:01 -07:00
Ryan Huffman
9e684a0bc8
Add registerGetterSetter to remove need for getEngine()
2014-04-30 11:17:36 -07:00
Atlante45
8cad705e2d
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
2014-04-30 11:13:07 -07:00
ZappoMan
0182a6d895
models working end to end
2014-04-30 11:12:49 -07:00
Thijs Wenker
7125b6ab8e
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
...
Conflicts:
interface/src/Application.cpp
2014-04-30 20:08:11 +02:00
Andrew Meadows
db9221da6e
fix misspelled slot
2014-04-30 10:38:42 -07:00
Ryan Huffman
65fd2a7724
Merge remote-tracking branch 'upstream/master' into 19612
...
Conflicts:
interface/src/Menu.cpp
2014-04-30 09:57:17 -07:00
Ryan Huffman
45beeaa8d5
Add dialog + location + window JS examples
2014-04-30 09:45:53 -07:00
Ryan Huffman
9a44b2b2fb
Remove unneeded include in WindowScriptingInterface
2014-04-30 09:40:50 -07:00
Ryan Huffman
0477706cb9
Add ScriptEngine::getEngine() to get internal QScriptEngine
2014-04-30 09:40:32 -07:00
Ryan Huffman
ff51b22bfe
Add Menu::goToUrl
2014-04-30 09:39:48 -07:00
Ryan Huffman
0570849df5
Add Window and location to global script object
2014-04-30 09:38:57 -07:00
Ryan Huffman
b9f296ddb3
Add WindowScriptingInterface and LocationScriptingInterface
2014-04-30 09:38:30 -07:00
ZappoMan
58c852d210
Merge branch 'master' of https://github.com/worklist/hifi into modelserver
2014-04-30 09:29:06 -07:00
ZappoMan
f993f984c9
first cut at modelserver
2014-04-30 09:26:14 -07:00
ZappoMan
aac42058ac
first cut at modelserver
2014-04-30 09:25:52 -07:00
Brad Hefta-Gaub
19b76e3331
Merge pull request #2750 from Atlante45/master
...
Fixed QLINE_MIN_WIDTH warning on mac
2014-04-30 09:19:09 -07:00
Brad Hefta-Gaub
84e231acfa
Merge pull request #2734 from huffman/RunningScripts
...
Running scripts
2014-04-30 09:18:53 -07:00
Thijs Wenker
c20381a0ea
EditorWindow on-top behavior fixed
2014-04-30 08:24:04 +02:00
Thijs Wenker
89aafd9c3f
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-30 07:58:29 +02:00
Philip Rosedale
53a2bb441a
Merge pull request #2749 from Atlante45/fixes
...
Only glow body + fixed display name scale
2014-04-29 17:40:29 -07:00
Atlante45
e9a01a39a2
Fixed QLINE_MIN_WIDTH warning on mac
2014-04-29 17:38:55 -07:00
Ryan Huffman
1551da9e99
Remove magic number in RunningScripts
2014-04-29 17:23:30 -07:00
Ryan Huffman
8ee90715bd
Revert changes to call to saveSettings in Application
2014-04-29 17:20:15 -07:00
Ryan Huffman
fa9e37daad
Remove unneeded qDebug()
2014-04-29 17:16:12 -07:00
Ryan Huffman
2ba0c8c237
Remove magic numbers from RunningScriptsWidget
2014-04-29 17:10:09 -07:00
Ryan Huffman
98a736a39c
Remove duplicate method declaration
2014-04-29 17:04:11 -07:00
Ryan Huffman
39c959d245
Clean up implementation of 1-9 in RunningScripts
2014-04-29 17:03:38 -07:00
Ryan Huffman
e0ec0f681f
Fix code not compliant with coding standards
2014-04-29 16:50:13 -07:00
Atlante45
7787cf97b6
Only glow body + fixed display name scale
2014-04-29 16:30:14 -07:00
Ryan Huffman
edcff0b67f
Merge remote-tracking branch 'upstream/master' into RunningScripts
...
Conflicts:
interface/src/Application.cpp
interface/src/ui/FramelessDialog.cpp
interface/src/ui/FramelessDialog.h
2014-04-29 16:28:36 -07:00
Thijs Wenker
e24b48bb17
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-30 00:58:59 +02:00
Thijs Wenker
87260a4c58
ability to load a script thats running from an external link into the ScriptEditor , followed by a save dialog
2014-04-30 00:58:22 +02:00
AndrewMeadows
a934ffb1d7
Merge pull request #2745 from ZappoMan/rayintersection
...
added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock
2014-04-29 15:29:02 -07:00
Stojce Slavkovski
785c9a3024
improved mention positioning
...
removed achive manager
2014-04-30 00:25:27 +02:00
Andrew Meadows
34aaf98b53
cleanup around how boundary shape is computed
2014-04-29 15:16:50 -07:00
Andrew Meadows
4e34d0339d
set position in ctor that takes endpoints
...
and some cleanup
2014-04-29 15:15:53 -07:00
ZappoMan
4aa96e1fbe
added support for returning accuracy of ray intersections and other octree tests that can fail due to getting lock
2014-04-29 15:10:28 -07:00
Atlante45
827e64ec0a
Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js
2014-04-29 14:56:36 -07:00
Thijs Wenker
5ea512f65a
ScriptEditorWindow not modal, but yet always on foreground
2014-04-29 23:53:46 +02:00
Thijs Wenker
14e9cb770c
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-29 23:30:15 +02:00
Brad Hefta-Gaub
8a823ee4c4
Merge pull request #2743 from Atlante45/clockSkew_win_bug
...
Clock skew win bug
2014-04-29 14:15:59 -07:00
Stephen Birarda
69e279e2c6
IC-1, remove some spaces in BuckyBalls
2014-04-29 14:05:16 -07:00
Atlante45
49eadac024
Bumped octree stats packet version
2014-04-29 13:52:07 -07:00
Stojce Slavkovski
ca2c8d2fff
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-04-29 22:31:47 +02:00
Thijs Wenker
d93f91a628
Resized ScriptEditorWindow
2014-04-29 22:17:45 +02:00
Thijs Wenker
2ba39f951a
Merge branch '19561' of https://github.com/thoys/hifi into 19561
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-04-29 22:07:03 +02:00
