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

5893 commits

Author SHA1 Message Date
Stephen Birarda
fabc3aea57 Revert "don't allow a HifiSockAddr lookup to block application" 2014-11-03 12:54:28 -08:00
Brad Hefta-Gaub
c52b116ab1 Merge pull request #3717 from birarda/network-timeout 
don't allow a HifiSockAddr lookup to block application
 2014-11-03 12:38:05 -08:00
Stephen Birarda
9e1da64895 use different include style for QHostInfo 2014-11-03 12:03:10 -08:00
Stephen Birarda
e976942515 fix includes for HifiSockAddr 2014-11-03 11:44:15 -08:00
Stephen Birarda
2746733687 don't allow HifiSockAddr lookup to block application 2014-11-03 10:46:17 -08:00
ZappoMan
e7722dc692 pass args to object scripts for mouse events 2014-10-31 15:20:16 -07:00
ZappoMan
a5088eece6 first cut at running scripts from entities 2014-10-31 14:03:30 -07:00
ZappoMan
277da5a24f first cut at wiring up new entity specific UI/UX events 2014-10-31 10:23:45 -07:00
Andrzej Kapolka
2314ab3624 Removed unused variable, fixed painting materials on heightfields with greater 
resolution.
 2014-10-30 18:05:40 -07:00
Andrzej Kapolka
fd12c7a0d7 One more piece of the resolution puzzle. 2014-10-30 16:52:19 -07:00
Philip Rosedale
f952e9be8d Merge branch 'master' of https://github.com/worklist/hifi 2014-10-30 11:57:59 -07:00
Andrzej Kapolka
c46d0f4d56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-30 11:37:36 -07:00
AndrewMeadows
4cf77d1c6c Merge pull request #3702 from ZappoMan/lockAndMaterialProperties 
Lock and textures properties
 2014-10-30 11:35:38 -07:00
ZappoMan
6d613fba3c removed debug 2014-10-30 11:26:48 -07:00
ZappoMan
95c5b417c9 texture support in model entities 2014-10-30 11:04:19 -07:00
Philip Rosedale
52f13520db Merge branch 'master' of https://github.com/worklist/hifi 2014-10-30 10:20:34 -07:00
ZappoMan
c650cabb5d support for locked property, some plumbing for textures property 2014-10-30 10:05:20 -07:00
Stephen Birarda
6b922fc3e7 final tweak for linux unistd include 2014-10-30 10:03:36 -07:00
Philip Rosedale
37cd75cf00 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-30 08:21:46 -07:00
ZappoMan
ac115086cc move float bool bugs 2014-10-30 00:26:06 -07:00
ZappoMan
1d9c4a6454 fix bug in light properties 2014-10-29 23:18:20 -07:00
Stephen Birarda
7ad590c578 don't replace url query in XMLHttpRequest class 2014-10-29 13:20:21 -07:00
Andrzej Kapolka
37569dadd5 More resolution bits. 2014-10-29 13:00:32 -07:00
ZappoMan
c3d1d13fa9 Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes 2014-10-29 11:56:27 -07:00
Stephen Birarda
7f3482bbdd swithc from elif to elsif 2014-10-29 10:53:34 -07:00
ZappoMan
17a20ceb16 pass the submesh name as extraInfo in the ray pick result 2014-10-29 10:49:24 -07:00
Stephen Birarda
03e1da0ba9 include unistd only on Q_OS_LINUX 2014-10-29 10:37:39 -07:00
Stephen Birarda
200f5e38b6 Merge pull request #3686 from AndrewMeadows/inertia 
fix linux build for missing getpid()
 2014-10-29 10:34:48 -07:00
ZappoMan
3e9bc23c2f moving RenderArgs into shared so it can be used by overlays, first cut at ray picking against submeshes 2014-10-29 10:19:04 -07:00
ZappoMan
1dd4c4c674 move sitting points back to a contained element to fix the crash Ryan was seeing 2014-10-29 10:13:48 -07:00
Andrew Meadows
c39b239f99 fix linux build for missing getpid() 2014-10-29 09:30:51 -07:00
ZappoMan
6b1dc67883 some cleanup 2014-10-29 08:17:30 -07:00
ZappoMan
a73cad91bc first cut at reading and mapping submeshes to named models 2014-10-29 08:09:10 -07:00
Philip Rosedale
cf121a9fe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-28 20:22:40 -07:00
Philip Rosedale
f10aeaffab working on audio mixer muting 2014-10-28 20:22:33 -07:00
Andrzej Kapolka
d28da9250f More progress towards allowing different resolutions for height and color, 
material, etc.
 2014-10-28 18:31:34 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed 
