Ryan Huffman
84e7b1598c
Merge remote-tracking branch 'upstream/master' into RunningScripts
2014-04-25 08:45:54 -07:00
Clément Brisset
fd8ec9b5c2
Merge pull request #2723 from huffman/19554-2
...
19554 - Chat Updates
2014-04-24 16:44:22 -07:00
Ryan Huffman
d88897ccc7
Add error box when going to user/location that doesn't exist
2014-04-24 15:55:34 -07:00
Mohammed Nafees
29d64373b4
Merge branch master
2014-04-24 18:52:59 +05:30
Atlante45
ddf14b0842
Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday
2014-04-22 10:22:30 -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
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
16cd2ca5c3
Merge pull request #2680 from SydoxX/master
...
URL scheme to go to location
2014-04-18 15:34:12 -07:00
Thijs Wenker
d2d3937e08
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-18 20:58:36 +02:00
Andrzej Kapolka
21fa833f19
Merge branch 'master' of https://github.com/highfidelity/hifi into animate
...
Conflicts:
interface/src/Application.cpp
libraries/shared/src/SharedUtil.cpp
libraries/shared/src/SharedUtil.h
2014-04-17 10:58:34 -07:00
Thijs Wenker
b2e969d1c5
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-17 13:03:44 +02:00
Konstantin
fca4e2abba
Update Application.h
2014-04-17 00:09:58 +02:00
Konstantin
d55fb60862
Added urlGoTo
2014-04-17 00:03:33 +02:00
Andrzej Kapolka
8cbad1bf54
More work on animation loading.
2014-04-15 19:37:28 -07:00
Thijs Wenker
af47510b05
Initial script editor widget / icons made by MaximillianMerlin ty
2014-04-15 00:30:01 +02:00
ZappoMan
7a993939bf
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
Andrew Meadows
5ac7be8945
merge upstream/master -> andrew/inertia
2014-04-11 12:20:00 -07:00
Andrzej Kapolka
d6534d6026
Tweak to zoom on pushback.
2014-04-11 11:10:22 -07:00
Andrew Meadows
a436b59971
save settings for change in: identity, position
2014-04-10 17:14:51 -07:00
Philip Rosedale
e08dfeae2a
Merge pull request #2642 from Atlante45/persistant_script_location
...
Persistant script location
2014-04-09 22:16:20 -07:00
Philip Rosedale
de6b55644b
Merge pull request #2636 from ey6es/faceplus
...
Basic Faceplus integration, cleanup for handling the various face trackers.
2014-04-09 22:13:34 -07:00
Atlante45
fad71266a1
Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location
2014-04-09 17:35:12 -07:00
Stephen Birarda
cf47418d58
remove the audio scope
2014-04-09 17:16:29 -07:00
Atlante45
e33da2a741
Some QSettings cleanup + persistant script location
2014-04-09 17:08:50 -07:00
Andrzej Kapolka
f707719f4e
Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus
2014-04-09 15:34:29 -07:00
Andrzej Kapolka
ead05c4d99
Tab fixes.
2014-04-09 15:22:53 -07:00
Andrzej Kapolka
cbfaf9709e
Faceplus fixes.
2014-04-09 15:18:22 -07:00
Andrzej Kapolka
28d3eae12b
Move Faceplus reading to its own thread to avoid blocking the main one.
2014-04-09 14:52:27 -07:00
Stephen Birarda
ae4b8348a2
fix header include guards via regex
2014-04-09 12:03:17 -07:00
Andrzej Kapolka
5b0e7f818d
More work on Faceplus integration/cleaning up support for multiple face
...
trackers.
2014-04-08 18:03:49 -07:00
Stephen Birarda
6a51df9e38
initial regex replacement of headers
2014-04-08 17:30:36 -07:00
Brad Hefta-Gaub
8e097be28d
Merge pull request #2614 from Atlante45/undo_redo_system
...
Undo redo system
2014-04-08 08:30:29 -10:00
Mohammed Nafees
ba7c696786
child like behaviour for the widget
2014-04-08 23:38:49 +05:30
Andrzej Kapolka
38022d2440
Fix for voxelizing models.
2014-04-04 00:33:33 -07:00
Atlante45
d3ce2c7640
Added undo/redo support to the client
2014-04-03 16:51:08 -07:00
Atlante45
42f47f5db2
Some alphabetical cleaning
2014-04-03 16:48:56 -07:00
Lucas Crisman
793179dc72
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-03 16:24:32 -03:00
Mohammed Nafees
f3121e1bf6
Removed the animation, placed UI elements according to mockup
2014-04-03 22:33:45 +05:30
Mohammed Nafees
2ef8277d0f
Make the widget move and resize along with the main window
2014-04-03 18:04:26 +05:30
Atlante45
4a1687c023
Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD
...
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
2014-04-02 18:16:30 -07:00
Atlante45
5acc8313ba
Manual merge
2014-04-02 18:07:55 -07:00
ZappoMan
ec9884833b
first cut at reflections
2014-04-02 17:45:34 -07:00
Andrew Meadows
aad945c180
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:45:01 -07:00
Mohammed Nafees
0fa910c61f
fix ubuntu build error
2014-04-02 16:16:23 +05:30
Mohammed Nafees
5e8bd8d050
Resolve conflicts
2014-04-02 13:00:48 +05:30
Mohammed Nafees
d85d4fea5d
Added the new Running Scripts widget
2014-04-02 12:46:57 +05:30
Lucas Crisman
1a468ab8ca
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-04-02 01:26:25 -03:00
AndrewMeadows
f12da05722
Merge pull request #2581 from Atlante45/more_upload_fixes
...
More upload fixes
2014-04-01 09:51:25 -07:00
