Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-22 23:34:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28061 commits 75 branches 59 tags 1.2 GiB
Commit graph

1408 commits

Author SHA1 Message Date
Seth Alves
0970f010a4 provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are 2015-06-27 13:31:00 -07:00
Seth Alves
30be515a94 remove unneeded lock around action-data in entity item. Actions now use a weak pointer to keep track of owner entity 2015-06-27 08:53:27 -07:00
Seth Alves
005bd8bda5 merge from upstream 2015-06-26 12:33:35 -07:00
Stephen Birarda
a77cf4fb7f fix audio-mixer shutdown on UNIX/OS X 2015-06-25 16:34:38 -07:00
Seth Alves
f50ac9dcd5 remove debugging print 2015-06-22 13:12:05 -07:00
Seth Alves
5381e6e9bb entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion 2015-06-19 16:20:07 -07:00
Seth Alves
f9618ca2cb implicit cast 2015-06-18 10:07:12 -07:00
Seth Alves
7391aebf60 fix change that introduced interger division 2015-06-17 06:51:38 -07:00
Seth Alves
fdd5953e44 fix change that introduced interger division 2015-06-17 06:48:06 -07:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Stephen Birarda
81460e48f4 fix for sticking windows audio-mixer 2015-06-11 17:25:27 -07:00
Seth Alves
32cc0eacfc improve a debug print 2015-05-22 15:21:26 -07:00
Seth Alves
53fe41ef4d improve a debug print 2015-05-22 15:11:56 -07:00
Seth Alves
945a84d24f adjust logic used by the entity-server to decide if the contents of an octree-element have already been sent to a particular interface with a particular frustum 2015-05-22 15:01:43 -07:00
Seth Alves
52ce26d80d Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-21 09:20:56 -07:00
Seth Alves
7ee2ff6777 Merge pull request #4922 from birarda/ac-ice-connect 
handle AC started before local assignment server
 2015-05-20 19:40:24 -07:00
Seth Alves
38edc27cbb Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux 2015-05-20 18:24:40 -07:00
Brad Davis
079a7f2600 Fix assert caused by calling glm::perspective with nonsensical values 2015-05-20 18:11:14 -07:00
Stephen Birarda
b6f458eaf1 Merge branch 'master' of https://github.com/highfidelity/hifi into ac-ice-connect 2015-05-20 17:59:40 -07:00
Stephen Birarda
45daabc86f remove unused AssignmentClient shared mem var 2015-05-20 17:14:27 -07:00
Stephen Birarda
bea387af7d extra debug for failed local AS port read 2015-05-20 17:13:18 -07:00
Stephen Birarda
7373bb6817 contain QSharedMemory for local server port to reader 2015-05-20 17:11:08 -07:00
Seth Alves
124ff68cee make EntityItemID a subclass of QUuid 2015-05-20 14:22:08 -07:00
Seth Alves
f9d46b0cb5 interface decides on entityIDs rather than bouncing a temporary id through the entity server 2015-05-19 14:25:23 -07:00
Brad Davis
c94b8b6e30 Merge branch 'master' into dk1 
Conflicts:
	interface/src/devices/OculusManager.cpp
	interface/src/devices/TV3DManager.cpp
 2015-05-13 21:25:56 -07:00
Stephen Birarda
ca87d64dc7 fix for audio-mixer shutdown hang, removing spaces 2015-05-13 12:03:21 -07:00
Brad Davis
41d587bd2e Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" 
This reverts commit 6e8c067bcb.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -07:00
Brad Davis
464925ecc7 Fixing the assignment client 2015-05-12 01:15:30 -07:00
Seth Alves
866a6fba9b Merge pull request #4823 from birarda/master 
repairs to AC stop and clean shutdown
 2015-05-11 18:11:52 -07:00
