Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-05 16:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38274 commits 25 branches 28 tags 1.2 GiB
Commit graph

38274 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
36d725b67a Update content downloader to always d/l if no content present 2016-01-20 15:51:08 -08:00
Ryan Huffman
5784b81290 Merge pull request #74 from birarda/console-migrate-sm 
add option to migrate Stack Manager content
 2016-01-20 15:43:16 -08:00
Stephen Birarda
2d3e036102 Merge pull request #73 from huffman/console-log-rot 
Add deletion of old log files
 2016-01-20 15:38:08 -08:00
Ryan Huffman
b7e939bbdd Adjust console logs for deleting old files 2016-01-20 15:35:31 -08:00
Ryan Huffman
c31ceeca86 Add deletion of old log files 2016-01-20 15:35:30 -08:00
Stephen Birarda
fc3cee776f split directory debug into two lines 2016-01-20 15:35:29 -08:00
Stephen Birarda
f872dfac04 remove some unused variables 2016-01-20 15:31:23 -08:00
Stephen Birarda
d08a64a4d6 use a big try-catch for migration block 2016-01-20 15:25:58 -08:00
James B. Pollack
6f1ea9a3d3 cleanup 2016-01-20 15:20:59 -08:00
ericrius1
eb5a950f85 texture opacity potential fix 2016-01-20 15:08:39 -08:00
Stephen Birarda
6ec55dc746 only wait for state change for migration once 2016-01-20 15:06:46 -08:00
Stephen Birarda
430d1351db preserve timestamps for assets copy 2016-01-20 14:58:15 -08:00
Stephen Birarda
278ab0fa8f don't make the dialogs synchronous 2016-01-20 14:54:52 -08:00
Zach Pomerantz
0c798c06a9 Merge branch 'master' of github.com:highfidelity/hifi into flag/shadows 2016-01-20 14:51:42 -08:00
Stephen Birarda
54c13efe6a add migration for stack manager content 2016-01-20 14:40:12 -08:00
samcake
0da4df93b8 Merge pull request #6860 from zzmp/refactor/cull-functor 
Refactor ShouldRenderFunctor to be out of RenderArgs
Tested on windows, checking the values returned by the culling/visible/too small
Looks good
 2016-01-20 14:25:42 -08:00
James B. Pollack
53b4a509f7 remove particle search beams and create / destroy systems on demand 2016-01-20 14:17:32 -08:00
ericrius1
055d56b9e5 lightning texture appearing> 2016-01-20 14:16:38 -08:00
Atlante45
fb60a048a5 Default dynamic jitter buffer to true on AM 2016-01-20 14:04:14 -08:00
James B. Pollack
a57ccdd0e8 messages 2016-01-20 13:37:58 -08:00
Zach Pomerantz
0a34ee9138 Externalize list sizing for render::cullItems 2016-01-20 12:39:27 -08:00
Stephen Birarda
289156f473 don't re-write exec name other than OS X 2016-01-20 12:27:17 -08:00
Stephen Birarda
5f21b1f35c cpack properties file must be setup after variables 2016-01-20 12:10:37 -08:00
Stephen Birarda
922f868abc use backticks for CMAKE_INSTALL_PREFIX` 2016-01-20 12:07:23 -08:00
Stephen Birarda
38f7591317 use backticks for target names 2016-01-20 12:07:00 -08:00
Ryan Huffman
92d2479b31 Correctly stop content set download when downloader window is closed 2016-01-20 12:02:45 -08:00
Ryan Huffman
0e31c79535 Update content set to lounge 2016-01-20 11:58:31 -08:00
ericrius1
44fd7e8c15 Model and lightning showing up 2016-01-20 11:57:33 -08:00
samcake
07c630bcda And cleaning again hopping to have the pr build 2016-01-20 11:44:01 -08:00
Stephen Birarda
1921aae08f add a simple INSTALL guide 2016-01-20 11:41:55 -08:00
Stephen Birarda
3e5448612a more tweaks to server console readme 2016-01-20 11:27:29 -08:00
Stephen Birarda
ff54d0e592 change target name in server-console README 2016-01-20 11:26:10 -08:00
Brad Davis
d2900200a1 More cleanup & menu fixing 2016-01-20 11:23:56 -08:00
samcake
35ea04ae7c fixing the bug that kept AO when ao is off... 2016-01-20 11:13:50 -08:00
Ryan Huffman
87491e371d Remove log filter temporarily 2016-01-20 11:10:03 -08:00
Ryan Huffman
17d6cb6a96 Merge pull request #71 from birarda/console-hf-folder 
use a folder icon for dmg on OS X
 2016-01-20 10:58:50 -08:00
Stephen Birarda
c8c379373a make the rsrc icon a binary 2016-01-20 10:48:48 -08:00
Stephen Birarda
391313532a remove hash from PR org name 2016-01-20 10:46:54 -08:00
Stephen Birarda
57639672cf repairs to path finding and naming on OS X 2016-01-20 10:46:54 -08:00
Stephen Birarda
d1421137e5 add a folder with icon for DMG installer 2016-01-20 10:46:54 -08:00
ericrius1
e3608534cd Merge branch 'master' into droplets 2016-01-20 10:45:47 -08:00
James B. Pollack
b91e5c27e1 Update createPistol.js 2016-01-20 10:45:40 -08:00
ericrius1
fa9a066f9a model tweaks 2016-01-20 10:44:25 -08:00
James B. Pollack
8d3468265f make pistol collision sound quieter, other adjustments 2016-01-20 10:44:02 -08:00
Andrew Meadows
19d24293e1 Merge pull request #6855 from sethalves/clean-up-entities-with-bad-parent 
don't persist entites with invalid parentIDs
 2016-01-20 10:38:26 -08:00
samcake
320c799379 Merge branch 'master' of https://github.com/highfidelity/hifi into hdr 2016-01-20 10:14:02 -08:00
Stephen Birarda
cfe14aeb06 Revert "use quoted path on windows for spaced paths" 
This reverts commit 687836ff96.
 2016-01-20 09:48:36 -08:00
Stephen Birarda
0bf5526d97 fix default persist path from DS for new location 2016-01-20 09:48:00 -08:00
Stephen Birarda
c251267c02 look for correct name on OS X 2016-01-20 09:33:01 -08:00
Stephen Birarda
fdeb00d4c2 change default for models path to new directory 2016-01-20 09:28:47 -08:00