Audio Environment packets
 2014-10-28 18:11:14 -07:00
Brad Hefta-Gaub
7ecc0ccb30 Merge pull request #3683 from birarda/lobby 
fix for location naming break after AddressManager changes
 2014-10-28 17:58:34 -07:00
Brad Hefta-Gaub
be65a798db Merge pull request #3681 from birarda/verbose-log-silencer 
logging tweaks to reduce spam from repeated log messages
 2014-10-28 17:58:17 -07:00
Stephen Birarda
9af097967d remove ctime since windows build did not fail without it 2014-10-28 15:56:30 -07:00
Stephen Birarda
992396ba63 add ctime for strftime call 2014-10-28 15:48:06 -07:00
Stephen Birarda
01de6305e9 add time header for date in log entry 2014-10-28 15:42:03 -07:00
Stephen Birarda
33c247918e fix for domainID wrapped in braces 2014-10-28 15:37:42 -07:00
AndrewMeadows
825482499a Merge pull request #3682 from ZappoMan/moreLightPropertiesAttempt2 
fix memory leak
 2014-10-28 15:33:14 -07:00
Stephen Birarda
2816e8f114 fix location DataWebDialog missing InterfaceLocation object 2014-10-28 15:32:23 -07:00
ZappoMan
47ba32e95e feedback 2014-10-28 15:27:56 -07:00
Brad Hefta-Gaub
86b455e58f Merge pull request #3680 from stojce/20158 
CR for Job #20158 - Change default field of view from 90 to 45
 2014-10-28 15:26:09 -07:00
Brad Hefta-Gaub
c39c716755 Merge pull request #3679 from AndrewMeadows/inertia 
move code out of "shared" and into new "physics" lib
 2014-10-28 15:25:38 -07:00
Brad Hefta-Gaub
caecf473ff Merge pull request #3678 from huffman/entity-tool-fixes 
Entity tool updates and fixes
 2014-10-28 15:24:21 -07:00
ZappoMan
4ec70041cc fix memory leak 2014-10-28 15:20:02 -07:00
Stephen Birarda
c4538836c1 always output the first matching repeated log message 2014-10-28 14:51:47 -07:00
Stephen Birarda
424793b905 complete output of suppressed repeated messages to log 2014-10-28 14:49:14 -07:00
Stephen Birarda
8e3102266a use the LogHandler in Interface 2014-10-28 14:23:34 -07:00
Stojce
01b8fa12e2 Change default field of view from 90 to 45 2014-10-28 22:22:50 +01:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Andrew Meadows
911c3bcc38 merge upstream/master into andrew/inertia 2014-10-28 13:53:46 -07:00
Andrew Meadows
4c3cdf5b7a move stuff out of shared and into physics library 2014-10-28 13:51:45 -07:00
Stephen Birarda
2711ff2b5f move functionality from VerboseLoggingHelper into the Logging class 2014-10-28 13:48:53 -07:00
Ryan Huffman
c802c74396 Add comment to new redo functionality 2014-10-28 13:48:48 -07:00
Ryan Huffman
cce1e23eec Update UndoStackScriptingInterface to not call redo automatically 2014-10-28 13:43:22 -07:00
ZappoMan
06b31baa2a Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 13:32:45 -07:00
ZappoMan
f26bf5e07b duh 2014-10-28 13:19:47 -07:00
ZappoMan
6c63c2ecd9 cleanup 2014-10-28 12:47:46 -07:00
Stephen Birarda
8a4c716452 leverage the VerboseLoggingHelper for packets from unknown nodes 2014-10-28 12:15:52 -07:00
Stephen Birarda
9c30903eb6 add the VerboseLoggingHelper class for repeated messages 2014-10-28 12:05:56 -07:00
ZappoMan
7d2ef7923b Merge branch 'master' of https://github.com/highfidelity/hifi into moreLightPropertiesAttempt2 2014-10-28 10:50:02 -07:00
ZappoMan
f3242d8778 make PROP_DIFFUSE_COLOR a true property and wire up LightEntityProperties correctly 2014-10-28 10:46:50 -07:00
Stephen Birarda
27f7cdb2d4 handle location set/get in AddressManager, handle set to address map 2014-10-28 10:35:56 -07:00
Stephen Birarda
b90db2856b add a method to AddressManager to handle address maps from JS 2014-10-28 10:00:39 -07:00
ZappoMan
a516d062a6 fix corruption in sitting points, added additional light properties 2014-10-28 09:55:13 -07:00
Brad Hefta-Gaub
4e7e9641f0 Merge pull request #3673 from birarda/lobby 
initial groundwork for lobby interface
 2014-10-28 08:48:33 -07:00
