Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-28 03:16:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
21193 commits 6 branches 1 tag 1.1 GiB
Commit graph

6846 commits

Author SHA1 Message Date
Stephen Birarda
990ca8397e add extra debugging for AddressManager connect to domain 2015-01-19 10:23:05 -08:00
Andrzej Kapolka
2ed6835426 Use alpha channel to indicate holes when importing terrain images. 2015-01-18 16:30:46 -08:00
Andrzej Kapolka
a9f7533477 Set/erase brushes. 2015-01-18 16:20:55 -08:00
Andrzej Kapolka
61cbafadd4 More corner cases. 2015-01-18 00:18:35 -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
Andrzej Kapolka
3dbbbb72b0 Fixes for deltas when root hasn't changed, range updates. 2015-01-16 16:49:22 -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
Andrew Meadows
840acecbe6 merge upstream/master into andrew/bispinor 
Conflicts:
	libraries/physics/src/EntityMotionState.cpp
 2015-01-16 15:22:06 -08:00
Andrew Meadows
d5efc375d9 Merge pull request #4128 from ZappoMan/master 
fix double targets and freezing bullets
 2015-01-16 14:37:22 -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
ZappoMan
9a60896a40 fix double targets and freezing bullets 2015-01-16 14:24:50 -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
Andrzej Kapolka
b6c843497d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2015-01-16 11:56:04 -08:00
Andrew Meadows
7c9419aa4e fix non-bullet build 2015-01-16 10:34:52 -08:00
Sam Gateau
afb6175d60 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-16 10:32:56 -08:00
Sam Gateau
6b55b4ff82 No more Magic numbers and fixing the code path for linux 2015-01-16 10:26:51 -08:00
Andrew Meadows
2427fa68cd remove unnecessary Bullet #include 2015-01-16 10:06:39 -08:00
Sam Gateau
8634d86167 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:43:21 -08:00
Sam Gateau
0e38ea8854 Adding ambient sphere in the lighting equation and menu to control te presets 2015-01-16 09:41:43 -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
Andrew Meadows
4392af3b3a Remove pre-Bullet server-side EntityItem motion 2015-01-16 09:26:43 -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
4c1cd991f4 remove pessimistic send of object updates 
we have not yet seen the headache of packetloss and unreliable messages
 2015-01-15 17:53:37 -08:00
Andrew Meadows
250fd98fee support for simple kinematic motion 2015-01-15 17:51:01 -08:00
Sam Gateau
0fdc9c1855 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 15:27:52 -08:00
Sam Gateau
7ae9635ce7 Refactoring the code from directional into DeferredLighting.slh 2015-01-15 15:27:18 -08:00
Stephen Birarda
6f5d9d54ec Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-15 14:15:38 -08:00
Stephen Birarda
b2c5847d9b Merge pull request #4117 from Atlante45/dm_update 
Drop DM ref before creating new object
 2015-01-15 14:15:01 -08:00
Atlante45
786c0a5462 Drop DM ref before creating new object 2015-01-15 14:00:45 -08:00
Stephen Birarda
250a3de9fe make node mutex in LimitedNodeList recursive for double read lock 2015-01-15 13:34:33 -08:00
Stephen Birarda
e538669343 resolve conflicts on merge with upstream 2015-01-15 13:12:05 -08:00
Sam Gateau
d759f4c255 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-15 11:54:55 -08:00
Sam Gateau
067483fce2 Adding a prototype of ambient lighting with spherical harmonics 2015-01-15 11:54:01 -08:00
Andrew Meadows
51cc9d6d9a alt method for repressing unused var warnings 2015-01-15 10:46:09 -08:00
Andrew Meadows
9eb4d66327 remove warnings 2015-01-15 10:36:17 -08:00
Andrew Meadows
ff171a5782 Bullet is now required dependency 2015-01-15 10:27:43 -08:00
Brad Hefta-Gaub
89967fbe7a Merge pull request #4104 from AndrewMeadows/inertia 
store density in EntityItem instead of mass
 2015-01-14 17:17:45 -08:00
