Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 22:36:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
32492 commits 74 branches 59 tags 1.2 GiB
Commit graph

811 commits

Author SHA1 Message Date
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
ZappoMan
a0e51469d3 Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching 2015-05-28 12:36:34 -07:00
Ryan Huffman
8002014dcd Add <memory> to AvatarData for _ptr 2015-05-27 15:13:25 -07:00
Ryan Huffman
21b5e26dc9 Move AvatarData typedefs to AvatarData.h 2015-05-27 14:52:48 -07:00
Seth Alves
bfa0e9c234 recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 14:44:23 -07:00
Seth Alves
ba0467aafe Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…" 2015-05-27 14:10:45 -07:00
Ryan Huffman
389d5556f5 Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer 2015-05-27 12:36:55 -07:00
Eric Levin
eb0f35e041 removed const keyword from qinvokables for avatar getter methods such as getVelocity 2015-05-27 11:44:37 -07:00
Andrew Meadows
2f4162f447 cleanup of AvatarManger API 2015-05-19 16:53:30 -07:00
Andrew Meadows
f86c419988 stubbery for collidable avatars 2015-05-19 14:15:26 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Andrew Meadows
5a388a0c14 Merge pull request #4722 from birarda/avatar-mixer-debug 
add option to display AvatarData receive stats with display name
 2015-04-29 10:00:24 -07:00
Stephen Birarda
61b4025526 remove the uneeded curly braces for default ctor 2015-04-29 09:33:23 -07:00
Stephen Birarda
c52426385d code review comments for #4713 2015-04-28 18:28:05 -07:00
Stephen Birarda
f2dcacffd0 show avatar data receive rate by default with display name 2015-04-28 18:27:42 -07:00
Eric Levin
342d3576c9 Added ability to check if an avatar is within specified range of a position from javascript 2015-04-28 14:46:39 -07:00
ZappoMan
37928dcd6d fix default avatars on first run 2015-04-24 11:30:18 -07:00
Andrew Meadows
4bef5b7b73 Merge pull request #4638 from Triplelexx/myavatar-targetvelocity 
Myavatar targetvelocity
 2015-04-15 14:22:02 -07:00
ZappoMan
ae16bab7c2 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
 2015-04-14 13:13:15 -07:00
Triplelexx
d2b643d389 Add targetVelocity into MyAvatar simulation 
MyAvatar sets a target velocity to achieve, this is parsed in the
preSimulation controller step.
 2015-04-13 23:57:08 +01:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
d4461f1ecb put avatars and embedded-webserver and entities logging into their own QLoggingCategory 2015-04-06 16:22:54 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
Philip Rosedale
53970cb530 Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix 
fix bug in default avatars
 2015-03-27 14:54:35 -07:00
ZappoMan
1821683453 fix bug in default avatars 2015-03-27 14:44:35 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Atlante45
3a11ed0574 Account for stereo audio in recorder 2015-03-17 16:40:26 +01:00
Atlante45
b0fd28beeb Typo 2015-03-17 16:40:25 +01:00
Andrew Meadows
924ebe1e54 propagate skeleton's bounding box into AvatarData 2015-03-13 09:39:47 -07:00
Andrew Meadows
a1a12465da able to update avatar controller in PhysicsEngine 2015-03-12 16:36:41 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Seth Alves
8eec66c066 merge upstream, avatar can now fall onto a cube 2015-03-03 18:37:16 -08:00
Andrew Meadows
9ad88c3793 Referentials do math using meters 2015-02-26 13:42:08 -08:00
Philip Rosedale
d74856e01b add angularVelocity to controller 2015-02-24 11:21:04 -08:00
David Rowe
d704af21ac Generalize "faceshift" data handling to "facetracker" 
DDE face tracking data is now broadcast to other avatars.
 2015-02-18 12:41:54 -08:00
