Andrzej Kapolka
28d3eae12b
Move Faceplus reading to its own thread to avoid blocking the main one.
2014-04-09 14:52:27 -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
Brad Hefta-Gaub
8e097be28d
Merge pull request #2614 from Atlante45/undo_redo_system
...
Undo redo system
2014-04-08 08:30:29 -10:00
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
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
Andrew Meadows
aad945c180
merge upstream/master into "improved URL scheme"
...
Conflicts:
interface/interface_en.ts
2014-04-02 17:45:01 -07:00
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
James Brotchie
19b8f101d8
Improved hifi:// style URL scheme handling.
...
First steps towards implementing #1463 .
- Moved url parsing code from Application::event to
Menu::goTo(QString).
- Handle destination component of URL as either a @username,
#place, or x-xx,y-yy,z-zz style coordinate.
- Added support for entering hifi:// style URL into @ invoked
goto menu option.
2014-04-01 11:31:43 +10:00
Philip Rosedale
81d1eb7ed2
removed unused procedural movement code
2014-03-31 18:24:58 -07:00
Atlante45
77f5a50738
Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes
2014-03-31 17:19:45 -07:00
Philip Rosedale
3babb5e0bf
Merge branch 'master' of https://github.com/worklist/hifi
2014-03-31 07:25:46 -07:00
James Brotchie
6880160bc0
Remember most recently opened script location.
...
Previously when running a script from a file you were always taken back
to your desktop directory. Now you will be taken to the location of your
most recently opened script.
2014-03-31 22:08:38 +10:00
Philip Rosedale
27f0214032
first pass audio VU scope
2014-03-28 23:09:51 -07:00
Atlante45
718b8f7eb9
Changed back to upload either head or skeleton
2014-03-26 15:07:19 -07:00
Lucas Crisman
8ed30d9da2
Merge branch 'master' of git://github.com/worklist/hifi into 19498
...
Conflicts:
interface/src/Application.cpp
2014-03-25 14:43:40 -03:00
ZappoMan
571ecf0964
add first cut at firstrun support
2014-03-25 00:45:31 -07:00
ZappoMan
c34b64e296
add load script from URL support
2014-03-25 00:17:19 -07:00
Andrzej Kapolka
f1fd8175d2
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-03-24 14:53:00 -07:00
Andrzej Kapolka
210af25396
When rendering avatar shadows, check bounds against shadow frustum. Closes
2014-03-24 14:52:02 -07:00
ZappoMan
938959a9f6
expose application settings to JS
2014-03-22 21:20:35 -07:00
ZappoMan
b7243b0bfe
more cleanup
2014-03-22 20:42:34 -07:00
ZappoMan
a56b7e341d
reorganize files in interface directory
2014-03-22 20:22:05 -07:00
Lucas Crisman
5fe59acb87
Stats variable width for panels
2014-03-21 14:10:00 -03:00
Andrzej Kapolka
f92f45df63
Keep track of keys pressed, synthesize release events when focus is lost.
...
Closes #2375 .
2014-03-20 11:17:36 -07:00
Brad Hefta-Gaub
2a03cf1bab
make throttle rendering not adjust LOD
2014-03-14 17:17:38 -07:00
Atlante45
51585acd25
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader
2014-03-13 10:53:24 -07:00
Atlante45
424afaa36b
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
...
Conflicts:
interface/interface_en.ts
2014-03-12 15:59:17 -07:00
AndrewMeadows
bed8617846
Merge pull request #2277 from ZappoMan/server_scale_testing
...
Voxel/Particle Server Scaling Work
2014-03-12 15:24:29 -07:00
Atlante45
a2acdc01ab
Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels
...
Conflicts:
interface/interface_en.ts
2014-03-12 12:21:56 -07:00
Atlante45
9402a5852c
Fixed review comments
2014-03-12 12:20:43 -07:00
Andrzej Kapolka
e249b29b45
Merge pull request #2268 from AndrewMeadows/radians
...
prefer radians over degrees
2014-03-12 12:10:29 -07:00
Atlante45
b9ee60ba41
FstReader not a member anymore
2014-03-12 11:47:47 -07:00
Dimitar Dobrev
4c26f025ac
Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry.
2014-03-12 20:04:22 +02:00
ZappoMan
4d0b762de3
some hacking on full scene debuggin
2014-03-11 20:33:53 -07:00
Andrew Meadows
793a760272
merge upstream master into "radians" project
2014-03-11 17:28:36 -07:00
Andrew Meadows
aa8c2fc8cb
use radians instead of degrees (almost) everywhere
2014-03-11 17:26:58 -07:00
Clement
dcaef45f2e
More work on editVoxel.js
2014-03-11 16:01:21 -07:00
ZappoMan
7fb872c1d7
remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats
2014-03-08 23:53:44 -08:00
Atlante45
8faaa28bc1
FST ploader base
2014-03-07 11:55:02 -08:00
Stephen Birarda
4a1cb63d7b
remove an blank line in Application headers
2014-03-06 15:09:35 -08:00
Stephen Birarda
87d908a3bc
resolve conflicts on merge with upstream master
2014-03-06 15:03:03 -08:00
Stephen Birarda
b705ec560f
cleanup resources directory references by copying beside the executable
2014-03-06 11:46:49 -08:00
ZappoMan
7a8d26247a
remove piemenu
2014-03-05 21:03:32 -08:00
Andrzej Kapolka
64c4e58160
Tie the avatar LOD distance multiplier to the LOD parameter calculated for
...
voxels.
2014-03-03 16:34:28 -08:00
ZappoMan
9d5e33d75d
removed unused highlight voxel
2014-03-03 04:09:33 -08:00
