Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
38112 commits 2 branches 0 tags 1.1 GiB
Commit graph

38112 commits

This branch
This branch
All branches
Author SHA1 Message Date
Seth Alves
edea0320e6 try again to make this thread safe 2016-01-19 15:44:22 -08:00
Ryan Huffman
37cfac404e Move octree server data directory to /web 2016-01-19 15:23:14 -08:00
Seth Alves
a515d6debe call into correct thread to getJointNames on entity 2016-01-19 15:16:58 -08:00
Ryan Huffman
58344416fd Remove extra whitespace 2016-01-19 15:16:17 -08:00
Ryan Huffman
84f4b4b935 Remove dead code 2016-01-19 15:15:54 -08:00
Ryan Huffman
637ee8a44a Remove test notification code 2016-01-19 15:06:03 -08:00
Seth Alves
90847dc49c oops 2016-01-19 15:00:33 -08:00
Ryan Huffman
f0c981186d Update notification icon 2016-01-19 14:55:40 -08:00
Ryan Huffman
b2ca92666f Remove empty styles in splash.css 2016-01-19 14:41:57 -08:00
Ryan Huffman
dc1d1dfebd Update update notification to only show once 2016-01-19 14:41:57 -08:00
Ryan Huffman
a62da96785 Remove test code for update checker 2016-01-19 14:41:57 -08:00
Ryan Huffman
4afb6992c3 Move entities resources into /entities 2016-01-19 14:41:57 -08:00
Ryan Huffman
c417bc0fb3 Move asset resource directory out of /resources 2016-01-19 14:41:57 -08:00
Ryan Huffman
1b856ee79d Update splash screen migration URL 2016-01-19 14:41:57 -08:00
Ryan Huffman
c44022d329 Move update checker to not start until after d/l content set 2016-01-19 14:41:57 -08:00
Ryan Huffman
82456d64cf Update console dependencies 2016-01-19 14:41:57 -08:00
Ryan Huffman
845325ba73 Add hifi updater checker 2016-01-19 14:41:57 -08:00
Ryan Huffman
8ea586fbe3 Adjust formatting and text on splash 2016-01-19 14:41:57 -08:00
Ryan Huffman
08b87c37cc Add download size to downloader 2016-01-19 14:41:57 -08:00
Ryan Huffman
21db2862c7 Fix build info reading for console 2016-01-19 14:41:57 -08:00
Ryan Huffman
ff22d98abf Adjust "Go Home" path for default content set 2016-01-19 14:41:57 -08:00
Ryan Huffman
e2e742b12e Add build type to data directory path 2016-01-19 14:41:57 -08:00
Ryan Huffman
2ec6dc9ca5 Fix log directory path on OSX 2016-01-19 14:41:57 -08:00
Ryan Huffman
ee1abdf3a1 Update paths used in console to match server 2016-01-19 14:41:12 -08:00
Ryan Huffman
c2acae5b45 Update comment in log.js 2016-01-19 14:41:12 -08:00
Ryan Huffman
14a1f2825a Clean up log.js 2016-01-19 14:41:12 -08:00
Ryan Huffman
d587ee0fe3 Update process log paths to be absolute 2016-01-19 14:41:12 -08:00
Ryan Huffman
08a845d3af Fixup console menus to only show in debug 2016-01-19 14:41:12 -08:00
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
samcake
c5c3f464cd Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-19 12:13:11 -08:00
samcake
6f93fb3114 Can now process the AO at lower resolution in orer to gsave performances 2016-01-19 12:12:51 -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