Stephen Birarda
a6ce721586 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-05-11 16:20:16 -07:00
Stephen Birarda
7b903d29e7 fix missed conflict on merge with upstream/master 2015-05-11 12:58:00 -07:00
Seth Alves
83748096ef max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree 2015-05-11 11:37:53 -07:00
Stephen Birarda
8c6715e4fc resolve conflicts on merge with upstream/master 2015-05-11 11:10:22 -07:00
Stephen Birarda
2dc866755d fix OS comments, remove test call from Agent 2015-05-11 09:56:10 -07:00
Stephen Birarda
ebeba81233 make sure an ACM asks for PID in log 2015-05-08 17:37:48 -07:00
Stephen Birarda
be03a65dc7 remember the pid of previous child processes 2015-05-08 17:30:22 -07:00
Stephen Birarda
7b91dbfe07 wait on all children simultaneously 2015-05-08 17:24:20 -07:00
Stephen Birarda
2916596948 put back call to clearAccessCache 2015-05-08 16:54:35 -07:00
Stephen Birarda
83cd50c7ae use waitOnChildren again from checkSpares 2015-05-08 16:24:20 -07:00
Stephen Birarda
ba2ccc1e98 change waitOnChildren syntax in AC monitor 2015-05-08 16:23:44 -07:00
Stephen Birarda
b5d0a31ad4 remove clear access cache on Agent stop 2015-05-08 15:25:49 -07:00
Stephen Birarda
07d8a6a8ae remove debug for current state of ACM child process 2015-05-08 15:23:22 -07:00
Stephen Birarda
4c93e395ad ask QCoreApplication to quit when PacketTypeStopNode received 2015-05-08 15:22:58 -07:00
Stephen Birarda
fe2775ca94 print out state before wait 2015-05-08 15:10:37 -07:00
Stephen Birarda
15fdcb4fe0 fix non-block, add exit code debug 2015-05-08 15:09:11 -07:00
Stephen Birarda
e092b8c537 give each child one second to clean up 2015-05-08 15:04:54 -07:00
Stephen Birarda
78a1bcdcae add helpful debug for AC monitor cleanup 2015-05-08 15:01:03 -07:00
Stephen Birarda
897ed84cca remove debug calls used to find ACApp stall 2015-05-08 14:56:49 -07:00
Stephen Birarda
8307553d1b don't call exec from ACApp ctor 2015-05-08 14:53:30 -07:00
Stephen Birarda
692c3497cd return the actual exit code from the application 2015-05-08 14:45:46 -07:00
Stephen Birarda
aca71474d8 add debugging to AC monitor to capture hang 2015-05-08 14:43:31 -07:00
Stephen Birarda
0a295bada1 add debugging to catch AC kill hang 2015-05-08 14:32:16 -07:00
Stephen Birarda
99a9f2df90 don't allow an AC monitor to take over other local ACs 2015-05-08 14:02:19 -07:00
Stephen Birarda
df6ee4c7a5 immediately terminate instead of attempting network stop 2015-05-08 12:10:13 -07:00
Stephen Birarda
3d06a86670 drop packets on floor when shutting down 2015-05-08 11:57:25 -07:00
Stephen Birarda
fe1b8cc52b fix entity tree reset / add OST assert for myServer 2015-05-08 11:04:22 -07:00
Stephen Birarda
be58347aec consider assignment completed when worker thread is gone 2015-05-08 10:40:04 -07:00
Stephen Birarda
b080dfc1cf change comment for AC readyRead connect 2015-05-08 10:16:39 -07:00
Stephen Birarda
0f71e93c7f ensure no new OST creation on OctreeServer shutdown 2015-05-08 10:12:14 -07:00
Stephen Birarda
bab96a7711 more connect call fixes in AssignmentClient 2015-05-08 09:29:29 -07:00
Stephen Birarda
805250d1e1 don't double conditional to fire SN assert 2015-05-08 09:25:44 -07:00
Stephen Birarda
3e0029e6e6 use .data on QPointer for slot connection 2015-05-07 17:29:31 -07:00
Stephen Birarda
4c8c24eb00 remove an extra debug 2015-05-07 17:04:45 -07:00
Stephen Birarda
d75d204ff6 standardize cleanup of ThreadedAssignments 2015-05-07 17:03:43 -07:00
Stephen Birarda
bfccf02912 use lamdbas for linkedDataCreateCallback 2015-05-07 15:37:02 -07:00
Stephen Birarda
790f7a08cf clean up sequence numbers for killed sending nodes 2015-05-07 14:34:06 -07:00
Stephen Birarda
fe011e6752 keep track of out of order sends in AM 2015-05-07 14:13:27 -07:00
Stephen Birarda
b3f7ec1545 keep track of starves and skips on other avatars 2015-05-06 16:49:51 -07:00
Stephen Birarda
e540a6dbb3 fix packet sequence number unmarshal 2015-05-06 14:48:10 -07:00
Stephen Birarda
ff676958e8 fix hash replacement in PacketHeaders 2015-05-06 14:24:11 -07:00
Stephen Birarda
0d1c1bf8dd lock NodeData when attempting to read stats 2015-05-06 11:51:46 -07:00
Stephen Birarda
460abd85b9 don't double send data to a receiver 2015-05-06 11:35:45 -07:00
Stephen Birarda
3887467048 store last broadcasted sequence number 2015-05-06 10:41:24 -07:00
Stephen Birarda
6b3cf1ba4a remove dependency of PacketHeaders on NodeList 2015-05-05 12:19:42 -07:00
Stephen Birarda
31bbf15a55 remove unused variable 2015-05-04 11:30:56 -07:00
Stephen Birarda
6cff75f7c1 resolve conflicts on merge with upstream/master 2015-05-04 10:05:44 -07:00
Stephen Birarda
274e98974b Merge pull request #4734 from Atlante45/ac_fix 
Fix for bot_procedural
 2015-05-04 12:44:08 -04:00
