OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
22,164 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

22164 Commits (3a924b41c49553fc3c77e9d149ce6794edafc919)

Author SHA1 Message Date
ubit 3a924b41c4 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-08 01:24:30 +01:00
UbitUmarov d5066ae678 * DAnger, TEST * change camera plane collision detection. Still bounces on 
* prim edges due to camera lag
 2013-01-08 00:21:09 +00:00
ubit 42acd2d721 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-07 12:04:50 +01:00
UbitUmarov d2cb2da790 also exclude land 2013-01-07 11:03:36 +00:00
UbitUmarov 982328b4ed exclude avatars from unfiltered RaycastWorld 2013-01-07 10:56:30 +00:00
ubit c9d39359bb Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-07 11:37:25 +01:00
UbitUmarov ca40e656ab in raycast for camera exclude self detection 2013-01-07 10:35:55 +00:00
ubit aa44a65d24 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-06 13:08:48 +01:00
UbitUmarov dc6b7bb5c9 don't try to read geom positions outside main ode thread :( 2013-01-06 12:07:16 +00:00
ubit ebfa614bf9 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-03 22:53:51 +01:00
UbitUmarov c961cfe19e bug fix, cleanup... 2013-01-03 21:53:21 +00:00
ubit 8ea83f119c Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-03 15:28:27 +01:00
UbitUmarov a285ff7e69 check land permitions on sit target for unscripted sits 2013-01-03 14:27:21 +00:00
ubit 1fffdc3866 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-03 04:33:50 +01:00
UbitUmarov 1665a0d636 make ResetMoveToTarget cancel any 'force' waiting to be applied to avatar 
( by the odd use of Velocity)
 2013-01-03 03:29:40 +00:00
UbitUmarov d40cdd2649 cancel MoveToTarget (viewer 'go here") on sits 2013-01-03 02:25:27 +00:00
ubit dbe8e90a17 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-02 23:00:11 +01:00
UbitUmarov a504704071 i try to fix avatar orientation in some cases.. 2013-01-02 21:59:19 +00:00
ubit 94e7ccea99 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-02 21:07:47 +01:00
UbitUmarov be6b6bf191 add a lock to CollisionEventsThisFrame 2013-01-02 20:06:57 +00:00
ubit f4e189e828 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-02 20:41:13 +01:00
UbitUmarov 7980a1d849 *TEST* avatar unscripted sit. Some guessing/automation 2013-01-02 19:39:46 +00:00
ubit 41a44d7165 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2013-01-02 09:28:55 +01:00
Melanie 2313a86e32 Merge branch 'ubitwork' into avination 2012-12-22 01:04:49 +01:00
teravus 77cc7ce399 * Partial Commit for Avatar Appearance to include the functionality of Cached Bakes. 2012-12-21 19:12:30 -05:00
teravus f9051c22d8 * Send an Unsolicited AgentDataUpdate packet upon Root Agent Status to synchronize with Agni. 2012-12-19 22:14:20 -05:00
teravus c648325d7c Merge branch 'avination' of careminster:/var/git/careminster into teravuswork 2012-12-19 11:53:26 -05:00
Melanie d1dd5a8ba9 Add the interfaces for the new Avination baked texture cache service 2012-12-19 13:04:41 +01:00
ubit 021485b581 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-18 11:09:53 +01:00
UbitUmarov f185239fc3 Merge branch 'avination' into ubitwork 2012-12-18 10:05:43 +00:00
Melanie 861477d85e Fix locking for good 2012-12-18 09:32:05 +01:00
UbitUmarov 72c7f4b2eb Merge branch 'avination' into ubitwork 2012-12-18 02:15:35 +00:00
UbitUmarov ed9cb18cf0 missing file 2012-12-18 00:54:40 +00:00
ubit 4b911348b4 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-18 01:54:36 +01:00
ubit 42d57fbce0 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-18 01:50:47 +01:00
UbitUmarov f87af983f3 fix 2012-12-18 00:50:36 +00:00
ubit e33b350ffe Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-17 23:11:53 +01:00
UbitUmarov 9089bc7e37 some clean up/fix 2012-12-17 22:11:29 +00:00
ubit e4fd63e402 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-17 02:43:59 +01:00
UbitUmarov 9d1a6558d9 *TESTP unscripted sit: missing files 2012-12-17 01:43:16 +00:00
ubit 46ca9e8a1a Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-17 02:41:53 +01:00
UbitUmarov d003aa2e7b * TEST * unscripted sit 2012-12-17 01:40:48 +00:00
Melanie 51354bad48 Merge branch 'ubitwork' into avination 2012-12-17 02:01:47 +01:00
Melanie a5781ea9fc Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2012-12-17 01:59:50 +01:00
Melanie 7d8c2b342c Fix locking objects 2012-12-16 02:05:01 +01:00
teravus d2695cb3f7 * Fix for Prim Locking. Prior to the merge, it was just a clone of the root part to each of the child parts. 2012-12-15 16:26:03 -05:00
Melanie 1d713bcdb8 Merge branch 'ubitwork' into avination 2012-12-14 03:57:31 +01:00
Melanie 7a093df24b Prevent a failed user relogi from throwing exceptions in poll services 2012-12-14 03:35:55 +01:00
ubit ea82efdee2 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-12-13 08:49:04 +01:00
UbitUmarov 5ad424a792 right fix this time ?? 2012-12-13 07:48:29 +00:00