Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 21:42:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
22187 commits 71 branches 56 tags 1.2 GiB
Commit graph

10400 commits

Author SHA1 Message Date
ZappoMan
418b97a648 attempt to get color working for 3d textured quads 2015-01-29 12:04:34 -08:00
ZappoMan
87e91a5a94 Revert "attempt to get color working for 3d textured quads" 
This reverts commit 0f390a98b8.
 2015-01-29 11:44:36 -08:00
ZappoMan
0f390a98b8 attempt to get color working for 3d textured quads 2015-01-29 10:50:13 -08:00
ZappoMan
018b38e56d fix warning 2015-01-28 18:51:10 -08:00
ZappoMan
efb044ea5e change renderDashedLine() to take a color paramter 2015-01-28 15:08:59 -08:00
ZappoMan
f9bcb65467 change removing more glColor calls 2015-01-28 14:52:40 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
ZappoMan
6821f31f14 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	libraries/gpu/src/gpu/GLBackend.cpp
 2015-01-28 10:46:30 -08:00
Thijs Wenker
46618db697 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	interface/src/ui/ApplicationOverlay.h
 2015-01-28 19:35:17 +01:00
ZappoMan
30f985a6fe some cleanup 2015-01-28 10:30:05 -08:00
David Rowe
7286a9c5fb Merge branch 'master' into 20276 2015-01-27 19:08:40 -08:00
Atlante45
98fc1836d8 Revert "Use QDickCache for every QNAM" 
This reverts commit 2f39b93823.
 2015-01-27 18:09:22 -08:00
ZappoMan
5df45c7dce build buster and warnings fixes 2015-01-27 16:55:16 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
David Rowe
2ee1570a40 Merge branch 'master' into 20276 2015-01-27 16:38:41 -08:00
Andrew Meadows
026c39e010 Merge pull request #4131 from Atlante45/pull_out_menu_mess 
Settings - Part I
 2015-01-27 16:23:23 -08:00
Atlante45
505f3f143b Merge branch 'android' of git://github.com/birarda/hifi into android 2015-01-27 16:13:35 -08:00
Atlante45
a28195a334 Move setApplication/Organisation to setupEssentials 2015-01-27 15:28:06 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
 2015-01-27 15:04:17 -08:00
Stephen Birarda
d420674edd apply orientation change to listening position for audio 2015-01-27 14:50:02 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Thijs Wenker
6947436994 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-27 22:29:49 +01:00
David Rowe
44083dd343 Add user warning if domain has mismatched packet versions 2015-01-27 13:10:11 -08:00
Andrew Meadows
e2ffe00c38 Merge pull request #4172 from huffman/fix-image-overlay-rescale 
Fix image overlay rescale
 2015-01-27 13:07:15 -08:00
Andrew Meadows
f2f054f689 Merge pull request #4161 from ey6es/master 
Partial implementation of "granularity" setting for metavoxel tools.
 2015-01-27 12:52:32 -08:00
Ryan Huffman
6a9f135e1c Cleanup image clipping in ImageOverlay 2015-01-27 08:11:37 -08:00
Ryan Huffman
d27a26967f Update ImageOverlay to take texture rescaling into account 2015-01-27 08:09:47 -08:00
Atlante45
af2177a4ac Remove gl include 2015-01-27 02:00:41 -08:00
Atlante45
20358a87d6 Moved some headers around 2015-01-27 01:43:01 -08:00
Atlante45
79bf70acb4 Guard QXmpp with #ifdef 2015-01-27 01:41:12 -08:00
Atlante45
dbdb87a1a2 Moved Menu dependency out of audio 2015-01-27 01:21:59 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
 2015-01-27 01:21:33 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
David Rowe
9aaa3a6fe4 Temporarily re-enable audio selection on Windows 
This is to test current behavior on different users' PCs before
re-enabling permanently.
 2015-01-26 11:48:44 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Andrzej Kapolka
bc0fa0ed24 Push granularity option down the line in preparation for selectively 
increasing resolution.
 2015-01-23 13:58:51 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Atlante45