Seth Alves
9f1cb2a4e5 fix kill/terminate order 2015-05-01 16:56:39 -07:00
Seth Alves
23c44500d8 no magic numbers 2015-05-01 16:45:04 -07:00
Stephen Birarda
83d6569aa1 reference QTimer member variable for AvatarMixer 2015-05-01 16:34:50 -07:00
Seth Alves
4eac60b463 try harder to make sure all the assignment-client children stop 2015-05-01 16:34:44 -07:00
Stephen Birarda
475861c4be move KILO_PER_MEGA to numerical constants 2015-05-01 16:30:25 -07:00
Stephen Birarda
edade7baba resolve conflicts on merge with upstream master 2015-05-01 16:24:16 -07:00
Stephen Birarda
d602c71346 cleanup audio-mixer stats, add username interpolation 2015-05-01 16:12:46 -07:00
Stephen Birarda
99bddcc102 insert usernames to JSONBreakableMarshal interpolate map 2015-05-01 15:45:53 -07:00
Stephen Birarda
8037d383b1 remove extra debugging from AvatarMixer 2015-05-01 15:20:07 -07:00
Stephen Birarda
a7bff474e3 use JSONBreakableMarshal in AC monitor to get QJsonObject 2015-05-01 15:18:49 -07:00
Stephen Birarda
532bcc9376 complete initial algorithm for AM throttle 2015-05-01 14:56:40 -07:00
Stephen Birarda
67efa7796f use only AD rate for FRD adjustment 2015-05-01 10:38:32 -07:00
Stephen Birarda
94739cf8d3 move number constants out of SharedUtil to NumericalConstants 2015-05-01 10:26:53 -07:00
Stephen Birarda
744d026e81 initial pass at tailoring the FRD for send rate 2015-04-30 17:16:31 -07:00
Stephen Birarda
5b55a52a04 add check in AvatarMixer for next adjustment 2015-04-30 15:36:31 -07:00
Atlante45
95b4c75f9f Add missing DM::set<>() calls 2015-05-01 00:21:29 +02:00
Stephen Birarda
3e842d7e34 add debug for result values from DS settings 2015-04-30 14:59:03 -07:00
Stephen Birarda
5936073425 get avatar-mixer settings from domain-server 2015-04-30 14:55:53 -07:00
Stephen Birarda
17142a532f add stats for max FRD and num avatars last frame 2015-04-30 10:09:23 -07:00
Stephen Birarda
3a10da688f switch the avatar stat to kbps 2015-04-30 08:56:08 -07:00
Stephen Birarda
2c0604afd1 fix string JSON unmarshal, add basic avatar values 2015-04-30 08:55:08 -07:00
Seth Alves
09eea83461 don't give timers owners while also keeping track of them in as class instance variables 2015-04-29 19:18:58 -07:00
Stephen Birarda
842886d0fc add back read_pending_datagrams stats 2015-04-29 16:28:47 -07:00
Seth Alves
b041fd1b7f AssignmentClientMonitor now waits() on children 2015-04-29 15:58:56 -07:00
Seth Alves
69766f6e59 cleanups 2015-04-29 15:34:31 -07:00
Seth Alves
e985f56b12 cleanups 2015-04-29 15:30:13 -07:00
Seth Alves
009bb9dc71 all 4 types of assignment-client appear to exit cleanly, now 2015-04-29 15:16:00 -07:00
Seth Alves
e7d8bccd5d cleanups 2015-04-29 12:03:54 -07:00
Seth Alves
d2cd4fc405 types 0 and 1 exit cleanly, type 6 crashes 2015-04-29 11:56:45 -07:00
Seth Alves
02fd9987c7 rework audio mixer so it can exit cleanly 2015-04-28 18:38:41 -07:00
Stephen Birarda
68998f4423 cleanup AudioMixer stats to be properly nested 2015-04-28 18:19:16 -07:00
Stephen Birarda
77be0012cf cleanup stats packaging in AudioMixer 2015-04-28 15:35:51 -07:00
Stephen Birarda
85a3b5597c use a distance per avatar for conditional avatar data broadcast 2015-04-28 15:01:06 -07:00
Atlante45
604a13f8ad Only editor can mute environment 2015-04-15 17:04:59 +02:00
Stephen Birarda
1d5f1807f7 Merge pull request #4562 from sethalves/editors-are-rezzers 
add a bool value to Node which indicates if it is allowed to rez new ent...
 2015-03-31 18:53:29 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
