Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
43847 commits 75 branches 59 tags 1.2 GiB
Commit graph

17947 commits

Author SHA1 Message Date
Brad Hefta-Gaub
1cf8236860 Merge branch 'master' of https://github.com/highfidelity/hifi into protocolVersionCheck 2016-05-24 13:31:36 -07:00
Brad Hefta-Gaub
1d9981e624 first cut at support for verifying all protocol version compatibility 2016-05-24 13:31:19 -07:00
Brad Hefta-Gaub
b8b39b962d Merge pull request #7868 from jherico/entity_shape 
Add a generic shape primitive
 2016-05-24 08:40:58 -07:00
Brad Hefta-Gaub
bfb3f2cdfe Merge pull request #7955 from sethalves/quiet-compiler 
quiet gcc 5 warnings
 2016-05-23 19:44:21 -07:00
Anthony J. Thibault
4342a07108 Updated AvatarDataPacket section with sequence number info. 2016-05-23 11:11:37 -07:00
Clément Brisset
a8b359dd60 Merge pull request #7943 from birarda/api-recheck-on-fail 
refresh connection info for place/domain while not connected
 2016-05-23 10:57:58 -07:00
Anthony J. Thibault
9aad38b2c2 merge fix 2016-05-23 10:39:39 -07:00
Anthony J. Thibault
a1c32f8c44 Merge branch 'master' into tony/improved-avatar-mixer-precision 2016-05-23 10:24:52 -07:00
Anthony J. Thibault
5fe01acaa8 Added more comments to AvatarDataPacket section. 2016-05-23 10:03:13 -07:00
Seth Alves
00336f4860 Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-js-restart 2016-05-23 09:58:20 -07:00
Brad Hefta-Gaub
f69c0ce5e5 Merge pull request #7957 from jherico/procedural_skybox_fix 
fix broken procedural skybox when leaving and re-entering
 2016-05-23 09:29:31 -07:00
Geenz
bd6f6d2eef Typo. 
Not quite sure how this got here.
 2016-05-23 09:53:22 -04:00
Brad Davis
1f2f9da019 fix keys getting stuck 2016-05-22 23:34:45 -07:00
Brad Davis
11de8a52b2 fix broken procedural skybox when leaving and re-entering 2016-05-22 22:52:56 -07:00
Brad Davis
2c703e963c More shapes 2016-05-22 19:48:59 -07:00
Geenz
ff3fca3dc3 Remove no longer necessary light vector parameter. 2016-05-22 21:50:48 -04:00
Geenz
180f4ba4f5 Tweaked light attenuation formula some more. 
Keeping the ulightvec parameter for now - I want to revisit this later.
 2016-05-22 21:02:28 -04:00
Geenz
9e9f95059f Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-22 18:08:58 -04:00
Brad Davis
cd1e910844 Add a generic shape primitive 2016-05-21 23:46:44 -07:00
Seth Alves
40e862cf9e quiet gcc 5 warnings 2016-05-21 16:53:01 -07:00
Brad Hefta-Gaub
ac49feda22 Merge branch 'master' of https://github.com/highfidelity/hifi into removeDisableEntityNACKS 
Conflicts:
	libraries/entities/src/EntityEditPacketSender.h
 2016-05-21 09:23:45 -07:00
Geenz
a80f47e550 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-20 21:12:42 -04:00
Seth Alves
637735bbc3 unmangle merge 2016-05-20 18:07:38 -07:00
Seth Alves
f91a2403be merge from upstream 2016-05-20 17:07:34 -07:00
Brad Hefta-Gaub
e012630db2 Merge pull request #7860 from birarda/place-referrer 
send lookup hostname to DS for split counts, correct number of DS connected users
 2016-05-20 17:00:46 -07:00
Brad Hefta-Gaub
18613908df Merge pull request #7800 from sethalves/no-fly-zones 
No fly zones
 2016-05-20 16:59:55 -07:00
Brad Hefta-Gaub
dc29e97d32 Merge pull request #7870 from jherico/input_cleanup 
Update input plugins default active state & joint handling
 2016-05-20 16:13:06 -07:00
Brad Hefta-Gaub
2062291810 Merge pull request #7926 from zzmp/fix/debug-script-crash 
fix crash on shutdown in debug
 2016-05-20 15:35:32 -07:00
