Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 05:21:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
23570 commits 76 branches 59 tags 1.2 GiB
Commit graph

23570 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
48144a46b1 don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there. 2015-03-31 14:34:35 -07:00
Seth Alves
95cc8672c0 remove unneeded assert 2015-03-31 14:32:43 -07:00
Seth Alves
55d506bb53 formatting 2015-03-31 14:04:49 -07:00
Seth Alves
ea2c5ff622 formatting 2015-03-31 14:04:33 -07:00
Seth Alves
9e0118492e make sure to not leave in-use resources in UnusedResource list 2015-03-31 14:04:21 -07:00
Seth Alves
347ef3c4e1 use scaling from visual model on collision model rather than using the bounds from the collision model 2015-03-31 14:03:37 -07:00
Philip Rosedale
0c9e6ad3c0 Merge pull request #4543 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-31 08:13:54 -07:00
Philip Rosedale
9ab87fdcba Merge pull request #4537 from sethalves/vhacd-knobs 
Vhacd improvements, quads in collision hulls, fix dice
 2015-03-31 07:32:59 -07:00
Seth Alves
c8e623ace7 remove some debugging prints, added some comments 2015-03-31 07:18:20 -07:00
Seth Alves
52fc75a114 merge upstream 2015-03-31 07:18:04 -07:00
Philip Rosedale
4961cf37b6 Merge pull request #4540 from ZappoMan/scriptCaching 
quiet warning flood when scripts are bad
 2015-03-30 21:48:13 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
ZappoMan
a88b3c02d2 quiet warning flood when scripts are bad 2015-03-30 18:24:34 -07:00
Philip Rosedale
ce05d3104a Merge pull request #4535 from ZappoMan/scriptCaching 
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
 2015-03-30 18:02:52 -07:00
Brad Hefta-Gaub
e1da9331e3 Merge pull request #4533 from jherico/tr2 
Fixing consecutive spaces issue with text renderer
 2015-03-30 17:34:42 -07:00
ZappoMan
0366ce9bf5 removed dead code 2015-03-30 17:33:25 -07:00
ZappoMan
64fdca7d6d fix no root joint warning 2015-03-30 17:32:42 -07:00
Philip Rosedale
5cd031739b Merge pull request #4536 from PhilipRosedale/master 
Fix error with angular speed
 2015-03-30 17:07:22 -07:00
Seth Alves
acf30782b6 include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script 2015-03-30 17:04:47 -07:00
ZappoMan
3475bfb396 fix typos 2015-03-30 17:04:47 -07:00
Philip Rosedale
63c1bdd0a8 Fix error with angular speed 2015-03-30 17:03:09 -07:00
ZappoMan
31072b2b2e only start one download per url even if still pending 2015-03-30 16:48:41 -07:00
ZappoMan
e2d8d82096 more script caching cleanup 2015-03-30 16:34:04 -07:00
Philip Rosedale
f116ac131d Merge pull request #4532 from AndrewMeadows/inertia 
fix crash in PhysicsEngine on shutdown
 2015-03-30 16:31:34 -07:00
Bradley Austin Davis
87c4f8433c Fixing consecutive spaces issue with text renderer 2015-03-30 16:21:57 -07:00
ZappoMan
74d50a9250 more work on improving script caching 2015-03-30 16:21:47 -07:00
Philip Rosedale
f047255f68 Merge pull request #4531 from sethalves/fix-physics-crash 
fix a couple of crashes
 2015-03-30 16:17:20 -07:00
Andrew Meadows
c6b34df06c unlock after character is properly updated 2015-03-30 16:07:56 -07:00
Seth Alves
4aa6748e11 Merge branch 'fix-physics-crash' of github.com:sethalves/hifi into vhacd-knobs 2015-03-30 16:02:27 -07:00
Seth Alves
98c08acc97 Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs 2015-03-30 16:00:00 -07:00
Seth Alves
ee7247a5b4 fix a couple of crashes 2015-03-30 15:56:01 -07:00
Andrew Meadows
9b13f186e3 remove character from PhysicsEngine on shutdown 2015-03-30 15:51:58 -07:00
Stephen Birarda
9f0e146782 Merge pull request #4530 from birarda/master 
fix for marketplace URL on right click
 2015-03-30 15:15:01 -07:00
Stephen Birarda
75da852b39 fix for marketplace url on right click 2015-03-30 15:10:16 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Seth Alves
071b6a21de Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs 2015-03-30 13:44:39 -07:00
Stojce Slavkovski
72f1f5ba62 stop makeHouses.js gracefully 
remove exit cleanup
 2015-03-30 22:08:26 +02:00
Stojce Slavkovski
eb46a4b647 Merge branch 'master' of https://github.com/highfidelity/hifi into 20397 2015-03-30 21:23:23 +02:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions 
Multi hull collisions
 2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f Merge pull request #4527 from sethalves/valgrind 
Valgrind told me to do it
 2015-03-30 11:56:17 -07:00
Seth Alves
e730109c51 quiet debuging spew 2015-03-30 11:46:48 -07:00
Seth Alves
f90211e830 Merge pull request #1 from AndrewMeadows/cyclohexane 
optimizations when creating convex hull shapes
 2015-03-30 11:38:49 -07:00
Philip Rosedale
2951d17bf3 Merge pull request #4529 from AndrewMeadows/inertia 
fix crash for bad avatar body on login
 2015-03-30 11:30:39 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
Seth Alves
8a5192c1d9 attempt to handle registration point in hull collisions 2015-03-30 11:22:31 -07:00
Andrew Meadows
da9ceac9ae fix crash for bad avatar body on login 2015-03-30 11:06:02 -07:00
Philip Rosedale
685de8cc7f Merge pull request #4522 from huffman/rename-attribution 
Rename attribution to marketplaceID
 2015-03-30 10:57:28 -07:00
Andrew Meadows
adf076a630 optimizations when creating convex hull shapes 2015-03-30 09:56:30 -07:00
Seth Alves
7137b41375 free these so it's easier to see other leaks in valgrind 2015-03-30 09:30:37 -07:00
Seth Alves
7de15cda87 quiet compiler 2015-03-30 09:30:13 -07:00