Stephen Birarda
cb7a6cb93c Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-28 08:40:20 -07:00
Andrzej Kapolka
2db893c23c Merge pull request #3668 from AndrewMeadows/experimental 
Experimental feature: skeleton offset
 2014-10-27 17:02:01 -07:00
ZappoMan
1de618ed3e added new light related properties 2014-10-27 16:25:26 -07:00
Stephen Birarda
bb652c0784 rename signal in AbstractControllerScriptingInterface from cancel to back 2014-10-27 16:01:39 -07:00
Stephen Birarda
8a9f2d172a rename HFCancelEvent to HFBackEvent, fire from joystick 2014-10-27 15:51:59 -07:00
ZappoMan
bb1eacce7d more tweaks for new light properties 2014-10-27 15:37:52 -07:00
Stephen Birarda
7b5115c35f add a new meta event, HFCancelEvent 2014-10-27 15:37:31 -07:00
ZappoMan
ac9c5e7386 some initial adds to properties 2014-10-27 15:32:36 -07:00
ZappoMan
c17ffe9433 add the new properties to LightEntityItem class 2014-10-27 15:31:21 -07:00
Stephen Birarda
8556b8b95d fix HFMetaEvent headers for new placement 2014-10-27 15:28:02 -07:00
Stephen Birarda
a12e0dd0dc fix HFActionEvent headers for new placement 2014-10-27 15:27:27 -07:00
Stephen Birarda
c3fe7c7497 send global HFActionEvent from ControllerScriptingInterface 2014-10-27 15:21:47 -07:00
Andrzej Kapolka
4ab90ce49c Avoid killing the updater twice. 2014-10-27 15:04:03 -07:00
Stephen Birarda
76493597da move SpatialEvent from EventTypes to its own file 2014-10-27 14:47:44 -07:00
Andrzej Kapolka
15f8b3006b Remove debugging, fix streaming bug. 2014-10-27 14:45:34 -07:00
Stephen Birarda
818c97fcaf move WheelEvent out of EventTypes into its own file 2014-10-27 14:41:23 -07:00
Stephen Birarda
e72409bf39 move TouchEvent out of EventTypes to its own file 2014-10-27 14:37:04 -07:00
Stephen Birarda
3aa7c3c7dc move MouseEvent out of EventTypes into its own file 2014-10-27 14:30:20 -07:00
Stephen Birarda
5a390da509 move KeyEvent from EventTypes to its own file 2014-10-27 14:24:32 -07:00
Stephen Birarda
d38dd2c53a repairs for recursive source files, move HF meta events to SE 2014-10-27 14:18:23 -07:00
Andrzej Kapolka
5af52df558 Put some debugging in to track down a streaming crash. 2014-10-27 12:11:07 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Stephen Birarda
d5a3ea77ff Merge branch 'master' of https://github.com/highfidelity/hifi into lobby 2014-10-27 09:28:50 -07:00
Stephen Birarda
f8b423ced6 bubble up isAutoRepeat state for KeyEvent 2014-10-24 16:12:15 -07:00
Atlante45
12f0237dc7 Cleanup 2014-10-24 15:02:09 -07:00
Atlante45
847ef64b66 move audio env data over to new packet 2014-10-24 14:27:55 -07:00
Atlante45
a7663db8e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_fixed 2014-10-24 11:40:24 -07:00
Atlante45
6072fd4066 Added audio env packet type 2014-10-24 10:41:54 -07:00
Stephen Birarda
3b436e04ae Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-24 09:43:04 -07:00
AndrewMeadows
64892a6b27 Merge pull request #3655 from Atlante45/fix_playback_loop 
Fix player loop
 2014-10-24 08:47:57 -07:00
