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

22990 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
ebf70f818a Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 
Conflicts:
	examples/editEntities.js
 2015-03-12 11:39:26 -07:00
Ryan Huffman
4335a41002 Update editEntities to call setActive on init 2015-03-12 11:38:51 -07:00
Ryan Huffman
c13ba4a318 Add toggling of light visibility 2015-03-12 11:38:29 -07:00
Stephen Birarda
6c7e0eda6a Merge pull request #4432 from Atlante45/dm_update 
Dependency::customDeleter uses a lambda
 2015-03-12 11:33:32 -07:00
Stephen Birarda
278813e47f Merge pull request #4434 from highfidelity/revert-4429-master 
Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList...
 2015-03-12 11:28:13 -07:00
Stephen Birarda
9269b2a0b2 Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList" 2015-03-12 11:28:07 -07:00
Stephen Birarda
4da9186045 Merge pull request #4429 from birarda/master 
NOT MERGEABLE: graceful cleanup on Application dtor for NodeList
 2015-03-12 11:26:56 -07:00
Ryan Huffman
ccbbba3def Update light default dimensions 2015-03-12 11:18:42 -07:00
Ryan Huffman
d82598327b Add light overlays 2015-03-12 11:18:32 -07:00
Ryan Huffman
5c9ec6bdcc Add add/delete/rename/clear events to EntitiesScriptingInterface 2015-03-12 11:17:07 -07:00
Atlante45
eb5206f8e6 Naming 2015-03-12 19:05:06 +01:00
Stephen Birarda
3279e19b3d Merge pull request #4430 from Atlante45/update_login_on_launch 
Update Login menu item on creation
 2015-03-12 10:55:07 -07:00
Atlante45
0bd97ce40c Dependency::customDeleter uses a lambda 2015-03-12 18:53:29 +01:00
Brad Hefta-Gaub
8768b53124 Merge pull request #4416 from Atlante45/package_models 
Package models
 2015-03-12 08:57:46 -07:00
Atlante45
52c0ba817a Remove dead code 2015-03-12 16:32:09 +01:00
Atlante45
d858956ad8 Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 16:31:03 +01:00
Brad Hefta-Gaub
f91a19a918 Merge pull request #4424 from huffman/open-svo 
Handle drag-n-dropped .svos and using interface to open .svo files
 2015-03-12 08:15:25 -07:00
Atlante45
decd240f60 Update Login menu item on startup after creation 2015-03-12 14:53:11 +01:00
Atlante45
bcfd4b50be Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 14:18:37 +01:00
Brad Hefta-Gaub
356dbbec72 Merge pull request #4399 from ctrlaltdavid/20369 
Fix for 20369
 2015-03-11 18:09:07 -07:00
Stephen Birarda
d7e99594ae make the application the parent of the node thread 2015-03-11 18:04:32 -07:00
Stephen Birarda
851d020390 remove QThread include required for debug 2015-03-11 17:21:49 -07:00
Stephen Birarda
7a8e94f1e5 remove extra debug information for node thread cleanup 2015-03-11 17:18:49 -07:00
Stephen Birarda
69bc6c9761 Merge pull request #4426 from ZappoMan/fixAvatarManagerCrash 
some cleanup of dead code related to timers
 2015-03-11 17:14:40 -07:00
Stephen Birarda
5d9a3811ca more graceful cleanup for Application NodeList and DatagramProcessor 2015-03-11 17:14:20 -07:00
Stephen Birarda
943670285c Merge pull request #4427 from ZappoMan/crashonexit 
fix crash on exit related to AvatarManager using TextureCach resources
 2015-03-11 17:11:56 -07:00
Stephen Birarda
9f754e40d0 move all silent node timers into LimitedNodeList 2015-03-11 16:59:06 -07:00
Brad Hefta-Gaub
7fdcc64292 Merge pull request #4425 from huffman/look-default 
Make look.js the default look script and remove the old scripts
 2015-03-11 16:51:35 -07:00
Stephen Birarda
429e1c6368 Merge pull request #4428 from birarda/master 
use glm from hifi S3 now that fedora is down
 2015-03-11 16:45:19 -07:00
Stephen Birarda
d3bc540919 use glm from hifi S3 now that fedora is down 2015-03-11 16:42:29 -07:00
ZappoMan
cab6cc8c75 fix crash on exit related to AvatarManager using TextureCach resources 2015-03-11 16:30:21 -07:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Ryan Huffman
1904e5e209 Make look.js the default look script and remove the old scripts 2015-03-11 16:17:44 -07:00
Ryan Huffman
76ebac1185 Add import svo requests in editEntities 2015-03-11 15:44:26 -07:00
Ryan Huffman
0048b91311 Add handling for opening an .svo using interface 2015-03-11 15:42:16 -07:00
Ryan Huffman
c3c2a75f48 Handle .svo drop events and emit svoImportRequested 2015-03-11 15:38:15 -07:00
Ryan Huffman
2f885bb7f2 Move WindowScriptingInterface to DependencyManager 2015-03-11 15:34:29 -07:00
Seth Alves
48aca5c46f Merge pull request #4423 from AndrewMeadows/isentropic 
remove old ragdoll simulation and avatar interactions
 2015-03-11 15:18:15 -07:00
Philip Rosedale
8111179711 Merge pull request #4422 from ctrlaltdavid/20396 
CR for 20396 - Rename Stereo Audio menu item
 2015-03-11 14:56:07 -07:00
Philip Rosedale
cc3a86af94 Merge pull request #4419 from huffman/merge-touch-mouse 
Add look.js
 2015-03-11 14:40:27 -07:00
Andrew Meadows
bd115aa8f8 merge upstream/master into andrew/isentropic 2015-03-11 14:30:22 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
David Rowe
32897de80a Rename Stereo Audio menu item 2015-03-11 12:41:47 -07:00
Clément Brisset
885e6206e9 Merge pull request #4420 from ctrlaltdavid/20394 
CR for Job #20394 - Build friends.js v1
 2015-03-11 11:17:04 -07:00
David Rowe
fd423e5019 Fix units 2015-03-11 11:07:02 -07:00
David Rowe
1a18decc6d Fix typo 2015-03-11 10:49:36 -07:00
Philip Rosedale
aae0ceab48 Merge pull request #4418 from huffman/hide-edit-tools 
Hide edit tools when inactive
 2015-03-11 10:38:21 -07:00
Atlante45
bfbc8ffb47 File extension is case insensitive 2015-03-11 18:35:15 +01:00
David Rowe
bbffa6474b Add users.js to default scripts 2015-03-11 10:32:14 -07:00
David Rowe
532e4feebb Remove dead code and fix typos 2015-03-11 10:30:09 -07:00