Thijs Wenker
a33c18c15d
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-05-01 14:49:50 +02:00
Ryan Huffman
9e684a0bc8
Add registerGetterSetter to remove need for getEngine()
2014-04-30 11:17:36 -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
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
0570849df5
Add Window and location to global script object
2014-04-30 09:38:57 -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
e0ec0f681f
Fix code not compliant with coding standards
2014-04-29 16:50:13 -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
14e9cb770c
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-29 23:30:15 +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
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
Andrew Meadows
c7dbc5984f
add local gravity option parameter for MyAvatar
2014-04-28 16:40:22 -07: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
Andrew Meadows
b05a315b5a
merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.cpp
2014-04-25 14:52:44 -07:00
Ryan Huffman
225c022511
Update RunningScriptsWidget to use FramelessDialog
2014-04-25 10:10:50 -07:00
Ryan Huffman
84e7b1598c
Merge remote-tracking branch 'upstream/master' into RunningScripts
2014-04-25 08:45:54 -07:00
Andrew Meadows
0b5c1b0a9a
add MyAvatar::_motionBehaviors (for obeyGravity)
...
Also reconcile Menu checkable set vs script-set collision groups.
2014-04-24 15:43:03 -07:00
Leonardo Murillo
a21991c5c2
Fixing xml parsing
2014-04-24 16:22:34 -06:00
Leonardo Murillo
f4c98a8fa4
Fixing xml parsing
2014-04-24 16:21:49 -06:00
Leonardo Murillo
27002a9406
Casting to QUrl
2014-04-24 15:10:37 -06:00
Leonardo Murillo
ad0f0118bc
fixes for new versioning:
2014-04-24 15:01:37 -06:00
Mohammed Nafees
29d64373b4
Merge branch master
2014-04-24 18:52:59 +05:30
Mohammed Nafees
dd74ea64e7
Further changes for child like behaviour
2014-04-24 17:18:24 +05:30
Atlante45
f68d2d16a8
Inserted a char by mistake
2014-04-23 11:05:16 -07:00
Atlante45
ceb5208102
CR
2014-04-23 11:00:44 -07:00
Atlante45
ae566c55f6
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-23 10:38:29 -07:00
Philip Rosedale
ee929f2551
Merge pull request #2712 from matsukaze/master
...
Job #19574 . Add new audio oscilloscope.
2014-04-22 20:22:57 -07:00
AndrewMeadows
94fabf7875
Merge pull request #2709 from ZappoMan/shared_and_weak_pointers
...
Voxel/Particle Server Performance Improvements
2014-04-22 10:28:39 -07:00
Atlante45
ddf14b0842
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-22 10:22:30 -07:00
Thijs Wenker
59cc930556
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-22 13:12:38 +02:00
matsukaze
6e575bc8af
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-22 06:54:53 -04:00
matsukaze
ff7a1bd60f
Job #19574 . Add audio oscilloscope.'
2014-04-22 06:53:59 -04:00
Atlante45
fd20686f0f
Removed Systime.h includes
2014-04-21 17:23:06 -07:00
Atlante45
681aab5bf0
Remove printf and replace them by qDebug()
2014-04-21 16:17:45 -07:00
Atlante45
0479aaba46
Some gettimeofday removal fixes
2014-04-21 15:26:43 -07:00
Atlante45
f7f30e118c
More gettimeofday cleanup
2014-04-21 15:17:11 -07:00
Thijs Wenker
9faee0d82d
- Style
...
- Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.
2014-04-21 21:37:49 +02:00
ZappoMan
25a859f95e
Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers
2014-04-21 10:12:34 -07:00
Thijs Wenker
23068b0356
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-21 05:26:42 +02:00
Thijs Wenker
c016d6557e
- few Adjustments in Application class for Script editor
...
- Shortkey for script editor (Alt+S)
- highlighter: bold true/false , single line comments
- Run scripts from the editor works
- More icons from Maximillian, Thanks
- Run on the fly checkbox, works if the script is running.
- Load/save features
2014-04-21 05:25:28 +02:00
Brad Hefta-Gaub
b9dd276e32
Merge pull request #2700 from SydoxX/PageUp/Down
...
Add PageUp/Down to controls
2014-04-20 20:20:14 -07:00
Konstantin
615f8b8dad
Fix spacing
2014-04-19 16:35:48 +02:00
Konstantin
6c376d6fa6
Add PageUp/Down to controls
...
When you press PageUp/Down now you fly up and down.
2014-04-19 15:02:57 +02:00
Atlante45
8a7a590602
Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool
...
Conflicts:
interface/src/ui/Stats.cpp
2014-04-18 16:07:08 -07:00
Atlante45
aa73527157
Some code cleaning
2014-04-18 15:58:56 -07:00
Brad Hefta-Gaub
16cd2ca5c3
Merge pull request #2680 from SydoxX/master
...
URL scheme to go to location
2014-04-18 15:34:12 -07:00
ZappoMan
334f688e4e
add support for sending unverified datagrams to nodes
2014-04-18 15:30:45 -07:00