Andrzej Kapolka
003d2f031a Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 16:15:11 -07:00
Stephen Birarda
8c79d19e3e Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-23 16:07:54 -07:00
Andrzej Kapolka
27d9de0cba More gradual improvements to heightfield voxelization. 2014-10-23 16:01:51 -07:00
Atlante45
20c862d199 Fix player loop 2014-10-23 14:35:24 -07:00
Atlante45
5e49c08e27 extra space 2014-10-23 14:08:36 -07:00
Atlante45
d528c47a83 Bump audio packet version 2014-10-23 13:42:17 -07:00
Atlante45
d4ec337cae Don't send reverb data as often 2014-10-23 13:39:56 -07:00
Andrzej Kapolka
ef0a400dcb Fix for clearing empty nodes. 2014-10-23 13:37:11 -07:00
Andrzej Kapolka
9c43748d35 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-23 11:50:46 -07:00
Atlante45
06d528fce5 bump audio version number 2014-10-23 09:28:48 -07:00
ZappoMan
5e497c2d97 added new macro for getter access to a color 2014-10-23 09:18:11 -04:00
Philip Rosedale
3ba3354e11 Merge pull request #3636 from Atlante45/reverb 
Reverb
 2014-10-22 21:51:57 -07:00
Andrzej Kapolka
631419d23c Tweaks to heightfield conversion. 2014-10-22 18:22:21 -07:00
Andrzej Kapolka
9af1516c79 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-22 17:45:20 -07:00
Andrzej Kapolka
271c01ad03 Fix for digging into converted heightfields. 2014-10-22 17:44:56 -07:00
Philip Rosedale
246ff1614f Merge pull request #3645 from birarda/avatar-by-name 
fix for AvatarHashMap crash when erasing avatars
 2014-10-22 17:43:44 -07:00
Clément Brisset
bf9d467328 Merge pull request #3638 from huffman/entity-tools-updates 
Entity tool fixes
 2014-10-22 17:40:21 -07:00
Stephen Birarda
8e67c5f534 don't erase from the AvatarHashMap on the wrong thread 2014-10-22 17:35:28 -07:00
Stephen Birarda
7b0f1477a1 expose AvatarList to Interface SE, add avatarWithDisplayName method 2014-10-22 15:28:04 -07:00
Atlante45
a48811777e Script engine audio dependency 2014-10-22 15:26:16 -07:00
Ryan Huffman
ac8d947cb1 Update ScriptUndoCommand to run on ScriptEngine thread 2014-10-22 15:18:49 -07:00
Ryan Huffman
14555c4534 Add UndoStackScriptingInterface and support when editing entities 2014-10-22 14:54:04 -07:00
Atlante45
86c965a922 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-22 14:20:22 -07:00
Andrzej Kapolka
e69bc22222 Fix for streaming crash. 2014-10-22 12:56:55 -07:00
Stephen Birarda
e079ec4363 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-22 12:03:46 -07:00
ZappoMan
bf199c1f30 add PROP_IS_SPOTLIGHT to the requested properties 2014-10-22 10:11:01 -07:00
ZappoMan
2f9766e051 first cut at light entity 2014-10-22 08:41:31 -07:00
Andrzej Kapolka
3d43e86faa Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-21 15:49:06 -07:00
Andrzej Kapolka
bd4738d2c2 Reliable delta fix. 2014-10-21 15:48:53 -07:00
Stephen Birarda
047ee0a513 pipe texture names through to NetworkTexture 2014-10-21 12:20:12 -07:00
Philip Rosedale
2a5b2d8686 Improved version of headMove with timed target reveal 2014-10-21 11:40:16 -07:00
Andrzej Kapolka
45fb31cd08 Basic network simulation for metavoxels. 2014-10-20 18:43:41 -07:00
Atlante45
9a7ca8b132 Fix header 2014-10-20 17:23:58 -07:00
Atlante45
ee4c7c25bf Header fix 2014-10-20 16:50:49 -07:00
Atlante45
588b106f5e Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-20 15:38:31 -07:00
Andrzej Kapolka
d64b43693d Networking fix. 2014-10-20 15:33:46 -07:00
Atlante45
6f9557fe67 Do not destroy script reverb settings 2014-10-20 15:06:02 -07:00
Atlante45
997f1db835 handle JSON for audioEffectOptions args 2014-10-20 13:37:49 -07:00
Andrzej Kapolka
e586b6e29b Remove nodes with no opaque elements. 2014-10-20 12:27:49 -07:00
Atlante45
ce949b7350 Coding Standard default values 2014-10-20 12:11:29 -07:00
Andrzej Kapolka
662189159d Fix for Xcode warning. 2014-10-20 12:09:33 -07:00
Atlante45
85d56824a0 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-20 11:51:39 -07:00
Atlante45
37b47b52d3 Stream reverb settings from mixer to interface 2014-10-20 11:49:57 -07:00
AndrewMeadows
2569f70ac3 Merge pull request #3623 from ey6es/master 
For FBX files with marked "skeleton" joints, only show those marked nodes in the upload dialog.  Also added some more default node names to look for on upload.
 2014-10-20 09:00:06 -07:00