Brad Hefta-Gaub
9dded91af3 Merge pull request #7934 from AndrewMeadows/trim-convex-hulls 
reduce number of points in unreasonable convex hulls
 2016-05-20 15:30:36 -07:00
Brad Hefta-Gaub
2a94b641e3 Merge pull request #7930 from zzmp/fix/zero-copy-crash 
fix crash from zero-sized copy
 2016-05-20 15:11:00 -07:00
Andrew Meadows
2e30f0916c remove debug logging and add some comments 2016-05-20 15:07:47 -07:00
Brad Davis
07562f72af Doing a pass over the input plugins and controller code 2016-05-20 14:50:23 -07:00
Seth Alves
ff36b39067 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-20 14:38:53 -07:00
Brad Hefta-Gaub
770fab956f remove dead code 2016-05-20 12:23:06 -07:00
Seth Alves
76f4a25694 move code that clears old scale and registration to after model is loaded 2016-05-20 11:40:46 -07:00
Stephen Birarda
33379824c8 clear place name if switching to a domain ID string 2016-05-20 11:25:26 -07:00
Stephen Birarda
5ab876114f send hostname to DS with every DS packet to handle changes 2016-05-20 11:24:54 -07:00
Stephen Birarda
7110fe98eb associate incoming place name with DomainServerNodeData 2016-05-20 11:24:54 -07:00
Stephen Birarda
51c16739f2 provide a getter for the place name in AddressManager 2016-05-20 11:24:54 -07:00
Seth Alves
1ef0f8055b fix grammar in comment 2016-05-20 10:12:59 -07:00
Seth Alves
35065ab05e remove unused setter 2016-05-20 10:12:38 -07:00
Seth Alves
aa58cad93e code review 2016-05-20 09:54:54 -07:00
Andrew Meadows
83b8ef8131 clean up stream formatting of vec3 and friends 2016-05-20 09:41:26 -07:00
Andrew Meadows
f3fc00bc3a add comment for why MAX_HULL_POINTS is 42 2016-05-20 09:41:26 -07:00
Andrew Meadows
5a826d696a cleanup after code review 2016-05-20 09:41:26 -07:00
Andrew Meadows
9fae1a7edd tweak log format 2016-05-20 09:41:26 -07:00
Andrew Meadows
7866fcf78c trim high-point convex hulls 2016-05-20 09:41:26 -07:00
Brad Hefta-Gaub
95f7ea5609 Merge pull request #7922 from samcake/red 
improve performance of Light volume pass
 2016-05-20 09:33:55 -07:00
Zach Pomerantz
4c8ff557db Merge branch 'master' of github.com:highfidelity/hifi into fix/debug-script-crash 2016-05-20 09:31:30 -07:00
Brad Hefta-Gaub
8760cd0807 Merge pull request #7929 from zzmp/fix/script-downloaded-shutdown 
fix crash on shutdown from scriptDownloaded callback
 2016-05-20 09:31:04 -07:00
Brad Hefta-Gaub
25e7b9935e Merge pull request #7932 from zzmp/fix/shadows 
fix shadow box that appears when flying
 2016-05-20 09:30:29 -07:00
Zach Pomerantz
fff260c2b9 Guard against zero-sized gl buffer copy 2016-05-20 09:27:50 -07:00
Anthony J. Thibault
c73943ee19 macosx warning fixes 2016-05-19 20:32:08 -07:00
Anthony J. Thibault
b95ba8141c AvatarData packet overhaul, uses a structure instead of raw memcpy 2016-05-19 20:26:00 -07:00
Stephen Birarda
e8d7f9614a refresh API info during re-connect - case 570 2016-05-19 17:59:42 -07:00
Geenz
e2f5d22c98 Merge remote-tracking branch 'highfidelity/master' into 20901 2016-05-19 20:57:31 -04:00
Brad Hefta-Gaub
a1ec6c2961 Merge pull request #7938 from sethalves/set-age-of-imported-to-zero 
fix age of imported entities
 2016-05-19 17:53:31 -07:00
Brad Hefta-Gaub
d521cd82a0 Merge pull request #7908 from Atlante45/fix/settings 
fix settings getting reset
 2016-05-19 17:53:15 -07:00
Geenz
75532cda08 Document evalLightAttenuation's parameters. 2016-05-19 20:52:28 -04:00
Geenz
a54e8206fa Switch back to using the light's radius + spacing 2016-05-19 20:10:49 -04:00
Geenz
6ecbdc6b9a Modify evalLightAttenuation to "fade" edges of lights. 
This provides a more attractive light falloff around the bounds of a
light - removing harsh edges.