Brad Hefta-Gaub
9d45bed0e2 Merge pull request #4103 from Atlante45/applications_diet_cpp11 
DependencyManager update
 2015-01-14 17:17:07 -08:00
Philip Rosedale
1188be52e4 Merge pull request #4106 from ZappoMan/rayPickWork 
fix ray pick of ellipsoids away from origin
 2015-01-14 17:10:30 -08:00
Stephen Birarda
b8b5b2b6ec don't check the root object for path 2015-01-14 16:56:49 -08:00
ZappoMan
ff60833129 fix ray pick of ellipsoids away from origin 2015-01-14 16:55:24 -08:00
Stephen Birarda
f745dfdb91 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-14 16:54:51 -08:00
Atlante45
b922b028e9 Fixes body not rotating for other avatars 2015-01-14 16:47:20 -08:00
Sam Gateau
614e1aa6ae Cleaning the Model rendering path from any use of glMaterial 2015-01-14 16:44:44 -08:00
Andrew Meadows
ccc50dd94f use density instead of mass 2015-01-14 15:47:44 -08:00
Andrew Meadows
03b8badd81 EntityItem stores density rather than mass. 2015-01-14 15:00:57 -08:00
Andrew Meadows
8236837dd0 add ShapeInfo::computeVolume() 2015-01-14 15:00:31 -08:00
Sam Gateau
7be1f41659 using the Material class 2015-01-14 10:22:27 -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
27cc3d297e DependencyManager update 
- Now need a call to DependencyManager::set(...) that support
	  variable arguments number and type
	- Now support destroy operation via DependencyManager::destroy()
	- Now support inheritance. All inheritance relationship need to
	  be specified via DependencyManager::registerInheritance<Base,
Derived>() before any call to the DepedencyManager involving Base.
	- Dependencies should now inherit from the class Dependency as
	  well as using SINGLETON_DEPENDENCY
 2015-01-13 20:27:38 -08:00
Sam Gateau
1bbdb43d8c Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-13 18:24:59 -08:00
dev
d7ad5a35d6 fixes for glsl mac 2015-01-13 18:24:32 -08:00
Andrew Meadows
dd2421ffcd Merge pull request #4100 from ZappoMan/backupBugFix 
Add support for multiple backup rules
 2015-01-13 17:59:44 -08:00
Brad Hefta-Gaub
b3b43b4c14 Merge pull request #4093 from samcake/temp0 
Factorize the shader code for deferred lighting
 2015-01-13 17:11:17 -08:00
Brad Hefta-Gaub
284ee32b7b Merge pull request #4089 from AndrewMeadows/inertia 
fix glitchy entity motion in Bullet simulation
 2015-01-13 17:10:35 -08:00
Clément Brisset
808cbfe16a Merge pull request #4088 from ctrlaltdavid/qnetworkreply-error-code 
Use more appropriate QNetworkReply error code
 2015-01-13 17:06:42 -08:00
dev
d3edd14638 fixes for glsl mac 2015-01-13 16:53:22 -08:00
Sam Gateau
9c083ce86e Using the model::Material for rendering and in shaders 2015-01-13 15:51:18 -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
Andrew Meadows
04b4a95ccb fix for bad cleanup (3 places) 2015-01-13 14:21:41 -08:00
Stephen Birarda
1af87e57da handle new places API format in AddressManager 2015-01-13 14:21:07 -08:00
Sam Gateau
d9efafac7e updating the model fragment shaders to use DeferredBUfferWrite 2015-01-13 14:11:38 -08:00
Andrew Meadows
cee7a4db10 merge upstream/master into andrew/inertia 2015-01-13 14:03:27 -08:00
Andrew Meadows
dcca5d532a fix for glitchy physics updates 
The main problem was: ObjectMotionState::_sentPosition and friends
were not being updated when the EntityServer update arrives.
 2015-01-13 14:00:37 -08:00