AndrewMeadows
2e958599aa Merge pull request #3621 from ey6es/metavoxels 
Sculpt brush, very rough conversion of heightfield patches to dual contour surfaces on edit.
 2014-10-20 08:55:01 -07:00
AndrewMeadows
7a97634a78 Merge pull request #3616 from ZappoMan/fixSVOs 
fix SVOs to render again
 2014-10-20 08:33:42 -07:00
Andrzej Kapolka
32c5f6e40e Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-17 18:28:16 -07:00
Andrzej Kapolka
da60a17b45 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-10-17 18:27:31 -07:00
Andrzej Kapolka
e98b99fe84 Merge pull request #3622 from birarda/domain-tunnel 
work around double login issue by generating keypair on each launch
 2014-10-17 18:05:45 -07:00
Andrzej Kapolka
c979ace924 Read the unit scale factor and include it in the offset scale. 2014-10-17 17:34:27 -07:00
Stephen Birarda
5ecdb58e20 generate a new keypair on every interface launch 2014-10-17 16:55:50 -07:00
Andrzej Kapolka
1b9b0f9fc9 Look for and store the "Skeleton" type flag so that we can offer only skeleton 
joints in the dropdown.
 2014-10-17 16:51:55 -07:00
Atlante45
86b87770c2 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-17 16:50:19 -07:00
Brad Hefta-Gaub
023d47918f Merge pull request #3620 from birarda/domain-tunnel 
repairs to domain change reset to correctly clear nodes
 2014-10-17 16:05:28 -07:00
Andrzej Kapolka
1e6aee1872 Basic heightfield conversion. 2014-10-17 15:23:54 -07:00
Stephen Birarda
7cb8cbfdd4 repairs to domain change reset to clear nodes 2014-10-17 14:49:25 -07:00
Stephen Birarda
e72b86059e Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel 2014-10-17 14:48:43 -07:00
ZappoMan
e29188bacd fix SVOs to render again 2014-10-17 11:01:25 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
Andrzej Kapolka
1fdfb51600 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 18:54:03 -07:00
Andrzej Kapolka
131486c8f7 More progress on voxelizing heightfields. 2014-10-16 18:53:42 -07:00
Atlante45
5d146a00e7 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 
Conflicts:
	interface/CMakeLists.txt
 2014-10-16 15:21:34 -07:00
Stephen Birarda
5759b5b787 Merge pull request #3608 from birarda/master 
use OPENSSL_free to free DER public and private key buffers
 2014-10-16 15:15:12 -07:00
Stephen Birarda
1fb2dd4460 use OPENSSL_free to free DER private and public key buffers 2014-10-16 15:13:45 -07:00
Andrzej Kapolka
fc6f0afb93 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-10-16 15:03:29 -07:00
Leonardo Murillo
10674ebec4 Merge pull request #3607 from birarda/master 
fix for key deletes in generateRSAKeyPair
 2014-10-16 15:53:38 -06:00
Stephen Birarda
f9e9a743fb fix error handled instances of key deletes 2014-10-16 14:49:12 -07:00
Stephen Birarda
f00a4aead6 fix for key deletes in generateRSAKeyPair 2014-10-16 14:44:17 -07:00
samcake
a6b9fe34b5 Merge pull request #3606 from ZappoMan/groupMaterialsRendering 
More Model::render() improvements
 2014-10-16 14:42:37 -07:00