Stephen Birarda
e47333a808 specify QScriptable include under QtScript 2015-02-04 11:08:26 -08:00
Stephen Birarda
11f3161029 resolve conflicts on merge with upstream/master 2015-02-04 10:38:05 -08:00
Stephen Birarda
bd0552618f resolve conflicts on merge with upstream/master 2015-02-02 17:10:13 -08:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
David Rowe
5474c0634e Merge branch 'master' into 20277 
Conflicts:
	libraries/script-engine/src/ScriptEngine.cpp
 2015-01-30 13:49:45 -08:00
Atlante45
19ea9724ab Re-add accidentally removed int size() 2015-01-30 11:41:14 -08:00
Atlante45
2d973e5288 Move updateMyAvatar to AvatarManager 2015-01-29 16:55:32 -08:00
Atlante45
6b7a391885 move a couple avatar initialisations outside avatar maanger 2015-01-29 16:00:57 -08:00
Atlante45
9095eeeeb9 Return WeakPointer in avatarHashMap 2015-01-29 15:50:59 -08:00
Atlante45
c25ae9d506 Merge branch 'android' of git://github.com/birarda/hifi into android 
Conflicts:
	interface/src/Application.cpp
	libraries/entities/src/EntityCollisionSystem.cpp
	libraries/entities/src/EntityCollisionSystem.h
 2015-01-27 15:04:17 -08:00
Stephen Birarda
54660dd1a2 resolve conflicts on merge with upstream master 2015-01-27 14:24:48 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Atlante45
4eac6cd410 Moved IDENTITY_FRONT/UP/RIGHT to GLMHelpers 2015-01-23 13:19:03 -08:00
Atlante45
ee9f183e14 Update static flag 2015-01-23 12:14:54 -08:00
Atlante45
a616edbb55 Remove avatars dependency on model,gpu,fbx (OpenGL) 2015-01-23 12:14:13 -08:00
Atlante45
6d9deffdaa Remove avatars dependency to octree 2015-01-23 11:58:22 -08:00
Atlante45
9f58865937 Add AvatarHashMap and AvatarManager to DM 2015-01-23 11:46:11 -08:00
Stephen Birarda
343b09c855 remove AudioClient dependency on Recorder 2015-01-21 13:21:37 -08:00
Stephen Birarda
0eced09f1d intial removal of Audio to audio-client 2015-01-21 11:49:06 -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
Atlante45
b922b028e9 Fixes body not rotating for other avatars 2015-01-14 16:47:20 -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
Atlante45
063e95bd79 Clement doesn't know how to use radians 2015-01-09 14:31:34 -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
Atlante45
6fc3e1cf81 change message size 2015-01-08 11:51:14 -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
Stephen Birarda
51bba4884f resolve conflicts on merge with upstream master 2015-01-05 14:40:48 -08:00
Stephen Birarda
dfb02aea0c resolve conflicts on merge, add cstring inc 2015-01-05 09:25:30 -08:00
ZappoMan
9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
 2014-12-31 10:50:53 -08:00
ZappoMan
49d8f2b2f5 more work on voxelEctomy 2014-12-30 18:52:33 -08:00
Philip Rosedale
dc9937e11a only twist own body, remove unused head functions 2014-12-30 17:02:53 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Atlante45
327daacecd Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	interface/src/Application.cpp
	interface/src/devices/OculusManager.cpp
	libraries/networking/src/NodeList.cpp
 2014-12-22 13:34:18 -08:00
