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
23462 commits 2 branches 0 tags 1.1 GiB
Commit graph

23462 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Meadows
d497620976 avatar can jump with E key when walking 2015-03-24 23:05:46 -07:00
Andrew Meadows
b87360f0f5 merge upstream/master into andrew/inertia 2015-03-24 17:41:07 -07:00
Andrew Meadows
44eca08fa4 PhysicsEngine doesn't need AvatarData 
MyAvatar now owns its CharacterController
fix for bug of phantom collision obj when avatar's physics are disabled
 2015-03-24 17:38:35 -07:00
Philip Rosedale
9c24d2d0eb Merge pull request #4496 from stojce/20397 
CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing
 2015-03-24 17:35:44 -07:00
Philip Rosedale
fe61387121 Merge pull request #4498 from ZappoMan/LODUITweaks 
Some LOD UI Tweaks
 2015-03-24 17:34:27 -07:00
ZappoMan
0e44126106 added LOD Warnings to notifications.js 2015-03-24 16:38:13 -07:00
Ryan Huffman
d54526b8bb Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl 2015-03-24 15:43:36 -07:00
Andrew Meadows
3c16c7066c Merge pull request #4495 from birarda/location-update-bug 
send an immediate location update when domain changes
 2015-03-24 15:33:59 -07:00
ZappoMan
b67cf3af24 more tweaks to LOD tools dialog 2015-03-24 14:33:06 -07:00
ZappoMan
f43b8bbe8e make AvatarLODMultiplier based on octreeSizeScale 2015-03-24 13:59:46 -07:00
Atlante45
3563efb584 extra ; 2015-03-24 21:52:53 +01:00
Ryan Huffman
3f986229d1 Rename edit-entities-commands.html to edit-commands.html 2015-03-24 13:43:10 -07:00
Ryan Huffman
6c941d73d5 Update edit.js help 2015-03-24 13:34:14 -07:00
ZappoMan
619428c325 move LOD FPS settings to Preferences 2015-03-24 13:32:22 -07:00
Stephen Birarda
1a6865b41b send immediate location update when domain changes 2015-03-24 13:15:30 -07:00
Stephen Birarda
faa47da57e update version of TBB external project 2015-03-24 11:49:33 -07:00
Ryan Huffman
2fc0ef80d0 Add SVO_JSON_EXTENSION to accepted extensions 2015-03-24 10:40:46 -07:00
Ryan Huffman
a901bc4b11 Update edit.js to export as .svo.json 2015-03-24 10:28:12 -07:00
Ryan Huffman
6d932508ff Add support for .svo.json extension 2015-03-24 10:27:53 -07:00
Philip Rosedale
288bb5be38 Merge pull request #4493 from ZappoMan/avatarClipBugs 
more fixes to avatar parts not rendering
 2015-03-24 09:29:03 -07:00
Philip Rosedale
26fbabc4fd Merge pull request #4492 from ZappoMan/LODUITweaks 
Tweaks to the LOD UI
 2015-03-24 09:28:33 -07:00
ZappoMan
a9e4d25f97 more fixes to avatar parts not rendering 2015-03-24 08:32:27 -07:00
ZappoMan
168e8e8b80 more fixes to avatar parts not rendering 2015-03-24 08:31:45 -07:00
ZappoMan
0c2b95aa1d Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks 2015-03-24 08:24:32 -07:00
Seth Alves
dfd9b9958b Merge pull request #4482 from AndrewMeadows/bispinor 
CharacterController can walk up ledges #2
 2015-03-23 18:25:58 -07:00
ZappoMan
69f261ae94 tweaks to the LOD Tools UI 2015-03-23 16:44:19 -07:00
ZappoMan
fa122a227b tweaks to the LOD Tools UI 2015-03-23 16:44:07 -07:00
Ryan Huffman
61dc31ffe7 Update export entities to export as JSON 2015-03-23 14:09:45 -07:00
Brad Hefta-Gaub
92a639d2ee Merge pull request #4486 from ctrlaltdavid/sixense-build-instructions 
Building with Sixense build requires four of the SDK libraries
 2015-03-23 11:17:33 -07:00
Brad Hefta-Gaub
25bfc29081 Merge pull request #4489 from Atlante45/light_types 
Light types
 2015-03-23 11:16:48 -07:00
samcake
f54d5612a6 Merge pull request #4490 from ZappoMan/avatarClipBugs 
Bug Fix - hack to get avatar parts rendering, fix to crash in updateJointState
 2015-03-23 11:15:37 -07:00
ZappoMan
9fb53e3d72 CR feedback 2015-03-23 11:13:42 -07:00
ZappoMan
3e8508f149 CR feedback 2015-03-23 11:13:35 -07:00
ZappoMan
b705d76336 total hack to ignore frustum culling in case of avatar mesh parts with no transform 2015-03-23 10:43:21 -07:00
Atlante45
c26f17e16b Update from light properties 2015-03-23 18:36:40 +01:00
ZappoMan
fe8ad9517f added debugging for model mesh boxes 2015-03-23 10:08:08 -07:00
Atlante45
ea0f3f05e7 Tune sound down 2015-03-23 17:55:23 +01:00
Atlante45
fdfdba5d2d Couple tweaks 2015-03-23 17:46:57 +01:00
Atlante45
963be820d0 Remove comments 2015-03-23 17:28:11 +01:00
Atlante45
40ed0146e2 Better handling of erased lights 2015-03-23 17:26:43 +01:00
Atlante45
30ea2eb722 Nicer way to update light Properties 2015-03-23 17:20:21 +01:00
Atlante45
efd177d80d Fix property save 2015-03-23 17:06:34 +01:00
David Rowe
3de7222007 Make Sixense emulate mouse only if controllers aren't at the base 2015-03-23 09:06:15 -07:00
Atlante45
66f954142a Fix light multiple creations 2015-03-23 17:06:12 +01:00
Atlante45
5fadcbe7d9 Prints cleanup 2015-03-23 17:05:46 +01:00
Atlante45
6b4845abf3 Some improvements to lightController 2015-03-23 16:47:24 +01:00
ZappoMan
19c8e526e1 add guards to _jointStates array size 2015-03-23 08:47:06 -07:00
Atlante45
34248ea8fd Merge branch 'master' of https://github.com/highfidelity/hifi into light_types 2015-03-23 13:04:34 +01:00
David Rowe
7dbe92f56f Building with Sixense build requires four of the SDK libraries 2015-03-21 14:22:09 -07:00
Andrew Meadows
49f5de2b94 make character's "up" axis depend on orientation 2015-03-20 16:39:38 -07:00