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

2648 Commits (a3e50ef8dc6212d089d04ea6511a303b2d6aa078)

Author SHA1 Message Date
UbitUmarov a3e50ef8dc testing update Warp3d.dll to .net4.6 2018-01-12 03:15:48 +00:00
UbitUmarov 98f79cf735 testing update XMLRPC.dll to .net4.6, not this is not same source that previus one.. so we may have other issues 2018-01-12 03:12:01 +00:00
UbitUmarov 3c3b8fc759 testing update httpserver.dll to .net4.6 2018-01-12 03:07:51 +00:00
UbitUmarov 875ca104b8 Merge branch 'master' into httptests 2018-01-05 22:37:42 +00:00
UbitUmarov 7f49364d65 remove some tabs added to config files 2018-01-04 22:52:29 +00:00
UbitUmarov 2811e5cef3 update configuration files and examples for mutes 2018-01-04 21:21:38 +00:00
UbitUmarov ab0f866087 Merge branch 'master' into httptests 
# Conflicts:
#	prebuild.xml
 2017-12-12 22:19:31 +00:00
UbitUmarov a95e286168 increase sample rate of WaitGetScenePresence() 2017-12-11 23:36:42 +00:00
TomTheDragon 98f90f4eed Changing map tile colors This change also allows setting the water color, as well as the 4 colors for textured map tiles. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2017-11-13 20:43:16 +00:00
UbitUmarov cdb7d506fd Merge branch 'master' into httptests 2017-11-12 03:26:48 +00:00
UbitUmarov eaa239eb06 add a warning in opensim.ini.example mute lists, about the fact viewers cache beening shared by all grids, and that can be confusing 2017-11-12 03:26:10 +00:00
UbitUmarov ca4804b758 Merge branch 'master' into httptests 2017-11-12 03:18:02 +00:00
UbitUmarov 8e8108c78c change opensim.ini.example mutes coments to express what our current code does 2017-11-12 03:16:40 +00:00
UbitUmarov 16a8e166ff Merge branch 'master' into httptests 2017-10-26 19:01:16 +01:00
Kevin Cozens 6a5b234262 Fixed typo in a comment. 2017-10-26 13:43:36 -04:00
Kevin Cozens 70d693eff2 Added missing Allow line for osGetSimulatorMemoryKB. 2017-10-26 13:42:54 -04:00
Kevin Cozens 5cc41eee34 Sorted the groups of Allow statements by alphabetical order. 2017-10-26 13:40:59 -04:00
UbitUmarov b1814d3492 Merge branch 'master' into httptests 2017-10-01 18:05:10 +01:00
Robert Adams cc915b4d05 BulletSim: update MacOS version of libBulletSim to latest version. 
See Mantis 8232.
   Thanks Gavin Hird.
 2017-09-20 21:02:00 -07:00
UbitUmarov e4dfa50654 replace libomv saving a few op on vector * quaternion 2017-09-17 04:43:53 +01:00
UbitUmarov ca493a1beb Merge branch 'master' into httptests 2017-09-05 20:25:12 +01:00
Robert Adams 921e3ceb09 BulletSim: Merge branch 'BulletSim2017' 
Adds raycast using Bullet physics engine.
 2017-09-05 06:24:04 -07:00
UbitUmarov 86493d75fa Merge branch 'master' into httptests 2017-09-04 18:39:42 +01:00
Kevin Cozens e08b051ca6 Fixed typos in comments in osslEnable.ini 2017-09-04 13:30:16 -04:00
Robert Adams 6c5cfbafba BulletSim; Update BulletSim.dll's and so's for raycast. 2017-09-03 17:14:59 -07:00
UbitUmarov 34da125a4d fix our name is OpenSimulator not OpenSim 2017-08-31 15:25:14 +01:00
UbitUmarov 3fe3471532 improve Prefer32bit configuration option 2017-08-31 15:17:42 +01:00
UbitUmarov a578df9589 CSharp targets name still wrong 2017-08-31 11:29:00 +01:00
UbitUmarov b9fc629bdf fix a whitecode bug, add missing files 2017-08-31 11:23:03 +01:00
UbitUmarov 41e8b9f91f update Prebuild with WhiteCore version 2017-08-30 22:24:07 +01:00
UbitUmarov e4747b938b update httpserver 2017-08-28 13:33:37 +01:00
UbitUmarov 8434def603 update ODE bins for windows to 0.13.3 ( old ode will now also have stati/dynamic friction, cant avoid it 2017-08-21 05:00:18 +01:00
UbitUmarov f9c01db33c Merge branch 'master' into httptests 2017-08-19 22:48:31 +01:00
Robert Adams 1fdd56f987 BulletSim: Update macOS version of BulletSim with the actual Bullet 
2.86. (the last commit was really an update to 2.82).
    Thanks Gavin Hird.
 2017-08-18 12:44:29 -07:00
UbitUmarov e2ca5853fc Merge branch 'master' into httptests 2017-08-18 04:33:21 +01:00
Diva Canto 2df4c1bb91 Replaced libomv dlls with newly compiled ones to solve crashes with pCampBot. See 
e8250162cc
 2017-08-17 17:43:58 -07:00
Robert Adams c804835801 BulletSim: Update macOS version of BulletSim with Bullet 2.86 and collision fixes. 
Thanks Gavin Hird.
 2017-08-17 10:33:18 -07:00
UbitUmarov 6d4b0a8ce3 Merge branch 'master' into httptests 2017-08-16 05:05:57 +01:00
Robert Adams 78c78f69b1 Merge branch 'master' into BulletSim2017 2017-08-15 09:04:03 -07:00
UbitUmarov bf84e46c59 update libode for MAC, thanks again Gavin Hird 2017-08-15 16:01:56 +01:00
Robert Adams 76c29cb106 Update BulletSim with corrected collision computations. 
A fix for Mantis 8010.
 2017-08-14 18:46:16 -07:00
Robert Adams 2afd158b1d Update BulletSim with Bullet V2.86. 
Should be no functional changes.
 2017-08-09 13:43:44 -07:00
Kevin Cozens e9b7971929 Remove profile from basic configuration 2017-08-05 15:44:05 -04:00
UbitUmarov 169a50286b upload ODE lib for linux. Plz keep previus version in case something goes wrong. Thanks jakdaniels for the compilation 2017-07-29 00:08:40 +01:00
UbitUmarov 324bda8ab9 mantis 8218 make Meshmerizer UseMeshiesPhysicsMesh defualt to true, to match stated on ini files. 2017-07-27 16:23:08 +01:00
UbitUmarov 93582523a7 ubOde: make option MinSizeToMeshmerize visible in OpenSimDefaults.ini 2017-07-22 01:44:29 +01:00
UbitUmarov f6f0b1c513 fix a few EN typos 2017-07-21 14:41:13 +01:00
UbitUmarov 66a5b4d120 ubOde suport convex shapes on all normal prims and sculpts. Since code is experimental this is controled by options ConvexPrims and ConvexSculpts, on section Mesh, that can be set to false in case of problems 2017-07-21 14:11:03 +01:00
UbitUmarov fe6ad384e4 merge 2017-07-20 11:30:12 +01:00
UbitUmarov 4b7f79e296 fixes and changes on TreePopulatorModule. Please read OpenSimDefaults.ini 
[Trees] section. Does need more work, and some hardcode settings may not
be the optimal still"
 2017-07-15 04:07:03 +01:00