ZappoMan
dd06d1f4a9 added comments to explain hand state 2014-12-19 10:01:14 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
4077a76e46 remove AudioRingBuffer include where not needed 2014-12-16 11:58:12 -08:00
Stephen Birarda
c734bc89a3 move the audio scope into its own class 2014-12-16 11:54:59 -08:00
David Rowe
20b880ca09 Fix avatar hand state decoding for finger laser 2014-12-11 23:07:05 -08:00
David Rowe
fe8937e37e Make lasers able to emanate from index finger tips 2014-12-11 21:31:08 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Andrzej Kapolka
779f5f7614 Default avatar fixes. 2014-11-14 13:02:02 -08:00
Stephen Birarda
e10d132f75 avoid Qt QTimer thread bug by putting SoundCache on same thread 2014-11-13 14:47:28 -08:00
Stephen Birarda
fd6b9c3550 changes to sound class to allow caching of sounds 2014-11-13 10:16:42 -08:00
Stephen Birarda
b7b371ba61 resolve conflicts on merge with upstream master 2014-11-11 20:53:24 -08:00
Stephen Birarda
a8681cd5b6 changes to allow AudioInjectorOptions to operate as a hash from js 2014-11-11 10:24:21 -08:00
Andrzej Kapolka
6445b3aa5d Linux warnings fixes. 2014-11-07 15:59:16 -08:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Atlante45
20c862d199 Fix player loop 2014-10-23 14:35:24 -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
Stephen Birarda
f19c5c9850 repair NetworkAccessManager returns, handle custom AS port in assignment-client 2014-10-06 14:57:38 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset() 
for improved walk animations
 2014-10-05 19:10:55 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Atlante45
56acc86f4f Missed some qints 2014-09-30 21:20:37 -07:00
Atlante45
68c25e805a Switch int64 to int 2014-09-30 14:31:40 -07:00
Atlante45
5f95cbc101 JS hooks 2014-09-30 11:23:33 -07:00
Atlante45
1afdd34577 Added custom audio offset and volume to Player 2014-09-30 11:23:25 -07:00
Atlante45
c99047677f Members initialisation 2014-09-29 14:49:55 -07:00
Atlante45
6d15728283 frame interpolation for recordings 2014-09-29 12:30:10 -07:00
Atlante45
cf453a8953 removed _isPaused 2014-09-25 19:32:57 -07:00
Atlante45
cf925120ca Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-25 19:23:46 -07:00
Brad Hefta-Gaub
0775e9dde4 Merge pull request #3479 from PhilipRosedale/master 
Improved eye contact, audio driven mouth and brows, linear audio scope
 2014-09-25 09:32:37 -07:00
Atlante45
75dc26c9ff Slider can moved when recording paused or stoped 2014-09-24 16:19:47 -07:00
Atlante45
11e60c864a Changed recording file format 2014-09-24 15:17:23 -07:00
Philip Rosedale
75e536235c Avatars look at your camera, not your avatar. Improvements to lookAt code 2014-09-24 14:38:44 -07:00
Atlante45
f536e33d13 Merge branch 'master' of https://github.com/highfidelity/hifi into fix_attachment_bug_with_recording 2014-09-23 14:54:49 -07:00
Atlante45
7ab8c7750c Extra spaces 2014-09-23 14:37:43 -07:00
Atlante45
3b33db9a6b Added pause/setCurrentTime/setCurrentFrame JShooks 2014-09-23 14:19:16 -07:00
Atlante45
95c00b1d4e Added pause behavior + change frame computation 2014-09-23 14:18:54 -07:00
Atlante45
13a5dbf489 Added frame computation and JS hooks 2014-09-23 11:01:21 -07:00
Andrew Meadows
ab53202003 remove warning about signed/unsigned comparison 2014-09-23 09:07:05 -07:00
Atlante45
8393fcc6eb Frame computation + timerOffset member 
When jumping inside a recording
 2014-09-22 14:01:02 -07:00