Seth Alves
9428857194 quiet compiler, remove extra-assignment/typo 2015-03-28 17:10:16 -07:00
Brad Davis
bf607e4c9c Fixing indentation and usage 2015-03-19 15:53:16 -07:00
Brad Davis
72957670ba Some commentary 2015-03-19 09:55:03 -07:00
Brad Davis
160f666d89 Merge branch 'master' into avatar 2015-03-18 12:55:56 -07:00
Brad Davis
6415ff99f6 Work in progress 2015-03-17 12:04:04 -07:00
Brad Davis
d7b1852164 Creating eachMatchingNode and using it in avatar mixer 2015-03-16 15:25:44 -07:00
Seth Alves
3bc85c2531 instead of a json checkbox, a dropdown to chose the file type 2015-03-12 09:34:01 -07:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Brad Hefta-Gaub
00b731a868 Merge pull request #4372 from sethalves/fix-assignment-client-monitor 
pass -t to children even if run in parent mode.  monitor (parent) only i...
 2015-03-06 12:08:32 -08:00
samcake
6b1f42df83 Merge pull request #4366 from ZappoMan/removeMetavoxels 
remove metavoxels
 2015-03-03 15:50:53 -08:00
Seth Alves
8affca6120 pass -t to children even if run in parent mode. monitor (parent) only interacts with its own children 2015-03-03 14:58:53 -08:00
Brad Hefta-Gaub
b88d52a310 Merge pull request #4363 from huffman/block-restricted-users 
Add permission-checking to edit entities
 2015-03-03 11:04:46 -08:00
ZappoMan
5c3c94a618 remove metavoxels 2015-03-02 17:21:43 -08:00
Ryan Huffman
b370e025c9 Move EntityScriptingInterface instance to DependencyManager 2015-03-02 15:05:31 -08:00
Seth Alves
fb4f2fe89c Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-27 10:19:06 -08:00
Seth Alves
b8322556a6 address code-review comments 2015-02-26 17:34:24 -08:00
Seth Alves
c80995170a -n and -t are okay together 2015-02-26 17:17:19 -08:00
Seth Alves
7c7d727b55 mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 10:07:48 -08:00
Seth Alves
0918d4989b mv ShutdownEventListener into class which is a child of QCoreApplication 2015-02-26 09:53:23 -08:00
Seth Alves
f157c5c60d Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem 2015-02-26 09:13:49 -08:00
Seth Alves
128a38100f Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x 2015-02-25 14:13:55 -08:00
Leonardo Murillo
006b3ed0ac Merge pull request #4300 from birarda/dependencies 
NOT MERGEABLE - add some externals as cmake external projects
 2015-02-25 13:22:49 -08:00
Seth Alves
1a4808857e put local domain server's http port into shared memeory 2015-02-25 11:30:54 -08:00
Seth Alves
0ce49888ff AssignmentClientApp is QCoreApplication, other classes aren't. If --min is set and all the assignment clients exit (probably due to domain server restarting), respawn until --min is statisfied. 2015-02-25 09:20:34 -08:00
Seth Alves
5c5ffc07ab allow client count to drift as needed if the user doesn't specify --min or --max 2015-02-24 17:43:08 -08:00
Seth Alves
c9d6a44c3a fix up command-line parsing 2015-02-24 16:56:13 -08:00
Stephen Birarda
09ffcbb2e8 Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare" 
This reverts commit 087e2babde, reversing
changes made to 5202d2136a.
 2015-02-24 12:30:40 -08:00
Stephen Birarda
087e2babde Merge pull request #4324 from sethalves/assignment-client-keep-a-spare 
Assignment client keep a spare
 2015-02-24 11:40:43 -08:00
Seth Alves
0b9b7f06cc address various comments from code review 2015-02-23 11:12:19 -08:00
Andrew Meadows
0455ccf7be Merge pull request #4313 from ctrlaltdavid/20355 
CR for 20355 - Initial Integration with DDE
 2015-02-23 09:47:19 -08:00
Seth Alves
270d509a12 cleanups 2015-02-20 14:29:12 -08:00
Seth Alves
8cee88acb4 network chatter between Monitor and AssignmentClients is expected to be localhost only 2015-02-20 14:25:43 -08:00
Seth Alves
4bba4fc387 cleanups 2015-02-20 13:44:37 -08:00