Atlante45
2eff7867b5
Remove LODManager::load/saveSettings() for now
2015-01-17 20:09:48 -08:00
Atlante45
229791a9f2
Move Oculus UI ratio to ApplicationOverlay
2015-01-17 19:45:48 -08:00
Atlante45
8175b4bb44
Remove unused getter/setter
2015-01-17 18:23:43 -08:00
Atlante45
10ec36874f
Remove Menu deprecated members
2015-01-17 17:59:24 -08:00
Atlante45
3fbc8c5d44
Moved Menu::shouldRenderMesh() to LODManager
2015-01-17 17:56:33 -08:00
Andrzej Kapolka
debc9b735d
Fixed edge issue, increased default grid size to correspond to default
...
heightfield import.
2015-01-17 16:33:35 -08:00
Atlante45
a9047b7b15
LODManager class
...
Moved most LOD related members in menu to new Dependency
LODManager
Replaced all Menu::getInstance() call that accessed those
members by DM gets
2015-01-16 17:55:47 -08:00
Atlante45
f34add9c9c
Moved Bookmarks related funct out of Menu
...
Took everything Bookmarks related in Menu and moved it over to
Bookmarks.
2015-01-16 16:30:33 -08:00
Ryan Huffman
ba752040dd
Update WebWindow to redefine EventBridge after refresh
2015-01-16 16:24:19 -08:00
Andrzej Kapolka
2497b2fe39
If there's no directly intersecting spanner, find the closest heightfield that
...
we can project onto.
2015-01-16 15:41:08 -08:00
Atlante45
8996bf8e0d
Use qApp
...
Reuse qApp global variable following Qt's pattern
2015-01-16 15:26:42 -08:00
Atlante45
0041d489cc
Move stuf around in Menu for easier cleanup
2015-01-16 14:37:38 -08:00
Andrew Meadows
d5119b3532
merge upstream/master into andrew/bispinor
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/EntityMotionState.h
libraries/physics/src/ObjectMotionState.cpp
libraries/physics/src/PhysicsEngine.cpp
libraries/physics/src/PhysicsEngine.h
2015-01-16 14:36:27 -08:00
Andrzej Kapolka
45b36b383c
More progress on stitching, etc.
2015-01-16 14:32:15 -08:00
Brad Hefta-Gaub
81cd3e9e7f
Merge pull request #4127 from birarda/master
...
put user location without curly braces
2015-01-16 13:35:09 -08:00
Philip Rosedale
1ff90bec5d
Merge pull request #4124 from AndrewMeadows/inertia
...
support for simple kinematic motion
2015-01-16 13:33:44 -08:00
Stephen Birarda
9c1196a2a6
put user location without curly braces
2015-01-16 12:08:56 -08:00
Andrzej Kapolka
b6c843497d
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2015-01-16 11:56:04 -08:00
Sam Gateau
bb362b748f
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2015-01-16 09:39:23 -08:00
Sam Gateau
d1fb071208
Adding ambient sphere in the lighting equation and menu to control te presets
2015-01-16 09:38:53 -08:00
Andrzej Kapolka
f81c117ae5
Stitching progress.
2015-01-15 17:59:55 -08:00
Andrew Meadows
3fed38793e
merge andrew/origin/inertia to andrew/local/inertia
2015-01-15 17:55:51 -08:00
Andrew Meadows
250fd98fee
support for simple kinematic motion
2015-01-15 17:51:01 -08:00
Andrew Meadows
5c9e9e79bf
Merge pull request #4092 from thoys/20255
...
CR for Job #20255 - Visually show the grouping of scripts in the "Running Scripts" dialog
2015-01-15 16:58:24 -08:00
Clément Brisset
400f98b11d
Merge pull request #4118 from birarda/master
...
migrate to new places API
2015-01-15 15:05:26 -08:00
Ryan Huffman
cfb996db0c
Add missing paramaters to Base3DOverlay copy ctor
2015-01-15 14:15:59 -08:00
Thijs Wenker
d820df4972
ScriptModel destructor
2015-01-15 22:54:32 +01:00
Thijs Wenker
836f16276f
Merge branch 'master' of https://github.com/worklist/hifi into 20255
2015-01-15 22:32:30 +01:00
Stephen Birarda
93c3b2fb74
repairs for new DependencyManager format
2015-01-15 13:14:26 -08:00
Stephen Birarda
e538669343
resolve conflicts on merge with upstream
2015-01-15 13:12:05 -08:00
David Rowe
5195ae2424
Merge branch 'master' into 20269
2015-01-15 11:01:17 -08:00
David Rowe
91e321565a
Change menu item text
2015-01-15 10:38:17 -08:00
Philip Rosedale
048d190350
Merge pull request #4108 from ctrlaltdavid/20263
...
CR for Job #20263 - Create a "Bookmarks" capability
2015-01-15 10:30:41 -08:00
Andrew Meadows
ff171a5782
Bullet is now required dependency
2015-01-15 10:27:43 -08:00
Philip Rosedale
67c3f9a3db
Merge pull request #4107 from huffman/fix-update-my-avatar
...
Fix issue with avatar data being sent too often
2015-01-15 10:22:18 -08:00
David Rowe
52876ecb16
Fix merge
2015-01-15 10:07:51 -08:00
David Rowe
95efe9857b
Merge branch 'master' into 20263
2015-01-15 09:52:19 -08:00
Ryan Huffman
00487fb175
Fix issue with avatar data being sent too often
2015-01-15 09:45:51 -08:00
David Rowe
544d412122
Add menu items that copy location address and location path
...
And Rename File > Go to File > Location
2015-01-15 09:33:35 -08:00
David Rowe
ebe80075dc
Tidy
2015-01-14 23:20:47 -08:00
David Rowe
426cd71fc6
Persist bookmarks to file
2015-01-14 22:58:13 -08:00
David Rowe
d9bd7f019f
Simplify bookmark handling
2015-01-14 22:20:45 -08:00
David Rowe
1ffe22d5e9
Sanitize bookmark names
2015-01-14 18:31:54 -08:00
Stephen Birarda
79d214619d
update lobby for new places API
2015-01-14 18:18:26 -08:00
David Rowe
da58d5a381
Delete Bookmark menu item and dialog box
2015-01-14 18:15:39 -08:00
Thijs Wenker
8ffea45736
QFileDialog include
2015-01-15 02:59:37 +01:00
ZappoMan
db94949649
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-01-14 17:55:03 -08:00
Thijs Wenker
80a81043ed
Merge branch 'master' of https://github.com/highfidelity/hifi into 20216
...
Conflicts:
interface/src/Menu.cpp
2015-01-15 02:28:31 +01:00
Stephen Birarda
ef87b59a0c
remove method declarations for location changes
2015-01-14 17:02:18 -08:00
Stephen Birarda
69869a696b
remove name this location call from application
2015-01-14 17:00:21 -08:00
Stephen Birarda
e5fe24e088
remove My Locations and Name This Location
2015-01-14 16:58:15 -08:00
Stephen Birarda
f745dfdb91
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-01-14 16:54:51 -08:00
ZappoMan
2f549c776c
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-14 14:41:51 -08:00
David Rowe
a78ab5a5b3
Teleport to selected bookmark
2015-01-14 10:14:56 -08:00
David Rowe
01f7efe767
Remove ellipsis from Collide With menu item
...
Noticed in passing.
2015-01-13 22:48:05 -08:00
David Rowe
fa6faa771a
Add bookmarks with Bookmark Location menu item
...
The menu of bookmarks is kept sorted.
2015-01-13 22:39:16 -08:00
Atlante45
48f1cbe644
Fixed QSharedPointer in connect()
2015-01-13 20:54:15 -08:00
ZappoMan
e6388a65b9
rough pass at adding color to geometry cache
2015-01-13 20:53:05 -08:00
Atlante45
476e2124b7
Moved DM::get() calls to auto
2015-01-13 20:51:02 -08:00
Atlante45
f77fab2fe0
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
2015-01-13 20:38:52 -08:00
Atlante45
38729c5790
Made dependencies inherit from Dependency
2015-01-13 20:38:01 -08:00
Atlante45
36db547c0f
Setup DependencyManager before any member of Application
2015-01-13 20:35:45 -08:00
David Rowe
7130c579f5
First pass at Bookmarks class
...
In-memory for starters.
2015-01-13 18:47:59 -08:00
Clément Brisset
3034b8f733
Merge pull request #4091 from ctrlaltdavid/20229
...
CR for Job #20229 - Expose the downloads section for models and metavoxels to javascript
2015-01-13 17:07:17 -08:00
Clément Brisset
5635ac3d7b
Merge pull request #4090 from ctrlaltdavid/no-show-voxel-nodes
...
Remove menu item for Show Voxel Nodes which is no longer available
2015-01-13 17:06:58 -08:00
Clément Brisset
aff0554a62
Merge pull request #4079 from thoys/fix-GetVersionEx-deprication-warnings
...
[WINDOWS ONLY] replaced GetVersionEx with new Version helpers to resolve deprecation warnings.
2015-01-13 17:06:26 -08:00
ZappoMan
1b0a5c881b
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-13 16:14:29 -08:00
Stephen Birarda
6d2c87c7a3
put current domain hostname if no place name present
2015-01-13 15:15:39 -08:00
Stephen Birarda
6e1ba17c6e
handle application title change for place name change
2015-01-13 15:07:45 -08:00
Stephen Birarda
92b8cd2d1e
handle storage of user location in new format
2015-01-13 15:02:04 -08:00
Stephen Birarda
16261a5fc1
more updates for new place/location APIs
2015-01-13 14:49:24 -08:00
Atlante45
4429e144f4
Fix merge accidental code delete
2015-01-13 11:10:13 -08:00
Atlante45
2a82ff9768
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
assignment-client/src/voxels/VoxelServer.cpp
interface/src/Application.cpp
interface/src/Audio.cpp
interface/src/DatagramProcessor.cpp
interface/src/Menu.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/PreferencesDialog.cpp
libraries/networking/src/NodeList.cpp
libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
Atlante45
cf7089e145
Move constant back to Menu
2015-01-12 18:49:05 -08:00
Atlante45
9ce405a744
Text3DOverlay forward definition
2015-01-12 17:46:38 -08:00
Atlante45
7d39b45f16
Hopefully fixes the windows compile error
2015-01-12 17:34:07 -08:00
Atlante45
74d819fe25
Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating
2015-01-12 16:42:35 -08:00
Clément Brisset
60aafba0ce
Merge pull request #4077 from huffman/fix-render-hud-windows-linux
...
Fix gl projection matrix stack overflow when rendering to HUD
2015-01-12 16:22:09 -08:00
Clément Brisset
10331c52a8
Merge pull request #4094 from birarda/master
...
repairs to AudioScriptingInterface playSound
2015-01-12 16:18:41 -08:00
Thijs Wenker
8c7099a0bb
changed "Load Scripts" label to be better understandable
2015-01-13 01:09:28 +01:00
Stephen Birarda
661221a189
repairs to AudioScriptingInterface playSound
2015-01-12 16:04:00 -08:00
Atlante45
ea3626d87f
Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating
2015-01-12 16:03:32 -08:00
Atlante45
934d8d58ef
Move some constants out of Menu class files
2015-01-12 16:03:15 -08:00
Atlante45
e30b119464
Some simple code cleanup
2015-01-12 15:55:25 -08:00
Thijs Wenker
336a96bd48
Merge branch 'master' of https://github.com/worklist/hifi into 20255
2015-01-13 00:44:39 +01:00
Atlante45
59c9e0bb50
Wire CachesSizeDialog in Menu
2015-01-12 15:19:36 -08:00
Atlante45
7bf57b3cca
Removed unecessary method/cleanup header
2015-01-12 14:53:31 -08:00
Atlante45
e62fbe2557
Cleanup some headers
2015-01-12 14:09:26 -08:00
Atlante45
fd2b0edf7a
Alphabetical order
2015-01-12 14:01:56 -08:00
Atlante45
894c4c9d59
All dialogs in Menu are QPointers
2015-01-12 14:00:23 -08:00
Atlante45
19f321c171
Fixed caches not in DM
2015-01-12 13:56:41 -08:00
Atlante45
38dc1643ef
New Caches size dialog
2015-01-12 12:46:11 -08:00
Atlante45
5be5dc716f
Make sure every widget has diolog has a parent
2015-01-12 12:45:50 -08:00
Andrzej Kapolka
cad8313e56
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2015-01-12 12:00:20 -08:00
David Rowe
022760be1d
Remove menu item for Show Voxel Nodes which is no longer available
...
And change Show Entity Nodes shortcut from Ctrl-Shift-2 to Ctrl-Shift-1.
2015-01-12 11:52:51 -08:00
Atlante45
98dd401ea3
Remove duplicate definition
2015-01-12 11:12:19 -08:00
Stephen Birarda
d30490c760
resolve conflicts on merge with upstream master
2015-01-12 09:25:37 -08:00
Thijs Wenker
e4fd027d15
"load script from URL" button in Running scripts window
2015-01-12 00:49:41 +01:00
Thijs Wenker
8feb51013b
running script window treeview fully works
2015-01-12 00:41:38 +01:00
David Rowe
968a34f966
Add instructions for building with SDL2
2015-01-11 11:44:16 -08:00
Andrzej Kapolka
d002359989
Stitching improvement.
2015-01-09 16:43:51 -08:00
Thijs Wenker
1d6066c837
replaced GetVersionEx with new Version helpers to resolve deprecation warnings.
2015-01-10 01:41:07 +01:00
Thijs Wenker
d84a65a5f9
running scripts list -> treeview initial
2015-01-10 01:29:06 +01:00
Ryan Huffman
e00b629133
Fix gl projection matrix stack overflow when rendering to HUD
...
The projection matrix stack is considerably smaller than the modelview
stack and was overflowing on Windows and Linux machines that were tested.
2015-01-09 16:11:17 -08:00
Andrzej Kapolka
e3074d726b
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
libraries/metavoxels/src/Spanner.cpp
2015-01-09 11:52:05 -08:00
Andrzej Kapolka
d82f269263
Don't show grid for tools where it isn't needed, started on "fill" tool.
2015-01-09 11:46:40 -08:00
Atlante45
05d2887c94
Move Torso twist to HeadData with Lean
2015-01-09 11:15:01 -08:00
ZappoMan
925b13cc93
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-09 09:19:53 -08:00
Philip Rosedale
285e588266
Merge pull request #4072 from Atlante45/network_replies_cleanup
...
Windows crash fix
2015-01-09 07:42:36 -08:00
Atlante45
891d8d5abf
Removed unecessary foreach
2015-01-08 18:22:25 -08:00
Atlante45
1c4903c346
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
2015-01-08 16:33:01 -08:00
ZappoMan
a03c2b79fa
first cut at adding colors to GeometryCache and supporting batch internally
2015-01-08 15:52:33 -08:00
Andrzej Kapolka
c99e2c3ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
2015-01-08 14:57:03 -08:00
Andrzej Kapolka
8b2baf65e8
Color/material fix.
2015-01-08 14:13:23 -08:00
Andrzej Kapolka
ec32739689
CSG improvements.
2015-01-08 12:52:52 -08:00
Atlante45
e73f8baf93
Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix
2015-01-08 11:54:54 -08:00
Atlante45
4157a3ca40
Remove lean from head rotation
2015-01-08 11:33:14 -08:00
David Rowe
198226450a
Suppress warnings about inconsistent DLL linkage of lrintf in Windows
...
This warning in Windows builds is due to redefinition of lrintf in gverb
library's ladspa-util.h file.
2015-01-08 11:26:32 -08:00
Atlante45
0bae05b924
Remove chat message
2015-01-08 11:25:53 -08:00
Andrew Meadows
25b9b50468
Merge pull request #4065 from ZappoMan/voxelEctomy
...
fix some warnings and remove more references to voxels
2015-01-08 08:07:06 -08:00
Andrzej Kapolka
4c3163fae8
Closer to working stitching.
2015-01-07 17:24:26 -08:00
Philip Rosedale
a04ce68fba
Merge pull request #4063 from ZappoMan/restoreLookAt
...
restore camera lookAt and keepLookingAt features
2015-01-07 16:31:07 -08:00
ZappoMan
cc19c15c17
remove more references to voxels
2015-01-07 16:09:56 -08:00
ZappoMan
91351d7700
fix warnings
2015-01-07 16:09:26 -08:00
ZappoMan
806e691bbf
restore camera lookAt and keepLookingAt features
2015-01-07 13:41:07 -08:00
Thijs Wenker
2690241eb6
fix to add GLEW debug library
2015-01-07 22:08:01 +01:00
Brad Hefta-Gaub
ddea2c4a68
Merge pull request #4058 from huffman/entity-tool-updates
...
Entity tool updates
2015-01-07 12:42:47 -08:00
Ryan Huffman
b471c1fa71
Update hotkey for audio stats
2015-01-07 12:15:53 -08:00
David Rowe
6c4932f9d0
Coding standard
2015-01-07 11:24:10 -08:00
David Rowe
40274df279
Add downloads information changed event for JavaScript
2015-01-07 11:20:46 -08:00
Andrzej Kapolka
1abf111d7f
Index fix.
2015-01-07 11:19:40 -08:00
Brad Hefta-Gaub
8ad21d61c4
Merge pull request #4056 from huffman/audio-buffer-starvation-detection
...
Audio buffer starvation detection
2015-01-07 11:18:34 -08:00
Ryan Huffman
50fcf4ba8f
Remove output buffer starvation log warnings
2015-01-07 11:06:36 -08:00
Ryan Huffman
19639367bf
Use usecTimestampNow instead of QDateTime::currentMSecsSinceEpoch
2015-01-07 11:04:09 -08:00
Brad Hefta-Gaub
476887b7ef
Merge pull request #4055 from huffman/fix-overlays
...
Update setting drawOnHUD and update to write lock for editOverlay
2015-01-07 10:56:18 -08:00
Andrew Meadows
d3d80a0b1b
Merge pull request #4049 from ZappoMan/gpuStreamizing
...
Work on removing immediate mode OpenGL from application
2015-01-07 10:55:15 -08:00
Andrew Meadows
559ec41bfe
Merge pull request #4051 from Atlante45/master
...
Restored addReverb default arg
2015-01-07 10:25:26 -08:00
Ryan Huffman
40f277b630
Fix use of dependency manager
2015-01-07 10:20:49 -08:00
Ryan Huffman
d113b3f85c
Update getAudio() calls to use DependencyManager instead
2015-01-07 09:48:41 -08:00
Stephen Birarda
35a69ce049
remove the faceplus find module
2015-01-07 09:48:12 -08:00
Ryan Huffman
cb80e18ad0
Update default detection period to be int
2015-01-07 09:47:24 -08:00
Ryan Huffman
a07d92b6ea
Merge branch 'master' of github.com:highfidelity/hifi into audio-buffer-starvation-detection
...
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/ui/PreferencesDialog.cpp
2015-01-07 09:46:07 -08:00
Ryan Huffman
08776aec9d
Add output starve settings to preferences
2015-01-07 09:37:17 -08:00
Ryan Huffman
a660e7efed
Add output starve values to settings
2015-01-07 09:37:03 -08:00
Ryan Huffman
77aecaabd0
Remove extra switch output call
2015-01-07 09:36:26 -08:00
Ryan Huffman
288e2ee45a
Add output buffer starve detection to audio
2015-01-07 09:36:14 -08:00
ZappoMan
7e8194a3d7
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-06 19:12:01 -08:00
Ryan Huffman
68a9d80ba3
Update setting drawOnHUD and update to write lock for editOverlay
2015-01-06 18:14:40 -08:00
Andrzej Kapolka
48fb9a27ba
Progress on heightfield/voxel interface.
2015-01-06 17:55:04 -08:00
Philip Rosedale
3ed5b0e9be
Merge pull request #4052 from cozza13/20253
...
CR for Job #20253 - Fix scripts that still link to highfidelity-public
2015-01-06 17:08:51 -08:00
Chris Collins
0a1a64b7e6
Script updates and fixes to highfidelity-public
...
Script updates and fixes to highfidelity-public
2015-01-06 17:04:42 -08:00
ZappoMan
e0338dd787
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-06 16:42:25 -08:00
Atlante45
29839df9fe
Restored addReverb default arg
2015-01-06 16:35:30 -08:00
Clément Brisset
fb6fb8a38d
Merge pull request #4050 from birarda/lasagna-not-spaghetti
...
put back current address storage in Menu
2015-01-06 16:29:52 -08:00
Stephen Birarda
9c191be106
use the AddressManager's method to store current address
2015-01-06 16:13:06 -08:00
Stephen Birarda
8c8a925085
put back current address storage in Menu
2015-01-06 16:06:07 -08:00
David Rowe
8b0d859686
Add method to access downloads information in JavaScript
2015-01-06 15:54:07 -08:00
ZappoMan
fb68037b74
more removal of immediate mode
2015-01-06 15:51:39 -08:00
ZappoMan
d796ebf632
migrate circle overlays to use renderVertices()
2015-01-06 14:43:42 -08:00
Andrzej Kapolka
a20b12ad44
Material painting for stacks.
2015-01-06 14:25:26 -08:00
ZappoMan
1bfce7d876
more removal of immediate mode
2015-01-06 14:14:13 -08:00
ZappoMan
0d63391be8
formatting
2015-01-06 12:31:42 -08:00
ZappoMan
873403a333
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
...
Conflicts:
interface/src/Audio.cpp
interface/src/Audio.h
interface/src/Menu.cpp
interface/src/Menu.h
2015-01-06 12:27:16 -08:00
Atlante45
9d5ff5d274
Fix mouse disappearing in the menus on Windows
2015-01-06 10:36:42 -08:00
Philip Rosedale
413cbacbc1
Merge pull request #4043 from ZappoMan/voxelEctomy
...
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 10:07:38 -08:00
ZappoMan
b605fe387e
fix ui file
2015-01-06 09:55:49 -08:00
ZappoMan
ac1f7c9a84
multi-mode renderVertices
2015-01-06 09:52:27 -08:00
Stephen Birarda
5fadfa8c17
remove doubled friend declaration, is in macro
2015-01-06 09:35:11 -08:00
ZappoMan
b940dcfdb3
more voxel-ectomy cleaning up some remaining references to voxels
2015-01-06 09:27:48 -08:00
Andrew Meadows
f3255eeb0e
Merge pull request #4008 from birarda/lasagna-not-spaghetti
...
some Audio cleanup in prep for audio untangle
2015-01-06 09:13:12 -08:00
ZappoMan
0606861b66
dashed lines in GeometryCache
2015-01-05 21:45:17 -08:00
ZappoMan
56a3f98b27
renderLinestrip() for audio scope and 3d rectangle overlays
2015-01-05 21:04:56 -08:00
ZappoMan
a9b7367fa9
more work on eliminating immediate mode calls
2015-01-05 20:51:05 -08:00
ZappoMan
9545bd1907
add alternate renderGrid for audio scope
2015-01-05 19:34:37 -08:00
Andrzej Kapolka
5a46f3e20d
Material/ray testing bits.
2015-01-05 18:37:47 -08:00
ZappoMan
0e943ae240
remove render view frustum mode
2015-01-05 17:23:10 -08:00
ZappoMan
bd1612f6a4
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-05 16:51:31 -08:00
Sam Gateau
2fdcbb1a97
changing the atmoshpere position
2015-01-05 16:46:42 -08:00
ZappoMan
7cf4bd1860
remove head mouse
2015-01-05 16:29:02 -08:00
ZappoMan
8b22b166ac
convert lookat vectors and laser pointers to use renderLine()
2015-01-05 16:06:35 -08:00
ZappoMan
a20fa1242d
first cut are removing immediate mode GL_LINES
2015-01-05 15:46:48 -08:00
Stephen Birarda
f116d0bf5d
block until audio IO stops on app quit
2015-01-05 15:20:36 -08:00
Atlante45
be050b0469
Added missing deletes
2015-01-05 15:13:07 -08:00
Sam Gateau
56758759e5
making the sun position a direction
2015-01-05 15:02:12 -08:00
Stephen Birarda
dbe4b6ccc0
include QDesktopServices in UpdateDialog
2015-01-05 14:45:41 -08:00
Stephen Birarda
9bcacaf512
put back declared constructor, inputReceived signal
2015-01-05 14:43:23 -08:00
Stephen Birarda
53ac1a2bb2
don't include QtGui from UpdateDialog
2015-01-05 14:41:38 -08:00
Stephen Birarda
51bba4884f
resolve conflicts on merge with upstream master
2015-01-05 14:40:48 -08:00
ZappoMan
c2d45df541
add renderBevelCornersRect to GeometryCache
2015-01-05 14:39:14 -08:00
Andrzej Kapolka
808cb2e4bc
Substantial cleanup, working on interface between heightfields and dual
...
contour surfaces.
2015-01-05 14:33:40 -08:00
Ryan Huffman
defb2cbffd
Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size
...
Conflicts:
interface/src/Audio.cpp
2015-01-05 14:07:06 -08:00
ZappoMan
bd38df2a15
replace GL_LINES with a call to renderWireBox for node bounds
2015-01-05 13:58:58 -08:00
Sam Gateau
f03b253260
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5
Merge pull request #4025 from ZappoMan/voxelEctomy
...
Voxel ectomy
2015-01-05 13:20:30 -08:00
Sam Gateau
3e4cbfd2dc
clean code
2015-01-05 13:12:28 -08:00
Sam Gateau
7529b3d1b0
clean code
2015-01-05 13:10:32 -08:00
Ryan Huffman
c5e42aa50e
Merge pull request #4035 from ZappoMan/audioStarvation
...
add audio starvation detection
2015-01-05 13:05:27 -08:00
Sam Gateau
0b8b4c6d08
for simple shadow map, cover 2 regions of the view frustum and not just one for similar quality
2015-01-05 13:01:21 -08:00
Brad Hefta-Gaub
58a2a5eb83
Merge pull request #4027 from huffman/grid-shader-updates
...
Grid shader updates
2015-01-05 13:00:05 -08:00
Sam Gateau
b8e44a3e7a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e
Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes
2015-01-05 11:27:29 -08:00
Stephen Birarda
6d8f319e51
remove Audio methods re-introduced after merge
2015-01-05 09:27:01 -08:00
Stephen Birarda
dfb02aea0c
resolve conflicts on merge, add cstring inc
2015-01-05 09:25:30 -08:00
Brad Hefta-Gaub
89e499a78f
only active sixsense palms
2015-01-04 12:26:30 -08:00
Philip Rosedale
218ae9c9d8
Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity
2015-01-04 12:12:57 -08:00
Philip Rosedale
fefcdfa9f6
Revert "Hydra hands deactivate when placed back on controller base"
2015-01-03 21:03:23 -08:00
Andrzej Kapolka
547c6db0a4
Slight simplification.
2015-01-02 17:43:41 -08:00
ZappoMan
b0ac9e22c1
Merge branch 'master' of https://github.com/highfidelity/hifi into audioStarvation
2015-01-02 17:33:25 -08:00
ZappoMan
1df54cffd6
add audio starvation detection
2015-01-02 17:28:51 -08:00
Andrzej Kapolka
a504d03b14
Normal fix.
2015-01-02 17:14:17 -08:00
Ryan Huffman
bbfe2ff1b9
Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size
2015-01-02 17:08:02 -08:00
Ryan Huffman
4a72a4be83
Add audio output buffer size to settings
2015-01-02 17:03:01 -08:00
Ryan Huffman
0d71d25063
Add min/max for audio buffer size
2015-01-02 17:02:44 -08:00
Ryan Huffman
4c5bb66bd7
Add audio output buffer size to preferences
2015-01-02 16:01:04 -08:00
Ryan Huffman
f97109f6a4
Add outputBufferSizeFrames property to Audio
2015-01-02 16:00:07 -08:00
Andrzej Kapolka
3959f99910
Fixed voxel textures.
2015-01-02 13:57:27 -08:00
Sam Gateau
ef7c002237
Improving the shadow effect with lightmaps
2015-01-02 10:31:34 -08:00
Andrzej Kapolka
e242459ea2
More render progress.
2014-12-31 17:33:43 -08:00
Andrzej Kapolka
08dfd28ec0
More rendering bits.
2014-12-31 15:53:38 -08:00
Ryan Huffman
b6b2388d41
Update grid rendering to fade from center location rather than distance from camera
2014-12-31 11:15:44 -08:00
ZappoMan
9630279459
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
...
Conflicts:
examples/editVoxels.js
examples/fallingSand.js
examples/growTrees.js
interface/src/Application.cpp
interface/src/Application.h
libraries/avatars/CMakeLists.txt
libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
Brad Hefta-Gaub
eaa6d4455d
Merge pull request #4024 from samcake/temp1
...
Moving deferred lighting shaders from the resource folder to embedded source in the executable
2014-12-31 10:33:30 -08:00
Brad Hefta-Gaub
43e6ba77fa
Merge pull request #4007 from AndrewMeadows/inertia
...
Bullet physics part 1
2014-12-31 10:33:00 -08:00
Brad Hefta-Gaub
d47b0a33ea
Merge pull request #3995 from huffman/camera-display
...
Camera tool - orientation + mode display
2014-12-31 10:32:31 -08:00
Ryan Huffman
7478b631da
Move write lock in Overlays::overlayDrawOnChanged to encompass reads
2014-12-31 10:16:29 -08:00
Ryan Huffman
5caec4dea5
Update overlays to handle updates in drawOnHUD after creation
2014-12-31 10:15:15 -08:00
Sam Gateau
e1a295fb37
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-12-31 08:40:15 -08:00
Andrew Meadows
ec1ef39a7f
Merge pull request #4023 from PhilipRosedale/master
...
Torso twists to follow head, fix bug with head rotations
2014-12-31 08:01:39 -08:00
Philip Rosedale
104f7b7576
make formula more readable
2014-12-30 20:34:12 -08:00
ZappoMan
5cef7d0e9d
more voxelEctomy
2014-12-30 20:24:27 -08:00
ZappoMan
95bb125e48
more voxelEctomy
2014-12-30 20:13:57 -08:00
ZappoMan
27d8ccb51e
more voxelEctomy
2014-12-30 19:58:04 -08:00
ZappoMan
f1de9cabe9
comment
2014-12-30 19:07:32 -08:00
ZappoMan
49d8f2b2f5
more work on voxelEctomy
2014-12-30 18:52:33 -08:00
ZappoMan
141e231958
more work on voxelEctomy
2014-12-30 18:41:56 -08:00
Andrzej Kapolka
83967d49cf
More rendering bits.
2014-12-30 18:16:49 -08:00
ZappoMan
4ea9bbc309
first major pass at voxelEctomy
2014-12-30 18:08:58 -08:00
Sam Gateau
ae6ccf1a7d
Merge branch 'master' of https://github.com/highfidelity/hifi into temp1
2014-12-30 17:56:08 -08:00
Sam Gateau
37017d0c16
moving the deferrered shaders from the resource folder to built-in the executable
2014-12-30 17:42:10 -08:00
Philip Rosedale
dc9937e11a
only twist own body, remove unused head functions
2014-12-30 17:02:53 -08:00
Philip Rosedale
98cbb2355f
Merge branch 'master' of https://github.com/worklist/hifi
2014-12-30 17:00:38 -08:00
ZappoMan
2a129b6635
Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
2014-12-30 16:49:38 -08:00
samcake
20d66d201e
Merge pull request #4020 from ZappoMan/gpuStreamizing
...
Improvements to GeometryCache::renderQuad()
2014-12-30 16:49:16 -08:00
Philip Rosedale
4e31d7a650
Merge pull request #4021 from ZappoMan/removeHair
...
Haircut at Philip's request
2014-12-30 15:41:53 -08:00
Philip Rosedale
b76f5bf272
Merge branch 'master' of https://github.com/worklist/hifi
2014-12-30 15:41:06 -08:00
Andrzej Kapolka
de4776ef08
More progress on rendering.
2014-12-30 15:36:22 -08:00
Ryan Huffman
3bfc298349
Remove extraneous getDrawonHUD call
2014-12-30 15:31:08 -08:00
Ryan Huffman
929200bc76
Remove qDebug
2014-12-30 15:30:53 -08:00
Philip Rosedale
f4f43d6b38
added twisting of torso to follow head, fixed bug with body rotation not factored out of head rotation, removed credits from title bar
2014-12-30 15:11:32 -08:00
Ryan Huffman
0105906dc7
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
...
Conflicts:
examples/editEntities.js
2014-12-30 15:02:59 -08:00
Ryan Huffman
2b835e621c
Rename 2D -> HUD, 3D -> World in Overlays
2014-12-30 14:50:17 -08:00
ZappoMan
e1d8022409
working on removing voxels
2014-12-30 14:11:31 -08:00
ZappoMan
fbfa40e3c9
remove hair
2014-12-30 13:44:25 -08:00
Clément Brisset
860098585c
Merge pull request #4018 from samcake/temp0
...
Moving the shaders used in Model.cpp from resources folder into the built-in executable
2014-12-30 13:36:13 -08:00
ZappoMan
eb4b8291d7
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2014-12-30 13:28:49 -08:00
Andrzej Kapolka
135e3bf574
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-30 13:25:57 -08:00
Andrzej Kapolka
0d07875f94
Fix overflow warning.
2014-12-30 12:54:12 -08:00
ZappoMan
be137534b5
first cut at registered quads to reduce copies of constantly changing quads
2014-12-30 12:38:16 -08:00
Sam Gateau
e752edc44a
Moving the shaders used in Model.cpp from resources folder into the built-in executable
2014-12-30 12:35:00 -08:00
Clément Brisset
5f07e3425d
Merge pull request #4015 from PhilipRosedale/master
...
Hydra hands deactivate when placed back on controller base
2014-12-30 12:04:16 -08:00
ZappoMan
a4520f6a07
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2014-12-30 10:27:06 -08:00
Philip Rosedale
ca35520796
Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity
2014-12-29 22:24:16 -08:00
Philip Rosedale
8e95020a87
Merge pull request #4006 from samcake/temp0
...
Adding the use of AutoScribeShaders to the build for the equivalent of model.frag and .vert
2014-12-29 19:44:58 -08:00
Andrzej Kapolka
fbd4ca5c08
More work on rendering.
2014-12-29 18:37:06 -08:00
dev
c99ad77799
fixing the size of the name displayed on screen
2014-12-29 16:45:14 -08:00
Andrzej Kapolka
10fdb01436
Fix for toggling Hermite display.
2014-12-29 15:16:40 -08:00
Andrzej Kapolka
c78d38b925
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
2014-12-29 14:38:17 -08:00
Andrzej Kapolka
84a2a8b83d
Working on rendering.
2014-12-29 14:37:53 -08:00
Stephen Birarda
ba09bbae3b
use arrow notation for address manager in application
2014-12-29 11:02:45 -07:00
Stephen Birarda
c7a5f3c86c
resolve conflicts and merge with upstream master
2014-12-29 10:59:42 -07:00
Andrew Meadows
9b7e50858a
merge upstream/master into andrew/inertia
...
Conflicts:
libraries/avatars/CMakeLists.txt
libraries/entities/CMakeLists.txt
2014-12-29 09:15:49 -08:00
Sam Gateau
29726b1b70
removing shaders from resource
2014-12-25 20:05:00 -08:00
ZappoMan
0790bd77b7
almost completely eliminate immediate mode QUADS
2014-12-24 11:14:50 -08:00
ZappoMan
02a1721185
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2014-12-24 10:25:41 -08:00
Philip Rosedale
0ef26b1446
Merge pull request #4004 from Atlante45/modeluploader_scripting_interface
...
Entity upload
2014-12-23 16:58:52 -08:00
Atlante45
2a54ef01ef
Set texture limit back to 1024
2014-12-23 15:06:22 -08:00
Atlante45
da636ca918
ModelUploader only has static methods accessible
2014-12-23 14:00:23 -08:00
Atlante45
f317b54017
Broke down ModelUploader::zip()
2014-12-23 13:48:13 -08:00
Stephen Birarda
0a66b23efa
remove current address from address bar dialog
2014-12-23 13:33:19 -08:00
Atlante45
879c3e2fd0
Add entity model upload
2014-12-23 12:30:00 -08:00
ZappoMan
1f307e9667
more work on removing immediate mode GL_QUADS
2014-12-23 09:50:38 -08:00
ZappoMan
3d42d532e4
more work on removing immediate mode GL_QUADS
2014-12-22 17:43:02 -08:00
Atlante45
55370477db
Remove Application dependency
2014-12-22 16:40:24 -08:00
ZappoMan
14458ac8fd
first pass at removing immediate mode GL_QUADS
2014-12-22 13:47:18 -08:00
Atlante45
327daacecd
Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/OculusManager.cpp
libraries/networking/src/NodeList.cpp
2014-12-22 13:34:18 -08:00
Sam Gateau
4c670ac17a
merging with upstream master and origin temp0
2014-12-22 10:38:11 -08:00
Brad Hefta-Gaub
483155f246
Merge pull request #3989 from birarda/master
...
fix luckily linked dependencies in prep for shared hifi libraries
2014-12-21 11:34:43 -08:00
Brad Hefta-Gaub
6bcc4ec896
Merge pull request #3996 from huffman/fix-overlay-vertices
...
Fix quad vertices for ImageOverlay and TextOverlay
2014-12-20 05:40:54 -08:00
Andrzej Kapolka
4153e32f57
Normal fix.
2014-12-19 18:31:49 -08:00
Sam Gateau
967c6dbc4b
Add the Model library
2014-12-19 16:19:06 -08:00
Brad Hefta-Gaub
07102c6a29
Merge pull request #3991 from huffman/fix-defaults-url
...
Fix default scripts url to use s3.amazonaws.com
2014-12-19 16:06:59 -08:00
Ryan Huffman
25a78534aa
Fix quad vertices for ImageOverlay and TextOverlay
2014-12-19 15:52:31 -08:00
Andrzej Kapolka
2711b3f312
Closer to working edits.
2014-12-19 15:37:58 -08:00
Ryan Huffman
468c564566
Replace glutSolidCube with GeometryCache::renderSolidCube
2014-12-19 15:29:00 -08:00
Ryan Huffman
7249a7e299
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-12-19 15:27:33 -08:00
Stephen Birarda
9bd0bc671b
resolve conflicts on merge with upstream master
2014-12-19 14:48:18 -08:00
Stephen Birarda
bd69a3aae3
Merge pull request #3993 from ZappoMan/gluRemoval
...
more glu/glut removal
2014-12-19 14:44:29 -08:00
ZappoMan
7e37aaabde
windows build hack
2014-12-19 14:24:04 -08:00
Stephen Birarda
4f478e158f
remove includes for glu for APPLE
2014-12-19 13:59:43 -08:00
ZappoMan
2e3a522e73
remove glut.h from CmakeLists.txt and fix a compiler issue with Hair.cpp
2014-12-19 13:53:44 -08:00
ZappoMan
1db1914a2e
replace gluProject() with just the math
2014-12-19 13:46:33 -08:00
Stephen Birarda
08581b4dac
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-12-19 12:50:32 -08:00
Clément Brisset
dbfbe35a49
Merge pull request #3986 from birarda/domain-connect
...
fix domain connection with port, show current address in address bar
2014-12-19 12:49:51 -08:00
ZappoMan
046564ec47
oops double
2014-12-19 12:35:47 -08:00
ZappoMan
d585f8c707
replace gluOrtho2D() with glOrtho()
2014-12-19 12:10:40 -08:00
Ryan Huffman
f3a600da7e
Remove glut call
2014-12-19 12:01:18 -08:00
Ryan Huffman
e4ce7d11dc
Fix default scripts url to use s3.amazonaws.com
2014-12-19 11:32:52 -08:00
Stephen Birarda
115dc28c9c
add glu includes on OS X to stopgap GLUT removal
2014-12-19 10:54:00 -08:00
Stephen Birarda
715b3a245e
remove GLUT from Cmake files
2014-12-19 10:53:36 -08:00
Ryan Huffman
2e96bbe38b
Merge branch 'master' of github.com:highfidelity/hifi into camera-display
2014-12-19 10:37:47 -08:00
Stephen Birarda
bc363dbf3b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-12-19 10:32:41 -08:00
Andrew Meadows
a141ce37e4
merge upstream/master into andrew/inertia
2014-12-19 10:25:03 -08:00
Brad Hefta-Gaub
821cbe610c
Merge pull request #3975 from ctrlaltdavid/20212
...
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
2014-12-19 09:55:45 -08:00
Stephen Birarda
504cd86fef
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-12-19 09:13:06 -08:00
Ryan Huffman
51a64650e4
Fix use of glOrtho and replace getDeferredLightingEffect w/ DependencyManager
2014-12-19 09:04:54 -08:00
Thijs Wenker
f67df35f03
rssdk instructions
2014-12-19 16:36:06 +01:00
Thijs Wenker
e913095af5
Merge branch 'master' of https://github.com/worklist/hifi into 20216
...
Conflicts:
interface/CMakeLists.txt
2014-12-19 13:53:33 +01:00
Stephen Birarda
114e3bb2ff
rename cmake macro to represent actual purpose
2014-12-18 16:51:20 -08:00
Ryan Huffman
5b89208068
Merge branch 'master' of git://github.com/highfidelity/hifi into orientation-display
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
interface/src/ui/overlays/Cube3DOverlay.cpp
2014-12-18 16:46:17 -08:00
Stephen Birarda
0b1445f8b5
show the address dialog with current address selected
2014-12-18 16:41:37 -08:00
Ryan Huffman
2e95618bed
Remove 'start' property alias from Base3DOverlay
2014-12-18 16:38:27 -08:00
Ryan Huffman
74f8579922
Update line3d to have a separate 'start' property and use transform/rotation
2014-12-18 16:37:19 -08:00
Stephen Birarda
1ab66c2bfe
split port and hostname for cleaner domain changes
2014-12-18 16:17:03 -08:00
ZappoMan
8091564a73
remove all glut
2014-12-18 16:12:30 -08:00
Atlante45
296c0025de
Switched to auto and changed macro
2014-12-18 15:42:38 -08:00
Andrew Meadows
11f01e1859
merge upstream/master into andrew/inertia
2014-12-18 15:01:08 -08:00
ZappoMan
6f6cf3b08d
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
2014-12-18 14:52:00 -08:00
Atlante45
990362b8ff
Merge branch 'cuckoo' of https://github.com/birarda/hifi into applications_diet_cpp11
2014-12-18 14:18:21 -08:00
Andrew Meadows
85fd1fc14f
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
2014-12-18 13:46:06 -08:00
ZappoMan
11b4400099
move all glut-ness to geometry cache
2014-12-18 11:20:17 -08:00
Stephen Birarda
9f21b41d3f
updates for new DependencyManager API
2014-12-17 18:08:41 -08:00
Stephen Birarda
7beb3a7b62
resolve conflicts on merge with upstream master
2014-12-17 16:57:35 -08:00
Stephen Birarda
9425ea2c17
Merge branch 'master' of https://github.com/highfidelity/hifi into cuckoo
2014-12-17 16:47:15 -08:00
Stephen Birarda
adf51bfeb8
temp disable visage to get to C++11 support
2014-12-17 16:41:28 -08:00
Ryan Huffman
27e13385ed
Fix drawing of Cube3D on the ApplicationOverlay
...
This seems to break because the ApplicationOverlay is drawn to a texture
buffer first, which is incompatible with the DeferredLightingEffect
implementation.
2014-12-17 16:40:04 -08:00
Ryan Huffman
a0623c930b
Add setting of drawOnApplicaitonOverlay
2014-12-17 16:39:52 -08:00
Ryan Huffman
9bd7912f9f
Add support for drawing 3d overlays on the Application Overlay
2014-12-17 16:25:25 -08:00
Thijs Wenker
2884de1fe4
include fix
2014-12-18 01:18:05 +01:00
Thijs Wenker
835e14a7b2
This might solve it?
2014-12-18 00:52:31 +01:00
Thijs Wenker
95b0f2515b
this doesn't make real sense
to me, perhaps this helps
2014-12-18 00:32:11 +01:00
Atlante45
0bd9ed469e
Changed NodeList::getInstance() calls to use the DM
2014-12-17 15:28:25 -08:00
Atlante45
ce7f72d2cd
Update macro
2014-12-17 15:26:47 -08:00
Thijs Wenker
8a1618c269
missed one.
2014-12-18 00:22:59 +01:00
Thijs Wenker
151ddab118
make stuff build without RealSense
2014-12-18 00:16:51 +01:00
Andrew Meadows
6ea766b48d
merge andrew/thermonuclear into andrew/inertia
...
Conflicts:
interface/src/Application.cpp
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityTypes.cpp
2014-12-17 13:21:00 -08:00
ZappoMan
1a9cf126e4
Merge branch 'master' of https://github.com/highfidelity/hifi into librarization
...
Conflicts:
interface/src/Application.cpp
libraries/entities-renderer/src/EntityTreeRenderer.h
2014-12-17 13:16:11 -08:00
ZappoMan
9f9b8bcb68
move interface/entities to libraries/entities-renderer
2014-12-17 12:54:41 -08:00
ZappoMan
2be3b73e8c
move TextRender to libraries/render-utils
2014-12-17 12:32:52 -08:00
ZappoMan
a465aa20ff
more Application and Menu dependency removal
2014-12-17 11:41:42 -08:00
ZappoMan
5d636e21c6
more Application dependency cleanup
2014-12-17 11:10:45 -08:00