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

38044 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
8695f1bf4d Add local-release-no-debug 2016-01-19 14:41:12 -08:00
Ryan Huffman
0c585ed5b6 Update copy on splash screen 2016-01-19 14:41:12 -08:00
Ryan Huffman
c01907f115 Add zoom factor to splash screen 2016-01-19 14:41:12 -08:00
Ryan Huffman
70371e41bf Fix bad if comparison in splash.html 2016-01-19 14:41:12 -08:00
Ryan Huffman
faba45d1e7 Add missing semicolons 2016-01-19 14:41:12 -08:00
Ryan Huffman
cb5c1b12c5 Fix copy in splash.html 2016-01-19 14:41:12 -08:00
Seth Alves
09dd3e2a56 merge from upstream, respond to code review 2016-01-19 14:38:22 -08:00
Stephen Birarda
3e013833c8 fix redundant app display name in alert 2016-01-19 13:28:30 -08:00
Stephen Birarda
56f6ef434d remove define of UniqueID 2016-01-19 13:16:55 -08:00
Brad Hefta-Gaub
55093aafea Merge pull request #6826 from kevinmthomas-carpool/LoadScriptFromEntityFix 
Fixed entity script loading functionality for the jsstreamplayer.
 2016-01-19 13:14:43 -08:00
Stephen Birarda
a69b2fabd3 don't prompt to attempt process close 2016-01-19 13:13:43 -08:00
Stephen Birarda
27e375e8e6 launch domain-server with option to grab name 2016-01-19 13:12:00 -08:00
Brad Hefta-Gaub
bcdff7ba4a fix premature octree query before preferences are loaded 2016-01-19 13:11:11 -08:00
Stephen Birarda
74b2a44050 merge the master and user configs after a settings change 2016-01-19 13:08:34 -08:00
Stephen Birarda
4cbbd24c7e complete handling of immediate temp name grab 2016-01-19 13:04:05 -08:00
Seth Alves
f265656e74 expose getJointNames for entities to js 2016-01-19 12:55:17 -08:00
Andrew Meadows
feb2a82d93 Merge pull request #6856 from hyperlogic/tony/hand-grab-one-frame-lag-fix 
Avatar: Fix for one frame lag in hold action
 2016-01-19 11:43:27 -08:00
Andrew Meadows
4a91ed3d66 fix bad conflict resolution 2016-01-19 11:42:29 -08:00
Andrew Meadows
d990482c0a use collidesWith for bow.js workaround 2016-01-19 11:42:29 -08:00
Andrew Meadows
db77f22a61 use "collidesWith" instead of "collisionMask" 
but make "collisionMask" work for those who want it
 2016-01-19 11:41:22 -08:00
Seth Alves
a2bec2a5bf Merge pull request #6857 from ctrlaltdavid/20779 
Fix crash in Running Scripts when edit filter after highlighting script
 2016-01-19 11:40:47 -08:00
Stephen Birarda
858adf383e update comment for config migration 2016-01-19 11:38:31 -08:00
Stephen Birarda
483e0f419b use mkpath to create new data directory 2016-01-19 11:37:49 -08:00
Seth Alves
8ba800fda8 Merge pull request #6851 from AndrewMeadows/collisionless2 
namechange "ignoreForCollisions" to "collisionless"
 2016-01-19 11:33:55 -08:00
Stephen Birarda
74806d9d2b migrate old DS config file to new path 2016-01-19 11:28:29 -08:00
Zach Pomerantz
568ae2e7bc Move ShoudRenderFunctor to render::CullFunctor 2016-01-19 11:24:11 -08:00
Anthony J. Thibault
b750128c94 Avatar: centeralized palm rotation/position to world space calculation. 2016-01-19 11:03:00 -08:00
Ryan Huffman
de36f3eeb2 Update ServerPathUtils::getDataDirectory to use custom path lookup 2016-01-19 10:54:38 -08:00
James B. Pollack
347293a6a4 Merge pull request #6858 from ctrlaltdavid/20780 
Make filter in Running Scripts window be case-insensitive
 2016-01-19 10:51:42 -08:00
Stephen Birarda
a27d35566d stub of temporary name download on DS start 2016-01-19 10:49:18 -08:00
Brad Hefta-Gaub
e15c7f089e Merge pull request #6850 from sethalves/various-fixes 
Various fixes
 2016-01-19 10:15:46 -08:00
Stephen Birarda
e8525e4886 cleanup messages, clear errors before copy 2016-01-19 09:58:07 -08:00
Stephen Birarda
be6606cefd fix for error check during PR copy 2016-01-19 09:49:13 -08:00
Stephen Birarda
7b1fc8d65c repair call to strcpy for dir variable 2016-01-19 09:45:26 -08:00
Stephen Birarda
04a5dbed7d set shell context to user prior to app data copy 2016-01-19 09:42:00 -08:00
Brad Hefta-Gaub
15899558aa Merge pull request #6842 from AlessandroSigna/vrShop 
Vr shop
 2016-01-19 09:39:28 -08:00
Stephen Birarda
42a6f9daa1 hard code the matching app data path 2016-01-19 09:33:06 -08:00
Andrew Meadows
48374ef5bc more ignoreForCollisions to collisionless 2016-01-19 09:06:17 -08:00
Andrew Meadows
7fb145e819 namechange ignoreForCollisions --> collisionless 2016-01-19 09:06:17 -08:00
Brad Hefta-Gaub
fca5b29e6f Merge pull request #6786 from AlessandroSigna/overlays 
Thread-safe access to EntityTree in OverlayPanel
 2016-01-19 09:02:45 -08:00
Stephen Birarda
6ee0258251 add an error message for app data create 2016-01-19 08:57:33 -08:00
David Rowe
9393735478 Make running scripts list scrollable with scroll bar 2016-01-19 20:25:16 +13:00
Stephen Birarda
d7c5036a42 fix release type check for prod copy 2016-01-18 18:26:15 -08:00
Stephen Birarda
1deaebd544 check the copy box by default 2016-01-18 18:25:02 -08:00
Stephen Birarda
2094a75294 use correct var from packaging properties for copy 2016-01-18 18:18:06 -08:00
Stephen Birarda
5e6910edbb complete copy of production settings to PR 2016-01-18 18:14:48 -08:00
Stephen Birarda
fb5d26b282 add PR_BUILD to shared CPack properties 2016-01-18 18:02:27 -08:00
Stephen Birarda
7c3d8be80f change wording to pr post install option 2016-01-18 17:59:14 -08:00
Stephen Birarda
21a0d7cd4b add checkbox to post install options for PR copy 2016-01-18 17:58:27 -08:00
Anthony J. Thibault
ec2f8db83a Avatar: Fix for one frame lag in hold action 
AvatarActionHold now uses the most recent un-cached palm positions/orientations
instead of the cached version from the previous frame.
 2016-01-18 17:37:28 -08:00