Stephen Birarda
|
7067cf2ab3
|
fix go to user and address update for new API
|
2014-02-26 13:40:49 -08:00 |
|
Andrzej Kapolka
|
1265f83f68
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-02-26 12:12:18 -08:00 |
|
Andrzej Kapolka
|
8644280eb5
|
Make sure our mode is fully established before we use the mirror camera to
render the billboard. Closes #2103.
|
2014-02-26 12:11:03 -08:00 |
|
Philip Rosedale
|
46469612c7
|
Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing
Remove cpp voxel editing
|
2014-02-25 22:07:54 -08:00 |
|
ZappoMan
|
f2b95e0a00
|
added a comment
|
2014-02-25 21:54:52 -08:00 |
|
ZappoMan
|
5fdf114ff0
|
removed more cruft
|
2014-02-25 21:53:20 -08:00 |
|
ZappoMan
|
d61ba02a38
|
removed more cruft
|
2014-02-25 21:44:38 -08:00 |
|
ZappoMan
|
869b35a7aa
|
remove old c++ implementation of voxel tools
|
2014-02-25 21:38:10 -08:00 |
|
ZappoMan
|
d3594808d9
|
some cruft cleanup
|
2014-02-25 20:45:49 -08:00 |
|
ZappoMan
|
d765e250d5
|
removed AbstractMenuInterface.h
|
2014-02-25 20:42:59 -08:00 |
|
ZappoMan
|
42ddc82ac4
|
possible fix to windows assert
|
2014-02-25 20:23:38 -08:00 |
|
ZappoMan
|
d4c36acd7d
|
fix windows warning
|
2014-02-25 18:43:31 -08:00 |
|
ZappoMan
|
4b3911c5c1
|
Merge pull request #2101 from birarda/authentication
fixes to login/logout flow when jumping domains
|
2014-02-25 18:25:17 -08:00 |
|
Stephen Birarda
|
bf3b5c07d5
|
Merge pull request #2093 from ZappoMan/menu_js
Adds support for editing application Menus to JS
|
2014-02-25 17:40:39 -08:00 |
|
ZappoMan
|
3943c49dcc
|
rename MenuType and other CR feedback
|
2014-02-25 17:32:16 -08:00 |
|
Andrzej Kapolka
|
8554c1dfbf
|
Force a minimum convergence distance on the eyes. Closes #2100.
|
2014-02-25 16:50:59 -08:00 |
|
Andrzej Kapolka
|
5d99b06a48
|
Use hysteresis to prevent rapid enabling and disabling of billboard. Closes
|
2014-02-25 16:12:58 -08:00 |
|
Stephen Birarda
|
d5fc1caaaf
|
fix wording for access token change signal
|
2014-02-25 16:12:25 -08:00 |
|
Stephen Birarda
|
2496c6252f
|
fix login/logout flow when jumping domains
|
2014-02-25 16:10:08 -08:00 |
|
Andrzej Kapolka
|
038f1acf01
|
Don't render the hover text in mirror/billboard mode. Closes #2098.
|
2014-02-25 15:34:16 -08:00 |
|
Andrzej Kapolka
|
c588a33b01
|
Slight mapping improvement.
|
2014-02-25 15:07:19 -08:00 |
|
ZappoMan
|
81bff60645
|
change singleton approach to not require delete
|
2014-02-25 14:53:57 -08:00 |
|
Andrzej Kapolka
|
55f4f65bc0
|
Parse error fix.
|
2014-02-25 14:49:41 -08:00 |
|
Andrzej Kapolka
|
3e2a659178
|
Experimenting with more action unit mappings.
|
2014-02-25 14:47:56 -08:00 |
|
ZappoMan
|
e03c7be5ef
|
moved MenuScriptingInterface to own files
|
2014-02-25 14:33:37 -08:00 |
|
Andrzej Kapolka
|
d7f55f4c30
|
Compile fixes.
|
2014-02-25 14:29:58 -08:00 |
|
Andrzej Kapolka
|
c0a33fe8fe
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-02-25 14:26:50 -08:00 |
|
Andrzej Kapolka
|
16796b50a7
|
Working on Visage improvements.
|
2014-02-25 14:26:31 -08:00 |
|
Philip Rosedale
|
6b128466a9
|
Merge pull request #2094 from birarda/authentication
reset nodelist if domain-server stops talking to you, closes #2092
|
2014-02-25 14:10:24 -08:00 |
|
ZappoMan
|
23b2d7d124
|
Merge pull request #2073 from josecpujol/19489
19489
|
2014-02-25 13:34:39 -08:00 |
|
Stephen Birarda
|
ce3d6d2fca
|
reset nodelist if domain-server stops talking to you, closes #2092
|
2014-02-25 13:07:39 -08:00 |
|
ZappoMan
|
e12d791097
|
remove dead code
|
2014-02-25 12:37:49 -08:00 |
|
Philip Rosedale
|
11e9b18a98
|
Don’t render avatar ‘sphere’ unless there is voice intensity
|
2014-02-25 12:35:14 -08:00 |
|
ZappoMan
|
263d682fb9
|
Merge branch 'master' of https://github.com/worklist/hifi into menu_js
|
2014-02-25 12:20:15 -08:00 |
|
ZappoMan
|
0048099ff5
|
implement support for menu item positioning
|
2014-02-25 12:19:30 -08:00 |
|
Stephen Birarda
|
1163cfd07e
|
if the domain-server provides no auth, assume default
|
2014-02-25 10:58:32 -08:00 |
|
Stephen Birarda
|
b09ed1dff1
|
present a login window on app start
|
2014-02-25 10:53:13 -08:00 |
|
ZappoMan
|
0b6e81b8a6
|
remove more cruft
|
2014-02-25 10:31:29 -08:00 |
|
ZappoMan
|
74d48ab239
|
added support for MenuItemProperties for addMenuItem, removed some cruft, beginning support for menu item placement
|
2014-02-25 10:23:59 -08:00 |
|
Philip Rosedale
|
e637e48598
|
Merge pull request #2076 from birarda/authentication
groundwork for secure node communication via data-server
|
2014-02-25 10:07:55 -08:00 |
|
ZappoMan
|
cb01c1ee10
|
add separator support
|
2014-02-24 23:53:26 -08:00 |
|
ZappoMan
|
374b12980b
|
added checkable menus and sub menus
|
2014-02-24 23:42:05 -08:00 |
|
ZappoMan
|
a3d0c20516
|
better support for shortcuts
|
2014-02-24 20:49:06 -08:00 |
|
ZappoMan
|
76355dc1a8
|
add support for hiding local rendering of avatar
|
2014-02-24 19:24:45 -08:00 |
|
ZappoMan
|
03f8885cad
|
first cut at menus JS
|
2014-02-24 19:09:22 -08:00 |
|
Andrzej Kapolka
|
c71b10f639
|
Added toggles for rendering bucky balls, particles.
|
2014-02-24 17:43:47 -08:00 |
|
Philip Rosedale
|
fa3b109e1d
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-02-24 16:43:39 -08:00 |
|
Jose Carlos
|
64e75bb4ab
|
fixed typo
|
2014-02-25 00:19:52 +01:00 |
|
Stephen Birarda
|
c1b45d7eaa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
|
2014-02-24 15:18:21 -08:00 |
|
Stephen Birarda
|
f20808b47f
|
remove option to drive from transmitter
|
2014-02-24 15:11:02 -08:00 |
|