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

30645 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Davis
0aaa07a2de Remove items from the QML version of the menu when they are removed from the main menu 2015-08-25 19:05:29 -07:00
Seiji Emery
d29a368688 removed debug 2015-08-25 16:50:09 -07:00
Seth Alves
405c9828b8 cargo-cult a voxel-editor tool-bar from edit.js 2015-08-25 16:41:38 -07:00
Seth Alves
d2cfca0424 fix comment typo 2015-08-25 16:41:10 -07:00
Seth Alves
da6a1c958b clean up debugging prints 2015-08-25 16:40:58 -07:00
Seiji Emery
140edd0589 try removing quotes... 2015-08-25 16:21:38 -07:00
David Rowe
9d3d104ec3 Add Desktop object to JavaScript with width and height properties 2015-08-25 16:13:36 -07:00
Seiji Emery
248d0729a6 test 2015-08-25 15:29:36 -07:00
Seiji Emery
62dc83fa32 test 2015-08-25 15:00:21 -07:00
Seiji Emery
3d59f8d7e8 changed setup_project to only use the generated shader source files 2015-08-25 14:40:52 -07:00
Stephen Birarda
c776f04ab2 don't allow in a user who should have edit but not verified 2015-08-25 14:36:22 -07:00
David Rowe
1f541832b6 Reword dialog 2015-08-25 14:24:15 -07:00
Seiji Emery
316ddd68ef force cmake autoscribe to use full paths 2015-08-25 13:46:50 -07:00
Seth Alves
0708fabddf Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-25 13:13:55 -07:00
Seth Alves
3c35d90908 don't recompute meshes if nothing changed 2015-08-25 13:13:01 -07:00
Stephen Birarda
6f14eb2206 fix for 0 entity avg ping 2015-08-25 12:35:34 -07:00
Clément Brisset
08ee5cbc17 Merge pull request #5656 from howard-stearns/fix-direct-url-avatars 
fix direct-url avatars
 2015-08-25 21:30:05 +02:00
Anthony J. Thibault
496c706bba Added AnimVariantMap argument to evaluate. 2015-08-25 11:59:24 -07:00
Seth Alves
f6c440756c do slow polyvox operations on a thread 2015-08-25 11:46:51 -07:00
Seth Alves
caafea6e3b allow compound collision shapes with less than 2 sub-shapes 2015-08-25 11:46:34 -07:00
Anthony J. Thibault
62f86e6a46 Added AnimVariant, renamed AnimClipTests to AnimTests. 
* Added test for AnimVariant.
 2015-08-25 11:33:57 -07:00
Howard Stearns
6508d5943a textChanged has to do something 2015-08-25 11:29:27 -07:00
David Rowe
7c8ff4dcbd If Interface.ini doesn't contain crash option value assume default 2015-08-25 11:07:55 -07:00
David Rowe
a98a867b06 Delete Interface.ini.lock before accessing to check crash option 2015-08-25 11:07:20 -07:00
Stephen Birarda
9940f375ea repairs for CR comments 2015-08-25 10:02:43 -07:00
Anthony J. Thibault
4bdb00bbc5 Added setCurrentFrame interface to AnimClip. 
This will recurse the tree and call setCurrentFrameInternal on each node.
This method can be overriden, currently the only meaningful implementation is AnimClip.
 2015-08-25 09:58:36 -07:00
Howard Stearns
2ed6900c7e Clear the brush, clear the cobwebs, and set the other orientations now that we're clear on what coordinate system we're in. 2015-08-25 09:55:04 -07:00
Seth Alves
7cb9968864 more work on polyvox threading 2015-08-25 05:53:36 -07:00
Philip Rosedale
ff3a0480fe Merge pull request #5652 from birarda/master 
tweaks to domain-server web interface
 2015-08-24 21:36:52 -07:00
Seth Alves
91254245e4 Merge branch 'master' of github.com:highfidelity/hifi into polyvox 2015-08-24 20:21:24 -07:00
Anthony J. Thibault
7a2ca047cb Added network resource download support to AnimNodeLoader. 2015-08-24 19:00:12 -07:00
Brad Davis
f9f5743fd7 Merge pull request #5650 from ZappoMan/fixCrashInController 
Fix a couple crashes in the Controller scripting interface
 2015-08-24 18:49:50 -07:00
Stephen Birarda
17befac262 use fixed width for stats tables 2015-08-24 18:10:21 -07:00
Stephen Birarda
b8ac9aa5eb update jquery and bootstrap in DS 2015-08-24 18:02:26 -07:00
Brad Hefta-Gaub
34e32ddaeb Merge pull request #5636 from howard-stearns/marketplace-avatars 
marketplace avatars
 2015-08-24 17:49:20 -07:00
Brad Hefta-Gaub
5ea6d2704a Merge pull request #5628 from ctrlaltdavid/webwindow-external-links 
Make WebWindow hyperlinks with target="_blank" open in user's browser
 2015-08-24 17:45:35 -07:00
Brad Hefta-Gaub
53ae958c74 Merge pull request #5643 from hyperlogic/tony/renderable-particle-crash-fix 
Fix for RenderableParticleEffectEntity crash.
 2015-08-24 17:44:39 -07:00
Anthony J. Thibault
bde75e9e51 AnimDebugDraw rendering works again. 
I had to port AnimDebugDraw shader to GLSL 4.1.
 2015-08-24 17:36:21 -07:00
Brad Hefta-Gaub
c6174ad88a Merge pull request #5647 from jherico/homer 
Removing tabs from our javascript
 2015-08-24 17:33:57 -07:00
Stephen Birarda
c8ba24817f fix for hash specialization for QUuid 2015-08-24 17:09:52 -07:00
Lars Christensen
324f592719 updated FontAwesome to v4.4 2015-08-25 01:55:52 +02:00
David Rowe
b27d25b46e Implement crash option that retains only login and avatar information 2015-08-24 16:41:25 -07:00
Lars Christensen
110ba131a6 moved translation efforts into subdir 2015-08-25 01:36:19 +02:00
Anthony J. Thibault
5a73aef1f8 AnimSkeleton more accurate bind pose generation. 2015-08-24 16:19:16 -07:00
Brad Hefta-Gaub
13a9dc4df2 cleanup controller interface, add getActionNames() and getDeviceNames() 2015-08-24 15:35:55 -07:00
Brad Davis
380b0cb23c Removing tabs from our javascript and C++ 2015-08-24 15:26:46 -07:00
Stephen Birarda
d02e5b2450 fix a typo in comment in DomainGatekeeper 2015-08-24 15:10:27 -07:00
Stephen Birarda
a9c04e5116 don't allow verified connection without username 2015-08-24 15:01:39 -07:00
Howard Stearns
476ca36460 final 2015-08-24 15:01:01 -07:00
Stephen Birarda
c6f1567361 add a debug for refused connection in DomainGatekeeper 2015-08-24 14:58:25 -07:00