9f58865937 Add AvatarHashMap and AvatarManager to DM 2015-01-23 11:46:11 -08:00
Thijs Wenker
42cf9e846a Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-23 19:10:08 +01:00
Andrzej Kapolka
b8a15f0726 Another tweak. 2015-01-22 22:04:10 -08:00
Andrzej Kapolka
c124dffd6a Another slight improvement. 2015-01-22 21:26:08 -08:00
Andrzej Kapolka
e65090bab9 Another slight stitching improvement. 2015-01-22 21:08:48 -08:00
David Rowe
22347dd794 Add AudioDevice.deviceChanged() signal and use to update audio menu 2015-01-22 19:11:55 -08:00
Andrzej Kapolka
c1c9f698df Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-22 14:55:37 -08:00
Andrzej Kapolka
805d5ace13 Another slight stitching improvement. 2015-01-22 14:55:14 -08:00
Andrew Meadows
b2f2a3ad27 Merge pull request #4149 from huffman/improve-loading 
Update ImageOverlay to use TextureCache
 2015-01-22 09:26:10 -08:00
Ryan Huffman
0e9e77f166 Fix broken support for color-only ImageOverlay 2015-01-22 08:58:55 -08:00
Ryan Huffman
52193fce38 Remove qDebug 2015-01-22 08:35:38 -08:00
Andrzej Kapolka
cc9bbc3490 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-21 17:47:40 -08:00
Andrzej Kapolka
0d8380a288 Put the indices for our extra triangles into the spatial hash. 2015-01-21 17:47:13 -08:00
Andrzej Kapolka
8bd944e32e Incremental improvement to stitching. 2015-01-21 16:10:00 -08:00
ZappoMan
d3ae9af8ed Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-21 15:18:41 -08:00
Ryan Huffman
ba2f7d88ce Update ImageOverlay to use TextureCache 2015-01-21 15:09:09 -08:00
Andrew Meadows
1b7074e52a purge EntityCollisionSystem 2015-01-21 14:16:34 -08:00
Andrew Meadows
1c38b08e8f remane emitEntityCollision... to entityCollision... 2015-01-21 14:07:23 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Andrzej Kapolka
8636f0c48e Simplification. 2015-01-21 12:57:24 -08:00
Stephen Birarda
e34fb66be7 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-21 12:41:20 -08:00
Stephen Birarda
693c52da55 hand off audio bandwidth to BandwidthManager 2015-01-21 12:39:04 -08:00
Stephen Birarda
f885dc229b final fixes for Audio includes in Interface 2015-01-21 12:31:10 -08:00
Andrzej Kapolka
87e3339791 Fix for normal selection with degenerate triangles. 2015-01-21 12:28:05 -08:00
Stephen Birarda
b2a9cdde8b migrate Audio header in AudioToolBox 2015-01-21 12:04:33 -08:00
Stephen Birarda
429d660dd6 migrate Audio includes to AudioClient 2015-01-21 12:04:06 -08:00
Stephen Birarda
d2af9a2911 have Application pass audio pos/orientation to AudioClient 2015-01-21 12:03:11 -08:00
Stephen Birarda
e28ca27ccd add a position and orientation getter for AudioClient 2015-01-21 11:55:12 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
Andrew Meadows
e49c76656f merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/physics/src/PhysicsEngine.cpp
 2015-01-21 11:35:36 -08:00
