Thijs Wenker
|
cf1baaf6ea
|
- Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition)
- Line numbers in ScriptEditor
|
2014-04-30 23:32:41 +02: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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Thijs Wenker
|
fc2ed9f9fb
|
Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.
|
2014-04-29 22:03:51 +02:00 |
|
Thijs Wenker
|
df14e1e6e4
|
Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.
|
2014-04-29 21:51:20 +02:00 |
|
Clément Brisset
|
7c21fab50c
|
Merge pull request #2736 from SydoxX/master
Fix CustomUrl
|
2014-04-29 12:07:44 -07:00 |
|
Konstantin
|
65706ae5f7
|
Re-add customUrl.startWith
|
2014-04-29 20:59:33 +02:00 |
|
Konstantin
|
14b91aa04b
|
Remove 0,0,0 entry
|
2014-04-29 20:49:40 +02:00 |
|
Konstantin
|
ac8adad0e0
|
Remove 0,0,0 entry.
|
2014-04-29 20:49:20 +02:00 |
|
Clément Brisset
|
02d527baae
|
Merge pull request #2740 from stojce/19617
Code Review for Job #19617
|
2014-04-29 11:29:12 -07:00 |
|
Thijs Wenker
|
4bdc945f94
|
Changed font sizes in script-editor to pixels, it should he readable in both Windows and OSX now
|
2014-04-29 20:12:16 +02:00 |
|
Clément Brisset
|
4c42a403e7
|
Merge pull request #2738 from huffman/19598
Login window
|
2014-04-28 19:28:50 -07:00 |
|
Ryan Huffman
|
87c10e70cd
|
Add parentheses around conditionals for clarity
|
2014-04-28 18:31:50 -07:00 |
|
Andrew Meadows
|
ae3b58a33f
|
use setGravity() instead of setting it directly
|
2014-04-28 16:46:16 -07:00 |
|
Andrew Meadows
|
c7dbc5984f
|
add local gravity option parameter for MyAvatar
|
2014-04-28 16:40:22 -07:00 |
|
Stojce Slavkovski
|
9f070406ed
|
missing 'extra debugging' check icon; fix font
|
2014-04-29 00:02:24 +02:00 |
|
Ryan Huffman
|
24350761ac
|
Update layout of login messages and move text to .ui file
|
2014-04-28 13:16:50 -07:00 |
|
Ryan Huffman
|
46d4a31f01
|
Update login images
|
2014-04-28 13:16:06 -07:00 |
|
Ryan Huffman
|
d5d440eec5
|
Update font on login window
|
2014-04-28 12:04:28 -07:00 |
|
Ryan Huffman
|
6f502777a5
|
Update forgot password URL
|
2014-04-28 12:03:54 -07:00 |
|
Andrew Meadows
|
a7c4b02f2d
|
merge new work into andrew/inertia
|
2014-04-28 09:52:06 -07:00 |
|
Ryan Huffman
|
fb42d9ccc6
|
Update login to move focus to password on fail
|
2014-04-28 09:21:37 -07:00 |
|
Ryan Huffman
|
45fdd00608
|
Merge remote-tracking branch 'upstream/master' into 19598
Conflicts:
interface/src/ui/FramelessDialog.h
|
2014-04-28 09:13:00 -07:00 |
|
Ryan Huffman
|
01f66420de
|
Fix issue with icon being disabled on login window while authenticating
|
2014-04-28 09:11:09 -07:00 |
|
Ryan Huffman
|
81a0cbe761
|
Update Menu to use new login dialog
|
2014-04-28 09:01:13 -07:00 |
|
Ryan Huffman
|
9bf3b3c6bf
|
Add hideOnBlur and TOP position to FramelessDialog
|
2014-04-28 08:59:28 -07:00 |
|
Ryan Huffman
|
23397a4b10
|
Add LoginDialog
|
2014-04-28 08:55:03 -07:00 |
|
Konstantin
|
ec410d105b
|
Fix CustomUrl
Fixed custom url so that hifi://domain/ works.
|
2014-04-27 00:31:28 +02:00 |
|
Konstantin
|
f829a5b323
|
Fix CustomUrl
Fixed custom url so that hifi://domain/ works. Also goes earlier to the location.
|
2014-04-27 00:29:38 +02:00 |
|
Ryan Huffman
|
f889cef3aa
|
Remove the ability to drag the RunningScripts window
|
2014-04-25 16:15:11 -07:00 |
|
Ryan Huffman
|
792ab7e17e
|
Update icon for Load Script button
|
2014-04-25 15:57:10 -07:00 |
|
Andrew Meadows
|
b05a315b5a
|
merge upstream/master into andrew/inertia
Conflicts:
interface/src/avatar/MyAvatar.cpp
|
2014-04-25 14:52:44 -07:00 |
|