ZappoMan
0e19e1f8a5 cleanup some dead code 2015-01-13 13:48:28 -08:00
ZappoMan
60aec8ac00 add support for multiple backup rules 2015-01-13 13:41:32 -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
Sam Gateau
522e7698a5 first step factorizing the packDeferredFragment 2015-01-13 10:23:00 -08:00
Sam Gateau
6d217e1479 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-01-13 10:07:27 -08:00
Sam Gateau
fc698a8525 first step factorizing the packDeferredFragment 2015-01-12 18:51:26 -08:00
Atlante45
79b9a898de Merge branch 'master' of https://github.com/highfidelity/hifi into body_not_rotating 2015-01-12 17:34:13 -08:00
Atlante45
7d39b45f16 Hopefully fixes the windows compile error 2015-01-12 17:34:07 -08:00
Brad Hefta-Gaub
535f6e267b Merge pull request #4069 from ctrlaltdavid/static-glew 
Use static GLEW in render-utils for Windows
 2015-01-12 17:30:47 -08:00
ZappoMan
ea3a5b7fcd use last backup files timestamp as last backup time. 2015-01-12 17:29:10 -08:00
Atlante45
b6ba82653f Remove glm dependency 2015-01-12 17:00:39 -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
Atlante45
80af2adf12 Remove constexpr because windows can't handle them 2015-01-12 16:42:27 -08:00
Clément Brisset
206e1e48f6 Merge pull request #4086 from huffman/std-to-qstring 
Std to qstring
 2015-01-12 16:19:28 -08: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
Sam Gateau
1566157250 Use the DeferredBuffer.slh in point and spot lights 2015-01-12 15:52:31 -08:00
Atlante45
8415098fc2 Set different caches size depending on cache type 2015-01-12 15:36:36 -08:00
Sam Gateau
c45f618852 Factorising the shader code to unpack data from the deferred buffer 2015-01-12 15:00:35 -08:00
Andrew Meadows
7a2ecd27fd fix typo 2015-01-12 14:32:32 -08:00
ZappoMan
7b65c75414 first cut at restoreFromMostRecentBackup 2015-01-12 14:32:13 -08:00
Atlante45
e70e435dcc Added Min/Max values for cache size 2015-01-12 12:45:13 -08:00
ZappoMan
1562aab6da intitial pass at lock file 2015-01-12 12:35:17 -08:00
Andrew Meadows
081037bc5f merge upstream/master into andrew/inertia 2015-01-12 12:34: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
Andrzej Kapolka
5f7a304c85 Crash fix. 2015-01-12 12:00:01 -08:00
Andrew Meadows
bece05a994 entity prop defaults move to their own header 2015-01-12 11:49:31 -08:00
Atlante45
81bf1e4f53 Some code maintainance 2015-01-12 11:46:38 -08:00
Atlante45
bad96e0ba4 cache size getter/setter 2015-01-12 11:37:42 -08:00
Atlante45
ea0ffd0125 Introduce reserveUnusedResource 2015-01-12 11:37:00 -08:00
Atlante45
cb3f07e6f5 Remove unusedResourcesMaxCount 2015-01-12 11:18:55 -08:00
Atlante45
08317b51da Use removeUnusedResources 2015-01-12 11:12:50 -08:00
David Rowe
17925c7a81 Use more appropriate QNetworkReply error code 
This error code is available now that Interface is built with Qt 5.3.
 2015-01-12 11:06:05 -08:00
Sam Gateau
06b44626f3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-12 10:09:50 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Atlante45
5cdc76ad35 Put cache max size/count as class members 2015-01-11 22:48:42 -08:00
Andrew Meadows
89a782c55a remove functional code from inside assert 2015-01-11 13:31:37 -08:00
ZappoMan
60f55c7f3f remove important code from assert so it still runs in release build 2015-01-11 12:07:16 -08:00
Sam Gateau
26a316db3a Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-11 11:35:19 -08:00
Sam Gateau
e639c5a549 playing with the ambient lighting 2015-01-11 11:33:21 -08:00
Andrew Meadows
5309fb6a43 remove lock at EntityTreeRenderer::loadEntityScript 2015-01-11 10:44:36 -08:00
Andrew Meadows
e711b86519 scale DEFAULT_DIMENSIONS correctly 
also remove a block of commented out cruft
 2015-01-10 19:07:58 -08:00