Andrew Meadows
86583f3f3f physics collisions emit script collision events 2015-01-21 11:27:32 -08:00
Atlante45
11ea3e4047 Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-21 11:15:31 -08:00
Atlante45
2f39b93823 Use QDickCache for every QNAM 2015-01-21 11:12:11 -08:00
Thijs Wenker
87b2c362fc style 2015-01-21 17:19:51 +01:00
David Rowe
504bd5e1b1 Expose default eye position to JavaScript 2015-01-21 08:14:46 -08:00
Thijs Wenker
719f76d42f Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-21 15:09:11 +01:00
Thijs Wenker
9e51bece63 More accurate HMD-cursor on virtual keyboard, thanks Simon and @ctrlaltdavid for the help on this! 2015-01-21 15:07:32 +01:00
Andrzej Kapolka
10c4408d94 Slight stitching tweak. 2015-01-20 21:52:56 -08:00
Andrzej Kapolka
79e18b161d Simplification. 2015-01-20 18:42:40 -08:00
Andrzej Kapolka
35547a5a02 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 18:30:50 -08:00
Andrzej Kapolka
460a307ebe Better stitching. 2015-01-20 18:12:00 -08:00
Atlante45
e1725d1eee Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 2015-01-20 17:41:08 -08:00
Atlante45
77bab2a8c2 Setup Thread and timer for settings 2015-01-20 17:11:46 -08:00
Atlante45
2b3f12a7c4 More settings hooks 2015-01-20 16:52:42 -08:00
Atlante45
8d37f5ae00 More setting handles 2015-01-20 15:35:22 -08:00
Andrzej Kapolka
b2079ab849 Go ahead and generate mipmaps for the terrain color texture. 2015-01-20 14:42:48 -08:00
Atlante45
f254591c88 Don't use (set)Geometry to save/restore mainWindow 2015-01-20 14:03:26 -08:00
Andrzej Kapolka
fa466da072 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-20 13:08:25 -08:00
Andrzej Kapolka
b4cd13f0be Fix for misaligned color/material textures when resolution is greater than the 
height map.
 2015-01-20 13:07:35 -08:00
Ryan Huffman
0d9dbaccf7 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-20 11:44:13 -08:00
Clément Brisset
a41ef94f5c Merge pull request #4137 from ctrlaltdavid/null-dereference 
Guard against derefencing NULL
 2015-01-20 11:31:04 -08:00
Stephen Birarda
b4d6a44fc2 Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-20 11:15:54 -08:00
Atlante45
88872825fa Don't call settings in render loop 2015-01-20 10:56:58 -08:00
Atlante45
997f9384da Remove window default geometry 2015-01-20 02:11:51 -08:00
Atlante45
e4fa9e508e Moved loadSetting to MyAvatar 2015-01-20 00:56:25 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
Atlante45
cdb0c22207 interface/ui uses new settings 2015-01-19 22:49:27 -08:00
Atlante45
27390e6c99 Replaced wrong namespace 2015-01-19 22:36:46 -08:00
Atlante45
23bab601c5 LODManager uses new settings 2015-01-19 21:27:21 -08:00
David Rowe
214a18c446 Guard against derefencing NULL 2015-01-19 19:33:12 -08:00
Andrzej Kapolka
16de6a130b Scratch that last change; it wasn't the problem. 2015-01-19 17:29:43 -08:00
Andrzej Kapolka
a16b54a34a Let's try not using the "augmented" data, since we don't need it. 2015-01-19 17:23:31 -08:00
Atlante45
d15d8e0ad6 ScriptsLocation uses new settings 2015-01-19 16:45:10 -08:00
Atlante45
dc972df59d Fixed load/saveAction types 2015-01-19 16:44:54 -08:00
Atlante45
c1e195d17b Remove load/saveSettings from Menu/Application 
Tweaked scanMenuBar too
 2015-01-19 16:24:58 -08:00
Atlante45
43597ea29d Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
 2015-01-19 14:18:22 -08:00
ZappoMan
283ab6dd0c Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/MetavoxelSystem.cpp
 2015-01-19 14:13:46 -08:00
ZappoMan
41c039f283 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-19 13:34:28 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
Andrzej Kapolka
eb320f37c7 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-19 12:41:21 -08:00
Stephen Birarda
60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-19 12:35:22 -08:00
Brad Hefta-Gaub
699964ebb9 Merge pull request #4111 from AndrewMeadows/bispinor 
require Bullet
 2015-01-19 12:30:14 -08:00