This also adds a new parameter to evalLightAttenuation - the
unnormalized light vector.
 2016-05-19 20:03:05 -04:00
Anthony J. Thibault
13a057513a Removed jointIndices transmission experiment 2016-05-19 16:46:17 -07:00
Seth Alves
1de9598243 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 16:37:40 -07:00
Seth Alves
3f5ed4bef8 set isStopping on other calls to stop 2016-05-19 16:15:33 -07:00
Seth Alves
9ad488ba7b fix method name to match coding standard 2016-05-19 16:08:44 -07:00
Seth Alves
4e862941cb fix a race when restarting scripts -- avoid the old not-yet-stopped script from being considered the restart script 2016-05-19 14:51:56 -07:00
Brad Hefta-Gaub
cef4a49c35 Merge pull request #7867 from huffman/fix/query-octree-crash 
Fix crash in JurisdictionMap
 2016-05-19 11:53:54 -07:00
Brad Hefta-Gaub
ac15097f47 Merge pull request #7834 from huffman/feat/user-agent-plugins 
Add system information to UserAgent in AccountManager requests
 2016-05-19 11:53:14 -07:00
samcake
67929a018c Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-19 11:52:47 -07:00
Clément Brisset
cddf587d6b Merge pull request #7919 from zzmp/fix/osx-warnings 
Fix OSX warnings
 2016-05-19 11:11:30 -07:00
samcake
039bb3ac3c Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-19 10:21:38 -07:00
Seth Alves
7ea7bd3e1d set created-time for imported entities to 'now' 2016-05-19 10:21:04 -07:00
samcake
2d7118dacc clening up the code 2016-05-19 10:21:00 -07:00
samcake
d0c883f75a Merge pull request #7923 from jherico/gpu_breakup2 
breaking up OpenGL GPU backend
 2016-05-19 10:02:42 -07:00
Brad Hefta-Gaub
232bd475df Merge pull request #7927 from zzmp/fix/script-timer-crash 
fix crash on shutdown from script timers
 2016-05-19 09:52:04 -07:00
Seth Alves
74520f5c92 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-19 09:49:44 -07:00
Seth Alves
419c744bd4 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-19 09:49:18 -07:00
Brad Davis
7efcad38d2 PR feedback 2016-05-18 23:11:36 -07:00
Zach Pomerantz
e1971f5ed3 Fix shadow bounds checking 2016-05-18 18:58:28 -07:00
Zach Pomerantz
87b102ae0f Fix -Wunused-result from invokeResult 2016-05-18 18:19:44 -07:00
Anthony J. Thibault
de1204c42d Enable transmission of jointIndices 2016-05-18 18:19:28 -07:00
Zach Pomerantz
107b1b830e Stop ScriptCache callbacks when scripts are stopped 2016-05-18 17:46:12 -07:00
Zach Pomerantz
2c9b0f7233 Rm failing VrMenu assertion 2016-05-18 17:31:47 -07:00
Zach Pomerantz
8025a3f14c Prevent crash from script timers on shutdown 2016-05-18 17:30:34 -07:00
Anthony J. Thibault
0294066668 Removed pupilData and translationRadix from AvatarData packet. 2016-05-18 16:41:50 -07:00
Zach Pomerantz
c480dcfddd Check thread validity after event processing 2016-05-18 16:26:54 -07:00
Anthony J. Thibault
eb80990c10 Another fix for avatarIdentity pong 2016-05-18 16:08:56 -07:00
Anthony J. Thibault
e792e8eecf Fix for identity packet pong 2016-05-18 16:05:16 -07:00
Anthony J. Thibault
135fa8c2aa Moved jointIndices transmission behind #ifdef 2016-05-18 15:41:21 -07:00
Ryan Huffman
64c89a5dde Fix AccountManager not compiling on Windows 2016-05-18 15:38:54 -07:00
Ryan Huffman
e622c17f6b Pull default UserAgentGetter out of func signature 2016-05-18 15:38:54 -07:00
Ryan Huffman
bfb4bb0896 Add userAgentGetter to AccountManager for custom UserAgent 2016-05-18 15:38:54 -07:00
Ryan Huffman
dd093e3fcd Make AccountManager a DependencyManager singleton 2016-05-18 15:38:54 -07:00
Anthony J. Thibault
c48fce4f5a WIP commit, socket errors when AvatarIdentity is larger then MTU 2016-05-18 15:24:10 -07:00
Brad Davis
3cc08cdcfc Breaking up GL agnostic code from 4.1 specific code 2016-05-18 14:35:53 -07:00
samcake
185f069441 Merge branch 'master' of https://github.com/highfidelity/hifi into red 2016-05-18 13:16:14 -07:00
samcake
89f18aee3b Simplifying the deferredbuffer clear and enableing z test for lighting pass 2016-05-18 13:14:42 -07:00
Brad Hefta-Gaub
335d9abddd Merge pull request #7874 from AndrewMeadows/vertical-thrust 
allow MyAvatar.addThrust() to raise avatar from standing on ground
 2016-05-18 11:41:37 -07:00
