Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-16 08:46:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
20874 commits 25 branches 0 tags 1.1 GiB
Commit graph

2814 commits

Author SHA1 Message Date
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
Stephen Birarda
9c1196a2a6 put user location without curly braces 2015-01-16 12:08:56 -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
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
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
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
426cd71fc6 Persist bookmarks to file 2015-01-14 22:58:13 -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
69869a696b remove name this location call from application 2015-01-14 17:00:21 -08:00
Stephen Birarda
f745dfdb91 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-14 16:54:51 -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
Atlante45
f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 2015-01-13 20:38:52 -08:00
Atlante45
36db547c0f Setup DependencyManager before any member of Application 2015-01-13 20:35:45 -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
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
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
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
David Rowe
8b0d859686 Add method to access downloads information in JavaScript 2015-01-06 15:54:07 -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
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
0e943ae240 remove render view frustum mode 2015-01-05 17:23:10 -08:00
Sam Gateau
2fdcbb1a97 changing the atmoshpere position 2015-01-05 16:46:42 -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
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -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
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
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
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
Sam Gateau
ef7c002237 Improving the shadow effect with lightmaps 2015-01-02 10:31:34 -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
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
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
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00