Commit graph

181 commits

Author SHA1 Message Date
Brad Davis
80c95cd8eb Fixing access to second based timestamp 2015-10-10 16:07:26 -07:00
Brad Davis
9e4a7a6226 Working on controller refactoring 2015-10-10 03:05:42 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
ZappoMan
e9812d0608 added similarStrings() helper 2014-11-25 09:25:49 -08:00
ZappoMan
bd2adf08e3 fix to drift in usecTimestampNow() caused when computer sleeps 2014-11-21 13:33:53 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
ZappoMan
4adb4787cd added debugging of usecTimestampNow() in octree server to better understand flight times 2014-11-15 21:50:42 -08:00
ZappoMan
a89287e404 reset the QElapsedTimer in usecTimestampNow() periodically to prevent error 2014-11-04 11:01:37 -08:00
ZappoMan
76c77d6994 first cut at properly working lifetime 2014-08-28 13:46:54 -07:00
Stephen Birarda
6eb2c73624 add assert include to SharedUtil 2014-08-08 13:23:54 -07:00
Stephen Birarda
0378fb3049 break glm helpers out of SharedUtil 2014-08-08 13:17:53 -07:00
Atlante45
d9dde06c14 Various tweaks to referentials 2014-08-04 14:59:15 -07:00
Atlante45
03031c4c04 Outdated link 2014-07-28 16:36:12 -07:00
Andrew Meadows
b62f04e9fe check for nan's coming out of rotationBetween() 2014-07-23 16:51:53 -07:00
wangyix
cb5a9bf668 moved some const defs to avoid redefinition 2014-07-14 10:43:02 -07:00
wangyix
82e9aa8bb7 made stats easier to read; reverted injected stream deletion conditions 2014-07-11 16:08:15 -07:00
Kai Ludwig
d08b63b247 changed 2000 into a constant defined inline 2014-06-16 23:30:28 +02:00
Kai Ludwig
3fbde70f96 Added functions to test usleep, msleep and sleep for accuracy. 2014-06-15 21:05:23 +02:00
barnold1953
5013c8c2fa Fixed script editor crash when script calls Script.stop(). Also made the
processEraseMessage wait until it can lock to ensure particles are
deleted.
2014-05-22 12:45:36 -07:00
Stephen Birarda
8e9defad3e send an updated address to data-server with domain (when changed) 2014-05-15 12:18:24 -07:00
Atlante45
6595b29a4f More bug tracking 2014-04-29 10:55:30 -07:00
Atlante45
8b4a910040 Fix timestamp timer not fired 2014-04-25 12:19:18 -07:00
Andrzej Kapolka
d38d3db224 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-23 12:25:43 -07:00
Atlante45
fea0a262a6 Put back missing windows header 2014-04-22 12:35:50 -07:00
Atlante45
3eeb3a539d Fixed lack of resolution in usecTimestampNow() 2014-04-22 11:48:43 -07:00
Atlante45
be2db49e08 Last touch to removing gettimeofday 2014-04-21 16:44:21 -07:00
Atlante45
f7f30e118c More gettimeofday cleanup 2014-04-21 15:17:11 -07:00
Andrzej Kapolka
e2558bdac0 Experimenting with tweaking the Euler angles so that z, rather than y, is in
[-pi/2, pi/2].
2014-04-18 17:16:20 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
2014-04-17 10:58:34 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
ZappoMan
60c6b27ab2 cleanup code a bit, add support for diffusions even with no ray intersection 2014-04-15 11:38:11 -07:00
Andrzej Kapolka
a2dc58f7f9 Moved FBX code to its own library so that we can use it for bots. 2014-04-14 17:15:58 -07:00
ZappoMan
7a993939bf Merge branch 'master' of https://github.com/worklist/hifi into moonshot
Conflicts:
	interface/interface_en.ts
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/Menu.h
	libraries/shared/src/SharedUtil.h
2014-04-14 09:43:29 -07:00
ZappoMan
a37921c1d5 move isNaN() to shared utils 2014-04-13 19:09:07 -07:00
Stephen Birarda
186c588d5a remove doubled timeval definition from SharedUtil 2014-04-10 10:48:50 -07:00
Stephen Birarda
ba6f861ad8 fix unmatched #ifdef in Syssocket 2014-04-10 09:54:37 -07:00
Stephen Birarda
58298984d3 link GnuTLS to the assignment-client, fix timeval in SharedUtil 2014-04-10 09:48:47 -07:00
Stephen Birarda
1d5644a85f link GnuTLS to octree library 2014-04-10 09:45:57 -07:00
Stephen Birarda
7e2b73906c remove Syssocket include from SharedUtil 2014-04-10 09:35:25 -07:00
Stephen Birarda
d5d52f804f add a networking library and link from appropriate targets 2014-04-10 09:32:17 -07:00
Stephen Birarda
684c6b5372 run regex header replacement on all cpp files 2014-04-09 09:35:42 -07:00
Stephen Birarda
7190ce9a88 remove loadRandomIdentifier for STUN requests, use UUID 2014-03-25 14:33:53 -07:00
Tony Hagale
7f2a92d759 #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:28:12 -05:00
Tony Hagale
5f94e44cde #2386 trying a new static lookup table for numberOfOnes() 2014-03-19 16:26:45 -05:00
Brad Hefta-Gaub
c0ee3fa1f0 fix unix warning 2014-03-14 18:14:54 -07:00
Andrew Meadows
aa8c2fc8cb use radians instead of degrees (almost) everywhere 2014-03-11 17:26:58 -07:00
Stephen Birarda
403f91c988 update resource references to use Qt resource system 2014-03-06 10:41:11 -08:00
Philip Rosedale
0a1e840d10 Bot.js NPCs wander around and make sounds 2014-02-26 13:50:04 -08:00
ZappoMan
2cf2e693b9 fix debug to properly work with outputBufferBits() 2014-02-04 12:29:55 -08:00
ZappoMan
ed0a2a5a18 Merge branch 'master' of https://github.com/worklist/hifi into scripting_work
Conflicts:
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
	libraries/voxels/src/VoxelEditPacketSender.cpp