Anthony J. Thibault
b48134e30c WIP commit testing for joint mapping transmission 2016-05-18 11:40:45 -07:00
Brad Hefta-Gaub
67891abf17 Merge pull request #7877 from Atlante45/fix/asset-client 
Fix Asset Client crash
 2016-05-18 11:37:34 -07:00
Atlante45
de36cd150e Move runnings scripts setting storage 
So that it doesn't conflict with the "Settings" menu setting
storage.
	Running script would clear those settings while storing its data
	This adds some backward compatible code to move the scripts
settings to the new location.
 2016-05-18 11:36:14 -07:00
Atlante45
10c412d8c7 Fix settings getting reset 
fixes bugzid:531
	When a setting handle was created but never initialized/used, it
would override the current value with the default value on destruction.
 2016-05-18 11:36:14 -07:00
Brad Hefta-Gaub
4df4829280 Merge pull request #7902 from jherico/gpu_breakup 
moving GL backend out of GPU
 2016-05-18 11:35:35 -07:00
Brad Hefta-Gaub
9a3b6bf081 Merge pull request #7858 from Atlante45/remove-deprecated-entity-props 
removed dead code for overlays/entities glow level
 2016-05-18 09:14:26 -07:00
Brad Hefta-Gaub
9af39d71e1 Merge pull request #7767 from huffman/fix/address-bar-back 
Fix address bar becoming unusable after going backwards or forwards
 2016-05-18 09:14:07 -07:00
Zach Pomerantz
59e17c2d5f Fix abs of unsigned warning 2016-05-17 22:57:29 -07:00
Seth Alves
cf829f1bab magic number 2016-05-17 19:14:44 -07:00
Seth Alves
3380b2a668 Merge branch 'master' of github.com:highfidelity/hifi into avatar-entities-3 2016-05-17 19:10:33 -07:00
Anthony J. Thibault
2c6b0e5c95 Fix for linux warning. 2016-05-17 17:32:09 -07:00
Andrew Meadows
9786c0bfd3 remove warning about signed/unsigned conversion 2016-05-17 15:34:09 -07:00
Andrew Meadows
aab26c5089 disable DEBUG_STATE_CHANGE 2016-05-17 15:14:36 -07:00
Ryan Huffman
68665e6b25 Fix JurisdictionMap not initializing correctly 2016-05-17 15:12:45 -07:00
Anthony J. Thibault
b82356a249 AvatarMixer: Clients will show incompatible version dialog 
For this to work, the server needs to send an empty AvatarIdentity packet back to the sender
when it receives a packet mismatch error.  This AvatarIdentity packet will be different then
what the client expects and will trigger the incompatible version dialog.

Previously, the avatar-mixer was just silently dropping incoming mismatched version packets.
Causing the client to never get a response, and thus never showing the incompatible version dialog.
 2016-05-17 15:02:04 -07:00
