Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 15:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
38448 commits 74 branches 59 tags 1.2 GiB
Commit graph

38448 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Birarda
e69424e155 add parentheses to old style signal 2016-01-20 09:27:47 -08:00
Ryan Huffman
2ead8c6f28 Update mkdir call to use mkdirp 2016-01-20 09:26:54 -08:00
samcake
379c882834 Debugging the darkness and pointing out bugs 2016-01-20 02:03:09 -08:00
Brad Hefta-Gaub
4ea5c11b73 Merge pull request #6862 from ctrlaltdavid/20783 
Make running scripts list scrollable with scroll bar
 2016-01-19 23:29:37 -08:00
Brad Hefta-Gaub
11c30302b2 Merge pull request #6868 from jherico/update_dialog 
Prevent update dialog from becoming locked
 2016-01-19 23:08:40 -08:00
Brad Davis
d97f930dc9 Prevent update dialog from becoming locked 2016-01-19 22:33:00 -08:00
Stephen Birarda
e3df02e589 fix parenting of single shot timer 2016-01-19 20:51:33 -08:00
Stephen Birarda
60bf617ea1 allow STUN to succeed started late or immediately 2016-01-19 20:41:39 -08:00
Andrew Meadows
a92c512c17 move collision group/mask calculus into EntityItem 2016-01-19 19:52:08 -08:00
Howard Stearns
730640068c Merge pull request #6865 from ZappoMan/fixPrematureQuery 
fix premature octree query before preferences are loaded
 2016-01-19 19:32:34 -08:00
Anthony Thibault
42ac96607a Merge pull request #6864 from sethalves/js-list-entity-joint-names 
expose getJointNames for entities to js
 2016-01-19 18:59:47 -08:00
samcake
c5c51f2af2 Make sure the resolution level for ao is correct 2016-01-19 18:57:03 -08:00
Stephen Birarda
687836ff96 use quoted path on windows for spaced paths 2016-01-19 18:56:04 -08:00
Stephen Birarda
8ae07e49d7 fix build info path on OS X 2016-01-19 18:40:30 -08:00
Zach Pomerantz
3445b7fd2c Fix orientation aligned with Y 2016-01-19 18:39:34 -08:00
ericrius1
a16b267b24 Merge branch 'master' into droplets 2016-01-19 18:27:40 -08:00
ericrius1
4e052dca61 color cloud adjustment 2016-01-19 18:26:32 -08:00
samcake
dc40337dc1 Adjusting default settings 2016-01-19 18:02:47 -08:00
samcake
584d50b594 Experimenting with AO on the lightmaped surface 2016-01-19 17:56:07 -08:00
Stephen Birarda
9054c5f3e9 fix for build-info path on windows 2016-01-19 17:51:32 -08:00
Stephen Birarda
e5d47f3379 fix for accidental filtering of stun packets 2016-01-19 17:26:41 -08:00
ericrius1
d2a815176b lightning strikes 2016-01-19 17:09:39 -08:00
Stephen Birarda
0d80e9dc1f setup ice heartbeat if auto networking enabled 2016-01-19 16:42:57 -08:00
Ryan Huffman
6d396ce9b3 Move to Raleway font for server console 2016-01-19 16:41:02 -08:00
Stephen Birarda
9962eb2315 remove ProximaNova from repository 2016-01-19 16:28:53 -08:00
Stephen Birarda
8bc063e758 Merge branch 'master' of https://github.com/highfidelity/hifi into console 2016-01-19 16:21:19 -08:00