ZappoMan
d1f263ecc5 group materials together when rendering models 2014-10-16 14:05:35 -07:00
Andrzej Kapolka
459b9aba38 Gradual progress on converting heightfield portions to dual contour data. 2014-10-16 13:05:38 -07:00
Stephen Birarda
7bbaaf6b78 cleanup some username signature debug, fix interest list pull 2014-10-16 11:54:55 -07:00
AndrewMeadows
e75d2a167a Merge pull request #3602 from ZappoMan/frustumCullModelParts 
More Model::render() improvements
 2014-10-16 11:04:57 -07:00
AndrewMeadows
4fbc589606 Merge pull request #3598 from birarda/domain-tunnel 
initial pass at using keypairs for username verification for basic domain-server ACL
 2014-10-16 10:49:03 -07:00
ZappoMan
bf77adc4bc add support for LOD occulsion for too small meshes in Model::render() 2014-10-16 00:30:24 -07:00
samcake
01b64d78e3 Merge pull request #3601 from ZappoMan/frustumCullModelParts 
Implement "segregation" of mesh groups
 2014-10-15 18:09:48 -07:00
ZappoMan
952a604d77 added some more rendering stats 2014-10-15 16:49:09 -07:00
Andrzej Kapolka
2a08755123 Clear terrain under dual contour surface edit. 2014-10-15 15:06:43 -07:00
Stephen Birarda
cbbf11e28f add missing indentation for OpenSSL warnings 2014-10-15 13:31:44 -07:00
samcake
3d13792a9d Merge pull request #3599 from ZappoMan/frustumCullModelParts 
Frustum cull model parts
 2014-10-15 11:56:00 -07:00
Stephen Birarda
e4b19545b0 generate a new keypair if one isn't found in settings 2014-10-15 10:36:21 -07:00
Stephen Birarda
05728681a5 add a check to warn if OpenSSL is OS X system version 2014-10-15 09:49:03 -07:00
ZappoMan
770bc919bb added some rendering stats to OctreeRenderer 2014-10-15 09:22:31 -07:00
Stephen Birarda
50f27d3e16 handle verification of username signature during connection 2014-10-14 18:02:22 -07:00
ZappoMan
64fecba011 removed some unneeded scaling to AABox and AACube debug 2014-10-14 17:17:30 -07:00
ZappoMan
e235af1331 add debeg streaming to Extents 2014-10-14 17:16:49 -07:00
ZappoMan
f04c2b6e6f fix possible buffer overrun asserts 2014-10-14 17:14:12 -07:00
Stephen Birarda
13f43dfc70 fix for remaining AccountManager converted callbacks 2014-10-14 16:20:17 -07:00
Stephen Birarda
e9bcc90166 handle remaining conversions for AccountManager passing QNetworkReply 2014-10-14 16:16:54 -07:00
Stephen Birarda
46fb7fb4a9 return QNetworkReply for AccountManager callbacks 2014-10-14 16:12:04 -07:00
Stephen Birarda
c4b0dc9dcc initial handling of username signature in domain-server 2014-10-14 16:03:35 -07:00
Atlante45
f09dc1aeac remove deprecated _engine member from ScriptEngine 2014-10-14 15:17:31 -07:00
Stephen Birarda
970f2c7fad have DSAI generate a username signature upon request, when it has private key 2014-10-14 15:15:16 -07:00
Atlante45
4a3f72ab0b Merge branch 'master' of https://github.com/highfidelity/hifi into reverb 2014-10-14 15:13:50 -07:00
Stephen Birarda
22b599b8cc repair for persisting of Account to file after keypair generation 2014-10-14 14:21:18 -07:00
Stephen Birarda
bac6961235 fix node auth url to be HTTPS 2014-10-14 14:01:41 -07:00
Stephen Birarda
f8c89d0790 upload the generated public key to data-web, add getter for private key 2014-10-14 13:51:41 -07:00
Stephen Birarda
7ce806b746 fire off generation of key-pair in conjunction with login, store private key 2014-10-14 12:12:32 -07:00
Stephen Birarda
69402e275c use DER format for generated keys in RSAKeypairGenerator 2014-10-14 11:51:58 -07:00