Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 05:14:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22824 commits 71 branches 56 tags 1.2 GiB
Commit graph

22824 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
c9982e765e cleanup username API from GlobalServicesScriptingInterface 2015-03-10 13:04:33 -07:00
Brad Hefta-Gaub
d662c30405 Merge pull request #4403 from AndrewMeadows/thermonuclear 
fix crash: avoid assert for zero-length character velocity
 2015-03-09 20:56:42 -07:00
Andrew Meadows
fd76eda383 slightly better hardcoded size for avatar capsule 
we'll be measuring avatar dimensions more correctly soon
 2015-03-09 17:59:45 -07:00
Andrew Meadows
3c05d685d7 avoid assert for zero-length character velocity 2015-03-09 17:37:34 -07:00
Brad Hefta-Gaub
0586cced11 Merge pull request #4401 from ZappoMan/fbxFixes 
more hacking on mixamo pipeline files
 2015-03-09 16:13:26 -07:00
ZappoMan
2a5d25e010 more hacking on mixamo pipeline files 2015-03-09 16:02:07 -07:00
Brad Hefta-Gaub
2ce80fe3d6 Merge pull request #4395 from sethalves/avatars-can-collide 
Avatars can collide
 2015-03-09 15:44:33 -07:00
Seth Alves
c947f3b62c use meters in wire-protocol for versions greater than VERSION_ENTITIES_USE_METERS_AND_RADIANS 2015-03-09 14:06:59 -07:00
Seth Alves
ab8784f1b4 add comment about character capsule being hard-coded 2015-03-09 13:51:08 -07:00
Seth Alves
99300a5bc8 merge from master 2015-03-09 13:39:51 -07:00
Stephen Birarda
74ab67c251 Merge pull request #4398 from murillodigital/master 
Fixing updater
 2015-03-09 13:19:15 -07:00
Leonardo Murillo
9ccd0a5afa Fixing updater 2015-03-09 14:12:47 -06:00
Brad Hefta-Gaub
750f8a09fa Merge pull request #4394 from AndrewMeadows/isentropic 
EntityItem now stores position in meters and angular velocity in radians/sec
 2015-03-09 12:47:00 -07:00
Brad Hefta-Gaub
5686a4a48d Merge pull request #4397 from ZappoMan/fbxFixes 
temporarily remove skeleton check from upload
 2015-03-09 11:01:20 -07:00
ZappoMan
559945c0c6 temporarily remove skeleton check from upload 2015-03-09 10:50:09 -07:00
Andrew Meadows
e418872f7b namechanges: setFooInMeters() --> setFoo() 
also fixed some warnings, made code abide to standard,
and moved some variables to be closer to where they're used
 2015-03-09 09:56:15 -07:00
Andrew Meadows
c3a8c44545 oops, removing a typo 2015-03-09 09:55:35 -07:00
Andrew Meadows
c0ed3edbbb remove exception when connecting to old server 2015-03-09 09:38:26 -07:00
Brad Hefta-Gaub
2de19ec6b3 Merge pull request #4396 from Atlante45/disk_cache 
Fix dialog labels
 2015-03-09 09:19:42 -07:00
Andrew Meadows
51d05cc43e merge upstream/master into andrew/isentropic 
Conflicts:
	libraries/networking/src/PacketHeaders.cpp
 2015-03-09 08:51:49 -07:00
Seth Alves
0833fc588b coding standard 2015-03-09 06:56:35 -07:00
Atlante45
61649ee0a5 Fix dialog labels 2015-03-09 13:42:14 +01:00
Seth Alves
3604fd639a formatting 2015-03-08 20:03:10 -07:00
Seth Alves
a180eadc91 remove stray control-Ms 2015-03-08 18:07:07 -07:00
Seth Alves
08c3fa6363 merge from upstream 2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub
e2a1ae41b7 Merge pull request #4393 from ctrlaltdavid/20389 
CR for Job #20389 - hmdDefaults.js
 2015-03-08 11:42:54 -07:00
Brad Hefta-Gaub
80675f8459 Merge pull request #4391 from ZappoMan/fbxFixes 
different mixamo detection
 2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub
e2a367607a Merge pull request #4384 from ctrlaltdavid/20369 
CR for Job #20369 - Uploaded avatars without skeletons crash Interface
 2015-03-08 11:42:07 -07:00
Brad Hefta-Gaub
21cd7e36e0 Merge pull request #4381 from Atlante45/disk_cache 
Disk cache tweaks
 2015-03-08 11:40:40 -07:00
Brad Hefta-Gaub
375fa4803e Merge pull request #4377 from jaso-r/master 
High Fidelity interview project -- Jason Rickwald
 2015-03-08 11:31:22 -07:00
Seth Alves
b2cfed8bca removed unused blob of code 2015-03-08 09:04:00 -07:00
Jason
0fd9540bc3 Sync to upstream 
Did "fetch upstream", "merge upstream/master", and resolved one
conflict.
 2015-03-07 21:40:06 -08:00
Seth Alves
e4baaa38b4 collision model url 2015-03-07 20:33:00 -08:00
Seth Alves
1a1863679d bump entity-data message version number 2015-03-07 20:32:41 -08:00
Seth Alves
d713d5596f bump entity-data message version number 2015-03-07 20:32:28 -08:00
Seth Alves
b8cdf1a318 quiet warning 2015-03-07 20:31:53 -08:00
Seth Alves
804d4a0963 coding standard 2015-03-07 20:31:37 -08:00
Seth Alves
96d94e1b09 collision model url 2015-03-07 20:31:04 -08:00
Seth Alves
58bd8a5c65 collision model url 2015-03-07 20:30:29 -08:00
Seth Alves
bcfd1d8a89 collisionModelURL property 2015-03-07 20:27:20 -08:00
Seth Alves
630b5dd03b collisionModelURL property 2015-03-07 20:27:02 -08:00
Seth Alves
9ec72e4902 quiet warning on linux 2015-03-07 20:25:46 -08:00
Seth Alves
cdeda67942 Collision Model url 2015-03-07 20:25:18 -08:00
Seth Alves
1bf8054cec Collision Model 2015-03-07 20:24:50 -08:00
Seth Alves
f6948193f1 add fields for collision model url 2015-03-07 20:24:11 -08:00
Seth Alves
72ebae72c0 allow adding entities with model urls that end in .obj 2015-03-07 20:22:32 -08:00
Andrew Meadows
ba6e66f169 merge upstream/master into andrew/isentropic 2015-03-07 18:03:49 -08:00
Andrew Meadows
5b854857c1 fix JS scripts to use radians per second 
in entity properties
 2015-03-07 18:02:41 -08:00
Seth Alves
05e0fe3536 object display correctly now? 2015-03-07 11:28:30 -08:00
Seth Alves
3642e93b3f keep triangles facing outward 2015-03-07 11:28:09 -08:00