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

7621 commits

Author SHA1 Message Date
Brad Hefta-Gaub
a5294ae3fa Merge pull request #4436 from sethalves/persist-entities-as-json 
Optionally persist entities as json
 2015-03-17 21:53:17 -07:00
Clément Brisset
9acc4a1a8f Merge pull request #4457 from ZappoMan/quietLogs 
dont report deleteEntity warnings in client for delete messages coming back from server
 2015-03-17 15:42:20 +01:00
Clément Brisset
6ffd44e768 Merge pull request #4456 from birarda/master 
go to sandbox if location not present in settings
 2015-03-17 15:31:09 +01:00
Seth Alves
bed37ef49a incorporate code review feedback 2015-03-16 13:57:22 -07:00
Brad Davis
fd29f72bfe Making nsight usage optional (still defaults to on) 2015-03-16 12:59:41 -07:00
Seth Alves
c90ca4b425 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-16 12:13:26 -07:00
Seth Alves
fe658c0ed0 diff minimization 2015-03-16 12:13:16 -07:00
Seth Alves
5bc2d88ea6 diff minimization 2015-03-16 12:11:41 -07:00
Seth Alves
999324bcaf remove unused code 2015-03-16 12:06:27 -07:00
Seth Alves
1e50d94384 don't put arbitrarily large array on stack 2015-03-16 11:59:30 -07:00
Seth Alves
2d4a95c634 move to-map recurse operator class to its own file 2015-03-16 11:54:50 -07:00
Seth Alves
109271de3d remove unused constant 2015-03-16 11:54:06 -07:00
Seth Alves
ecb958687d don't crash if we encounter an unknown shape type 2015-03-16 11:53:47 -07:00
Andrew Meadows
e18d9fd81c Merge pull request #4452 from sethalves/obj-reader-fixes 
Obj reader fixes
 2015-03-16 11:35:51 -07:00
Andrew Meadows
fa27b76183 Merge pull request #4442 from Atlante45/edit_entities_box_selection 
editEntities - select all in/touching box
 2015-03-16 11:33:35 -07:00
ZappoMan
7ddd54b782 dont report deleteEntity warnings in client for delete messages coming back from server 2015-03-16 11:11:07 -07:00
Stephen Birarda
a874f933c6 go to sandbox if location not present in settings 2015-03-16 11:00:04 -07:00
Seth Alves
a2bc34ced9 fix attempt to avoid normalizing a zero length vector, other adjustments to respond to code review 2015-03-16 10:03:55 -07:00
Seth Alves
32c79f6172 bounce json's QVariants through QScripts before making them into properties, in order to take advantage of existing conversion code 2015-03-16 09:17:32 -07:00
Atlante45
c6167f6893 CR 2015-03-16 14:35:17 +01:00
Atlante45
ad16f49d01 Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection 2015-03-16 14:28:24 +01:00
Seth Alves
bd85179d82 suppress a compiler warning 2015-03-15 08:24:59 -07:00
Seth Alves
af10c2274b remove stray carriage returns 2015-03-15 08:24:49 -07:00
Seth Alves
b15fd2ef94 compatibility and other fixes for obj reader 2015-03-15 08:08:39 -07:00
Seth Alves
6c4b808813 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-15 07:10:56 -07:00
Stephen Birarda
9d055f81f4 use a Mozilla user agent for mod security 2015-03-13 18:29:55 -07:00
Stephen Birarda
9f7ed7b12a update user agent to be HighFidelityInterface 2015-03-13 18:28:09 -07:00
Stephen Birarda
dcff4f5956 use HIGH_FIDELITY_USER_AGENT for DataWebPage 2015-03-13 18:25:17 -07:00
Stephen Birarda
641581a825 Merge pull request #4446 from huffman/marketplace-window 
Marketplace window
 2015-03-13 17:51:44 -07:00
Philip Rosedale
6a4dbd35b5 Merge pull request #4449 from AndrewMeadows/thermonuclear 
ShapeManager can release shape by pointer
 2015-03-13 17:34:32 -07:00
Philip Rosedale
009551c4dd Merge pull request #4441 from AndrewMeadows/isentropic 
more correct shape for avatar collision capsule
 2015-03-13 17:33:16 -07:00
samcake
8581e6b4a9 Merge pull request #4445 from Atlante45/resource_cache_bug 
Fix the timeout crash
 2015-03-13 17:29:23 -07:00
Ryan Huffman
f44ab9da8f Update OAuthNetworkAccessManager to only send auth to metaverse 2015-03-13 17:29:01 -07:00
Andrew Meadows
e4c6d49c4d ShapeManager can release shape by pointer 2015-03-13 16:36:18 -07:00
Ryan Huffman
d512a67c8a Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays 2015-03-13 14:13:56 -07:00
Atlante45
405301f861 Don't refresh if no lastModified tag in http request 2015-03-13 20:24:52 +01:00
Atlante45
691b078efc Fix the timeout crash 2015-03-13 18:43:51 +01:00
Andrew Meadows
99e2d799c5 correct math for capsule halfHeight 2015-03-13 09:40:32 -07:00
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Atlante45
29300e0ae0 Added findEntitiesInBox to JS API 2015-03-13 13:55:26 +01:00
Atlante45
7911974946 Added findEntities for AAbox 2015-03-13 13:55:26 +01:00
Andrew Meadows
be252147e2 merge upstream/master into andrew/isentropic 2015-03-12 16:38:59 -07:00
Andrew Meadows
a1a12465da able to update avatar controller in PhysicsEngine 2015-03-12 16:36:41 -07:00
Stephen Birarda
0fe843db01 Revert "remove the launch activity from UserActivityLogger" 
This reverts commit bc6ac9081f.
 2015-03-12 15:53:05 -07:00
Stephen Birarda
bc6ac9081f remove the launch activity from UserActivityLogger 2015-03-12 15:08:05 -07:00
Stephen Birarda
0b55a0f123 remove the close event from UserActivityLogger 2015-03-12 15:06:44 -07:00
Stephen Birarda
df8864f9b0 Revert "make sure UserActivityLogger::close() waits for the pending log message to complete" 
This reverts commit 3bd3f5a6d2.
 2015-03-12 15:04:51 -07:00
Stephen Birarda
471e55c8ce fix some lingering warnings 2015-03-12 12:36:39 -07:00
Stephen Birarda
09e2c0987e use Dependency customDeleter for Application NL 2015-03-12 12:27:48 -07:00
Stephen Birarda
cd2ce2ee2f Merge branch 'master' of https://github.com/highfidelity/hifi 2015-03-12 12:14:43 -07:00