Atlante45
58b1db4f09 Added JS hooks for new Player options 2014-09-18 16:49:13 -07:00
Atlante45
29ff8c09d9 Fix LookAtPosition 2014-09-18 15:23:58 -07:00
Stephen Birarda
1a5149af02 add another missing const to readRecordingFromRecFile 2014-09-18 11:29:51 -07:00
Stephen Birarda
b1abdc05a0 add the last missing consts in Recording.h 2014-09-18 11:25:50 -07:00
Stephen Birarda
93d83b707d use a copy of filename in Recording.cpp to make changes to filename 2014-09-18 11:21:09 -07:00
Stephen Birarda
2ee367fa44 add a couple of missing consts 2014-09-18 11:14:17 -07:00
Stephen Birarda
ac588a569e add const to recording methods where arguments are passed by reference 2014-09-18 11:12:11 -07:00
Stephen Birarda
6e39f049c8 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 11:08:59 -07:00
Atlante45
72d8522adc Fixed typo + removed MesageBoxes 2014-09-18 10:45:12 -07:00
Atlante45
397be962f4 CR fixes 2014-09-18 10:37:36 -07:00
Stephen Birarda
c9c8a1c194 handle another casing issue for Nodelist include 2014-09-18 10:11:34 -07:00
Stephen Birarda
6d335a8634 fix capitalization in NodeList include 2014-09-18 10:02:54 -07:00
Stephen Birarda
1ac6c8a568 Merge remote-tracking branch 'clement/rec_file_format_tweaks' into clement-recording-changes 2014-09-18 10:02:29 -07:00
Atlante45
e0739e4aa8 PreCR fixes 2014-09-18 00:03:02 -07:00
Atlante45
06dd9d0376 Moved Player and Recording to their own files 2014-09-17 23:52:21 -07:00
Atlante45
d27134a7ac Added getters for the different Player options 2014-09-17 17:06:47 -07:00
Atlante45
34c16b8a74 Convert .rec to new format if necessary 2014-09-17 16:25:48 -07:00
Atlante45
6e55c66d09 Fix radix bug 2014-09-17 16:24:54 -07:00
Andrew Meadows
489871d0d6 added MyAvatar.setMotorVelocity() & friends for JS 2014-09-16 17:09:32 -07:00
Atlante45
c699726ae8 Fixed URLs not read properly 2014-09-16 16:32:14 -07:00
Atlante45
81fc0d3696 Added options to use recording context 2014-09-16 14:50:20 -07:00
Atlante45
f649cd1a6e Changed how looping occurs in recordings 2014-09-16 14:49:47 -07:00
Atlante45
96995e3aed Enforce checksums equality 2014-09-16 13:59:30 -07:00
Atlante45
1c5c9cb31b Fix bug adding first samples twice 2014-09-16 13:57:46 -07:00
Atlante45
72481999df Compute actual checksum 2014-09-16 12:46:42 -07:00
Atlante45
8573130f07 Write correct Offset ad Length of the data 2014-09-16 12:34:22 -07:00
Atlante45
59637390a2 Add global timestamp to recordings 2014-09-16 12:26:55 -07:00
Atlante45
f5b53a77ab Merge branch 'master' of https://github.com/highfidelity/hifi into rec_file_format_tweaks 2014-09-16 12:14:11 -07:00
Atlante45
d80a42b800 New recording file format 
Added header containing:
		- Magic number
		- Version number
		- Data Offset
		- Data Length
		- CRC-32
	Planned space for metadata
	Added context block (domain, models, transform, display name,
attachments)
	Improved glm types packing (SHould take about half the space it
used to))
 2014-09-15 19:19:10 -07:00
Atlante45
ffba243a4f Added methods to read/write glm types 2014-09-15 19:17:16 -07:00
Atlante45
b28e7e4562 Added RecordingContext support to Player/Recorder 
Changed meaning of certain values stored in recordings
 2014-09-15 19:14:47 -07:00
Atlante45
29f85ecca4 Introduced RecordingContext class 2014-09-15 19:09:40 -07:00
Atlante45
8f65f036dd Remove deprecated getters 2014-09-15 19:06:09 -07:00
Atlante45
145e11a478 Move one-line method to .h 
Moved method to .h f line less than 120 characters
	Added _lookAtPosition to RecordingFrame
 2014-09-15 19:01:50 -07:00