2014-01-29 19:49:36 -08:00
ZappoMan
08b06cc59c support for global collision callbacks in JS 2014-01-29 17:52:17 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
ZappoMan
98cdc656c4 more scripting support, including adding a Quat helper class that makes JS quat math easier 2014-01-29 00:56:08 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
4103cc1cde packet header changes and beginning of conversion to QByteArray 2014-01-28 10:36:08 -08:00
Brad Hefta-Gaub
d793bd44ee fix windows sign mismatch warning 2014-01-15 15:08:58 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
2014-01-15 10:20:21 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
e55e680e66 tweaks to some variable names since windows has a problem with them 2014-01-10 18:28:18 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
ZappoMan
6b0d7c30f0 added debugging option for forced clock skew 2013-12-18 16:58:49 -08:00
ZappoMan
2cb46c3447 added DEADBEEF support to debug class 2013-12-04 10:37:10 -08:00
ZappoMan
d7ae023492 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:40 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
ZappoMan
17f5530893 fixed wasted bitmasks bug where we would include colors and extra layers 2013-11-25 01:42:19 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
e65f74e06b moved compression into VoxelPacket class. works, but too slow for larger sizes 2013-11-23 21:40:50 -08:00
ZappoMan
cd1d3765a9 cleaned up const semantics and DRYed up appendBitMask 2013-11-23 16:28:21 -08:00
ZappoMan
0f66f4c1bd Revert "cleaned up some comments and code"
This reverts commit 99c427c97d.
2013-11-23 16:19:57 -08:00
ZappoMan
99c427c97d cleaned up some comments and code 2013-11-23 16:18:18 -08:00
ZappoMan
11d7cb64c2 switch back to qDebug 2013-11-23 13:42:11 -08:00
ZappoMan
e0c55be4e2 more debug 2013-11-21 15:21:29 -08:00
ZappoMan
a9c5c0707f added sentAt timestamps to voxel edit packets so we can measure transit time 2013-11-08 10:32:46 -08:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
fbf1a75d07 cleanup dead code 2013-10-17 12:24:53 -07:00
ZappoMan
1e5ce8a7e5 first cut at really getting _children UNION to work 2013-10-16 12:54:37 -07:00
Stephen Birarda
d8611e408e clear stale assignments from queue, fix CPU usage in client 2013-09-06 10:59:20 -07:00
ZappoMan
0f7ea55e82 make animation-server work with jurisdictions 2013-08-20 11:08:20 -07:00
ZappoMan
24ec0b0ddc fixed packet header bug in createVoxelEditMessage() 2013-08-06 19:15:05 -07:00
Stephen Birarda
f8e7e1de66 modifications to hook shared classes to iOS 2013-07-24 13:05:02 -07:00
Stephen Birarda
5708188180 fixes for new message handler for qt5 2013-07-24 12:22:02 -07:00
Stephen Birarda
fa155adc8c register the shared message handler to fix voxel-server output 2013-07-16 15:50:37 -07:00
Stephen Birarda
1b48d4f0fc revert removal of extraneous newlines 2013-07-16 12:46:32 -07:00
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Stephen Birarda
7f6009bb4a make randIntInRange inclusive on the max side 2013-07-15 16:25:09 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
Stephen Birarda
211204e878 Merge remote-tracking branch 'upstream/master' into timestamps 2013-07-11 09:23:16 -07:00
Stephen Birarda
ca8f25955a switch usec timestamps to uint64_t 2013-07-10 11:46:48 -07:00
Stephen Birarda
374fffb151 use packet version helpers for PACKET_TYPE_SET_VOXEL commands 2013-07-08 14:40:15 -07:00
ZappoMan
015ff85cea good progress on merging polygons 2013-07-01 21:39:56 -07:00
Stephen Birarda
2344a8c18d add copyright to SharedUtil.cpp 2013-06-18 17:56:43 -07:00
Stephen Birarda
f6fa956144 remove a blank line 2013-06-18 16:02:02 -07:00
ZappoMan
f978d748fa memmove instead of memcpy 2013-06-18 13:42:26 -07:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Stephen Birarda
a141e3dc5d resolve conflicts on merge with upstream master 2013-06-13 16:31:40 -06:00
ZappoMan
8320925add Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-13 13:30:18 -07:00