Andrew Meadows
1184f5b668 merge upstream/master into andrew/inertia 2015-01-10 12:45:14 -08:00
Andrew Meadows
25e64d619c move statics out of EntityItem 
This makes for much more readable core dumps
 2015-01-10 11:46:42 -08:00
Andrew Meadows
ecd352fd4d merge upstream/master into andrew/bispinor 2015-01-10 07:47:52 -08:00
Andrew Meadows
99e1fdd46e fix for EntityServer crash 
adding EntityItem::_element backpointer for easier add/remove logic
 2015-01-10 07:44:26 -08:00
Andrzej Kapolka
d002359989 Stitching improvement. 2015-01-09 16:43:51 -08:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
Brad Hefta-Gaub
f18594cfdb Merge pull request #4076 from Atlante45/master 
Don't call delete later unless you have to
 2015-01-09 15:43:45 -08:00
Atlante45
6d67b8e20c Don't call delete later unless you have to 2015-01-09 15:32:08 -08:00
Andrzej Kapolka
dfbc3502fa Use ray intersection code to get heightfield height. 2015-01-09 15:06:47 -08:00
Atlante45
063e95bd79 Clement doesn't know how to use radians 2015-01-09 14:31:34 -08:00
Andrzej Kapolka
70890c68aa "Fill" brush (removes dual contour data). 2015-01-09 14:19:13 -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
02b9aaacf8 Bump packet version 2015-01-09 11:16:58 -08:00
Atlante45
f2b7cb005a Removed leans/Changed Head rotation in avatardata packets 2015-01-09 11:16:49 -08:00
Atlante45
16e1fc8c3a Added isMyAvatar to AvatarData too 2015-01-09 11:16:05 -08:00
Atlante45
05d2887c94 Move Torso twist to HeadData with Lean 2015-01-09 11:15:01 -08:00
Andrew Meadows
4946ec18b6 remove some TODO comments 2015-01-09 09:28:01 -08:00
Philip Rosedale
336378679f Merge pull request #4068 from ctrlaltdavid/type-definitions 
Fix miscellaneous types and casts
 2015-01-09 08:40:08 -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
Andrzej Kapolka
0dc4b26367 Basic stack merging. 2015-01-08 21:37:53 -08:00
Atlante45
441a1e4fee Turns out windows doesn't like constexpr 2015-01-08 18:35:23 -08:00
Atlante45
891d8d5abf Removed unecessary foreach 2015-01-08 18:22:25 -08:00
David Rowe
a5b3ae397a Code review 2015-01-08 18:20:23 -08:00
Atlante45
ea832cfd45 Added constant 2015-01-08 17:33:47 -08:00
Atlante45
77e4a2ef35 Add byte limit to chaches 2015-01-08 17:06:05 -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
David Rowe
75758c1a3e Use static GLEW in render-utils for Windows 2015-01-08 15:40:54 -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
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
Atlante45
8dbaeeb646 Delete each entityItems 2015-01-08 13:08:43 -08:00
Andrzej Kapolka
ec32739689 CSG improvements. 2015-01-08 12:52:52 -08:00
Andrew Meadows
f8c512b690 fix deleteEntity() to actually delete result 2015-01-08 12:42:16 -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
6fc3e1cf81 change message size 2015-01-08 11:51:14 -08:00
Atlante45
af9525ed33 Bump AvatarData packet number 2015-01-08 11:49:39 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Atlante45
b8a3bdb6bd Cleanup headers 2015-01-08 11:25:35 -08:00