Andrew Meadows
c64612c42b namechange keyboardMotor --> actionMotor 2016-05-17 14:46:50 -07:00
Andrew Meadows
2f39968a03 remove debug cruft 2016-05-17 14:32:20 -07:00
Andrew Meadows
e4cb6e2b87 order-independent CharacterController motors 2016-05-17 14:02:49 -07:00
Andrew Meadows
1749bfbc58 transition to InAir state when not thrusting up 2016-05-17 14:02:47 -07:00
Andrew Meadows
9b7bf97891 enable vertical thrust while walking 2016-05-17 14:02:46 -07:00
Ryan Huffman
cf6eba96a4 Remove unused variable 2016-05-17 11:17:34 -07:00
Ryan Huffman
2dbea37690 Fix address manager sometimes double adding address history 2016-05-17 11:17:34 -07:00
Ryan Huffman
d47c74408e Cleanup handleViewpoint 2016-05-17 11:17:34 -07:00
Ryan Huffman
0ec9d9e277 Remove goToAddressFromObject from slots 2016-05-17 11:17:34 -07:00
Ryan Huffman
f213a059fb Fix AddressManager not always storing history when it should 2016-05-17 11:17:34 -07:00
Ryan Huffman
fde1f0740c Fix goBackPossible not being triggered correctly in AddressManager 2016-05-17 11:17:34 -07:00
samcake
8ec280535b FIx bad roughness value read from the deferred buffer 2016-05-17 11:13:34 -07:00
Ryan Huffman
013d902376 Add vector include to OctalCode.h 2016-05-17 10:59:51 -07:00
Ryan Huffman
475d881b04 Fix logging of shared_ptr 2016-05-17 10:59:51 -07:00
Ryan Huffman
1bec38584b Remove class qualification from header file 2016-05-17 10:59:51 -07:00
Ryan Huffman
368eded8ee Remove unnecessary type in Jurisdictionmap 2016-05-17 10:59:51 -07:00
Ryan Huffman
5fc18eafda Rename OctalCodePtr related functions 2016-05-17 10:59:51 -07:00
Ryan Huffman
35f147f557 Cleanup use of OctalCodePtrList and add allocateOctalCodePtr 2016-05-17 10:59:51 -07:00
Ryan Huffman
e819ab8475 Add mutex protection around octal code getters 2016-05-17 10:59:51 -07:00
Ryan Huffman
ef6d758e7f Fix JurisdictionMap multithreading issues 
Make octal code pointers use shared_ptr, add locks around access.
 2016-05-17 10:59:51 -07:00
Brad Davis
34e574c148 Merge pull request #7816 from zzmp/perf/idle-event 
Drive render loop from DisplayPlugin instead of busy wait
 2016-05-17 09:36:09 -07:00
Anthony J. Thibault
424517e3de Fix for Malformed packet errors 2016-05-16 19:11:50 -07:00
Anthony J. Thibault
3d91c5b54d AvatarData.cpp: hooked up 6 byte quat compression 2016-05-16 17:48:55 -07:00
Anthony J. Thibault
818d1f4601 Added six byte quaternion compression routines & tests 2016-05-16 17:48:54 -07:00
Anthony J. Thibault
a251b9e3df Moved translations back into parent relative frame. 2016-05-16 17:48:54 -07:00
Anthony J. Thibault
d86a608825 Properly convert from absolute rig frame to relative geom frame 2016-05-16 17:48:53 -07:00
Anthony J. Thibault
36c175d4cc Ensure that JointData is in the absolute rig coordinate frame. 2016-05-16 17:48:52 -07:00
Anthony J. Thibault
55b0060df9 Convert JointData from relative frame to absolute. 2016-05-16 17:48:52 -07:00
Chris Collins
b2ece6f4a7 Merge pull request #7882 from zzmp/fix/script-thread-dtor 
Wait and cleanly exit the scripting thread
 2016-05-16 16:52:54 -07:00
Brad Davis
0d6b0eef59 PR feedback 2016-05-16 15:27:14 -07:00
Seth Alves
d77b3bf59a fix some comments and debug pritns 2016-05-16 14:12:05 -07:00
Brad Davis
5ba8372c21 Moving GL backend out of GPU 2016-05-16 12:54:17 -07:00
Seth Alves
a0c3224705 Merge branch 'master' of github.com:highfidelity/hifi into no-fly-zones 2016-05-16 10:56:09 -07:00
Seth Alves
2a5efd3b82 Merge branch 'master' of github.com:highfidelity/hifi into update-model-meta 2016-05-16 10:53:39 -07:00
Zach Pomerantz
7d4276d15f Merge branch 'master' of github.com:highfidelity/hifi into fix/script-thread-dtor 2016-05-16 10:51:23 -07:00
Zach Pomerantz
61fbb7022c Mv entities script engine deleter to fn 2016-05-16 10:40:11 -07:00
Brad Hefta-Gaub
06d1bd5728 Merge pull request #7799 from birarda/remove-avatar-billboard 
remove the last of the avatar billboard code
 2016-05-16 10:23:42 -07:00