Stojce Slavkovski
bcad49d0a9
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-06 01:05:13 +02:00
Andrew Meadows
5ffd307926
Merge upstream/master into andrew/inertia
...
Conflicts:
interface/src/avatar/MyAvatar.h
2014-05-05 13:54:25 -07:00
Stojce Slavkovski
01ebefde11
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-05 01:24:15 +02:00
Stojce Slavkovski
37664d3877
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-04 18:32:01 +02:00
Philip Rosedale
eb991b60ce
Remove dead ‘play slaps’ code
2014-05-03 09:08:26 -07:00
Stephen Birarda
aa2931d9bb
resolve conflicts on merge with upstream/master
2014-05-02 10:39:17 -07:00
Stephen Birarda
4936fb3857
expose access token from AccountManager
2014-05-02 10:34:29 -07:00
Stojce Slavkovski
23da9d85a4
Merge branch '19597' of https://github.com/stojce/hifi ; branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-02 18:47:45 +02:00
AndrewMeadows
05e5277084
Merge pull request #2764 from ZappoMan/modelserver
...
Model Server, Renderer, Scripting, etc
2014-05-01 15:39:12 -07:00
Stojce Slavkovski
c5bceed880
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-01 13:10:51 +02:00
Ryan Huffman
33ca387c86
Update goToURL to work with domains and user/location
...
If the path starts with # or @ it's a location or user, respectively,
otherwise it is a domain.
2014-04-30 21:12:04 -07:00
Stojce Slavkovski
d6b7dac649
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-05-01 01:41:11 +02:00
ZappoMan
0182a6d895
models working end to end
2014-04-30 11:12:49 -07: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
ff51b22bfe
Add Menu::goToUrl
2014-04-30 09:39:48 -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
Atlante45
e9a01a39a2
Fixed QLINE_MIN_WIDTH warning on mac
2014-04-29 17:38:55 -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
Stojce Slavkovski
ca2c8d2fff
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-04-29 22:31:47 +02:00
Clément Brisset
7c21fab50c
Merge pull request #2736 from SydoxX/master
...
Fix CustomUrl
2014-04-29 12:07:44 -07:00
Konstantin
ac8adad0e0
Remove 0,0,0 entry.
2014-04-29 20:49:20 +02:00
Stojce Slavkovski
d24b55871f
Merge branch 'master' of https://github.com/worklist/hifi into 19597
2014-04-29 19:05:16 +02:00
Clément Brisset
4c42a403e7
Merge pull request #2738 from huffman/19598
...
Login window
2014-04-28 19:28:50 -07:00
Andrew Meadows
c7dbc5984f
add local gravity option parameter for MyAvatar
2014-04-28 16:40:22 -07:00
Stojce Slavkovski
963ad64d07
Fixed online user presence in chat window
2014-04-28 23:49:59 +02:00
Andrew Meadows
a7c4b02f2d
merge new work into andrew/inertia
2014-04-28 09:52:06 -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
81a0cbe761
Update Menu to use new login dialog
2014-04-28 09:01:13 -07:00
Konstantin
ec410d105b
Fix CustomUrl
...
Fixed custom url so that hifi://domain/ works.
2014-04-27 00:31:28 +02:00
Stojce Slavkovski
5c7fb3eca5
Add chat mention notifications
2014-04-26 22:19:33 +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
Andrew Meadows
ecae89489e
mispelled slot
2014-04-25 14:13:44 -07:00
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
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
Andrew Meadows
f07a418a27
namechange CollisionFlags --> CollisionGroups
2014-04-24 11:07:49 -07:00
Mohammed Nafees
29d64373b4
Merge branch master
2014-04-24 18:52:59 +05:30
Andrzej Kapolka
0386dec2a6
Provide option to align wrists with forearms.
2014-04-23 12:09:54 -07:00
Ryan Huffman
c65d5f08ca
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-23 10:54:51 -07:00
Andrzej Kapolka
c471a55f1f
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-23 09:40:51 -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
matsukaze
ff7a1bd60f
Job #19574 . Add audio oscilloscope.'
2014-04-22 06:53:59 -04: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
Atlante45
05545b684d
Made glowing when speaking an option
2014-04-18 17:47:21 -07:00
Andrzej Kapolka
30248747d6
Provide a means of visualizing the joint constraints.
2014-04-18 14:26:34 -07:00
Thijs Wenker
d2d3937e08
Merge branch 'master' of https://github.com/highfidelity/hifi into 19561
2014-04-18 20:58:36 +02:00
ZappoMan
fa787adce2
added wet/dry mix, and alternate distance attenuation features
2014-04-18 08:55:32 -07:00
Ryan Huffman
a552d48401
Merge remote-tracking branch 'upstream/master' into 19554-2
2014-04-17 20:02:05 -07:00