Andrzej Kapolka
f0d09860ad Removed a couple magic numbers. 2015-01-19 11:46:12 -08:00
Stephen Birarda
10be0ee984 resolve conflicts on merge with upstream master 2015-01-19 10:26:56 -08:00
David Rowe
9860feec61 Tweak 3D text overlay text size calculations 2015-01-19 09:54:44 -08:00
Atlante45
a2b08cf1cb Hopefully fixes windows compilation error 2015-01-18 20:51:39 -08:00
Atlante45
3dfc725101 Move toggleSixense out of #if HAVE_SIXENSE 2015-01-18 20:37:30 -08:00
Atlante45
967028e5cf Removed more QSettings references 2015-01-18 19:29:27 -08:00
Atlante45
c2b7ff1b54 Totally removed Application's setting memember 2015-01-18 19:10:30 -08:00
Atlante45
92e9df0c74 AnimationsDialog uses new settings 2015-01-18 18:38:00 -08:00
Atlante45
9b442cbe7a Previous script location uses new settings 2015-01-18 18:34:37 -08:00
Atlante45
6bcf49c4e6 Running Script use new Settings 2015-01-18 18:30:43 -08:00
Atlante45
6bda5de5e5 Move (re)storeSizeAndGeometry out of Application 
Moved to MainWindow
 2015-01-18 18:24:44 -08:00
Atlante45
5266ae5397 firstRun uses new Settings 2015-01-18 18:24:28 -08:00
Atlante45
293f2f7f01 Fix broken slot connection 2015-01-18 18:07:33 -08:00
Andrzej Kapolka
a9f7533477 Set/erase brushes. 2015-01-18 16:20:55 -08:00
Andrzej Kapolka
52641bd20f Fix for buffer crash. 2015-01-18 15:17:45 -08:00
Atlante45
e006ae34f7 Removed headers in Menu.cpp 
Replaced with qApp in Menu
 2015-01-18 07:31:47 -08:00
Atlante45
1f31828e08 Moved last methog out of Menu 
Also did a bit of Header cleanup
 2015-01-18 07:14:52 -08:00
Atlante45
e7a2b0296b Removed Menu::bumpSettings() 2015-01-18 06:57:59 -08:00
Atlante45
0e40a61eaa Removed unused method 2015-01-18 06:53:06 -08:00
Atlante45
8933da7bc7 Moved SpeechRecognizer out of Menu 
Added it in the DM
 2015-01-18 06:50:34 -08:00
Atlante45
7f702d3bff Removed loadRSSDKFile() from Menu 2015-01-18 06:31:55 -08:00
Atlante45
9e3b4c6834 Remove unused variable 2015-01-18 06:26:58 -08:00
Atlante45
3bce8204da Moved toggleSixense out of Menu 
Moved into SixenseManager
 2015-01-18 06:25:27 -08:00
Atlante45
8a827dbb3e Remove unneeded sendFakeEnterEvent() 2015-01-18 06:18:41 -08:00
Atlante45
17e0b0b551 Remove unused wallet private key for now 2015-01-18 06:16:57 -08:00
Atlante45
180de82e52 Remove warning 2015-01-18 06:16:53 -08:00
Atlante45
5930e06849 Moved Snapshot location out of Menu 
Moved into Snapshot
 2015-01-18 06:02:03 -08:00
Atlante45
488d8a03d5 Moved getShadowEnabled out of Menu 
Moved to Application
 2015-01-18 05:52:19 -08:00
Atlante45
df69466887 Moved copyPath/Address out of Menu 
Moved into AddressManager
 2015-01-18 05:48:14 -08:00
Atlante45
d313c23871 Fixed unused variable warning 2015-01-18 05:41:05 -08:00
Atlante45
fdce0baee9 Removed vsync slot from menu 2015-01-18 05:39:53 -08:00
Atlante45
bac448af5d Mute mute slot out of Menu 2015-01-18 05:29:25 -08:00
Atlante45
90c3c7955a Moved chat out of Menu 
Move into DialogsManager
	Done moving dialogs out of Menu!!!
 2015-01-18 05:16:33 -08:00
Atlante45
c600a3b0b3 More dialog out of Menu (Almost there) 
Moved into DialogsManager
 2015-01-18 04:47:13 -08:00
Atlante45
8d483c9e6e Moved some more dialogs out of Menu 
All moved into DialogsManager
 2015-01-18 04:34:33 -08:00
Atlante45
afadb0b48c Moved more dialogs out of Menu 
All moved into DialogsManager
 2015-01-18 04:08:34 -08:00
Atlante45
05edbd68bf Moved OctreeStatsDialog out of Menu 
Moved it into DialogsManager
 2015-01-18 03:48:37 -08:00
Atlante45
fb8639b85c Moved AddressBar out of Menu 
Moved into DialogsManager
 2015-01-18 03:31:55 -08:00
Atlante45
8f9507cd4c Added DialogsManager 
Moved login dialog out of menu into the dialog manager
	More to follow!
 2015-01-18 03:31:44 -08:00
Andrzej Kapolka
27255fbb4a Hermite display fix. 2015-01-18 01:04:45 -08:00
Andrzej Kapolka
393d537c16 Edge fix. 2015-01-18 00:26:43 -08:00
Andrzej Kapolka
61cbafadd4 More corner cases. 2015-01-18 00:18:35 -08:00
Atlante45
e8a396b08b Moved Octree max pps out of Menu 
Moved it to OctreeQuery
 2015-01-17 23:31:38 -08:00
Atlante45
21a3705b48 Added StandAloneJSConsole class 
Moved _jsConsole out of Menu to a global class of it's own
 2015-01-17 23:08:30 -08:00
Atlante45
bfceaf2838 Moved FieldOfView related members out of Menu 
Moved them to ViewFrustum
 2015-01-17 22:37:02 -08:00
Atlante45
b743a51fa0 Moved SixenseManager header from Menu .h to .cpp 2015-01-17 22:14:48 -08:00
Atlante45
47babc2d40 Move Sixense related members out of Menu 
Moved to SixenseManager
 2015-01-17 22:09:29 -08:00
Atlante45
ef5cfdc3ab Move Faceshift related member out of Menu 
Moved it to Faceshift class
 2015-01-17 21:35:25 -08:00
Atlante45
8f5f634308 Took audio settings out of Menu 
Hooked to actual settings in Audio class
 2015-01-17 21:22:02 -08:00
Andrzej Kapolka
9edb3e84cb Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-17 20:17:49 -08:00
Andrzej Kapolka
5bb441b6ef Added a "voxelize" brush for debugging. 2015-01-17 20:17:28 -08:00
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
Thijs Wenker
6bad7a6002 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-17 01:35:35 +01: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
5de4f8f249 Merge branch 'master' of https://github.com/worklist/hifi into 20224 
Conflicts:
	examples/libraries/virtualKeyboard.js
 2015-01-15 22:59:05 +01: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
Thijs Wenker
12136e5305 cursor follows look at rotation now 2015-01-15 22:25:59 +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
Thijs Wenker
2611e2f364 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-14 15:40:46 +01: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
Thijs Wenker
0f6ad4eba0 HMD.VRMode -> HMD.active , and hooked it to a function which isn't dependent on HMD type, since there will be more HMD's than Oculus supported in the near future. 2015-01-14 00:07:15 +01:00
Stephen Birarda
92b8cd2d1e handle storage of user location in new format 2015-01-13 15:02:04 -08:00
Thijs Wenker
ca4d493ec9 added HMD.VRMode to HMDScriptingInterface 2015-01-14 00:01:50 +01:00
Stephen Birarda
16261a5fc1 more updates for new place/location APIs 2015-01-13 14:49:24 -08:00
Thijs Wenker
74d56fb754 Merge branch 'master' of https://github.com/worklist/hifi into 20224 2015-01-13 22:42:02 +01: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
Stephen Birarda
661221a189 repairs to AudioScriptingInterface playSound 2015-01-12 16:04:00 -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