Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 01:59:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
22987 commits 25 branches 0 tags 1.1 GiB
Commit graph

11265 commits

Author SHA1 Message Date
Seth Alves
898b9f4af3 Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-12 10:24:05 -07:00
Seth Alves
90f6b798b1 don't mess with tools window in this branch 2015-03-12 10:11:37 -07:00
Seth Alves
fb93d08dd8 change how tool window acts on linux 2015-03-12 09:13:29 -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
bcfd4b50be Merge branch 'master' of https://github.com/highfidelity/hifi into package_models 2015-03-12 14:18:37 +01:00
Seth Alves
2a06816f71 added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting 2015-03-11 23:09:15 -07:00
Seth Alves
87ac38c3df Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 18:35:13 -07: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
69bc6c9761 Merge pull request #4426 from ZappoMan/fixAvatarManagerCrash 
some cleanup of dead code related to timers
 2015-03-11 17:14:40 -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
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
Seth Alves
918cfa8b4e Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-11 14:36:25 -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
Atlante45
bfbc8ffb47 File extension is case insensitive 2015-03-11 18:35:15 +01:00
Atlante45
1609823e2b Move helper function to top 2015-03-11 16:32:45 +01:00
Atlante45
a727669a15 Move menu option to tools 2015-03-11 16:30:24 +01:00
Atlante45
9b80c01357 Remove ModelUploader from the menu 2015-03-11 16:21:36 +01:00
Atlante45
95a6df7102 Remove ModelUploader 2015-03-11 16:18:39 +01:00
Atlante45
40c593bd0d Working model packager 2015-03-11 16:17:13 +01:00
Atlante45
a949af3296 Merge branch 'master' of https://github.com/highfidelity/hifi into upload_thumbnail 2015-03-11 14:09:32 +01:00
David Rowe
3d11dde8ad Check that the user configures a skeleton root joint 
Instead of just checking that the model has a "Hips" joint.
 2015-03-10 20:27:31 -07:00
David Rowe
e57d63b20e Merge branch 'master' into 20369 2015-03-10 18:55:27 -07:00
Leonardo Murillo
0509270bc6 Merge pull request #4415 from birarda/master 
fix for SVG issues on Windows
 2015-03-10 19:28:21 -06:00
Stephen Birarda
931a234ba7 fix reset for close button SVG in LoginDialog 2015-03-10 18:08:19 -07:00
Brad Hefta-Gaub
5cced9fc66 Merge pull request #4400 from samcake/temp0 
Introduce gpu::Shader, Pipeline and State
 2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub
04837d5302 Merge pull request #4390 from ctrlaltdavid/20287 
CR for 20287 - Don't show the application menu bar when in full screen
 2015-03-10 16:36:11 -07:00
Seth Alves
48244840d5 merge from upstream 2015-03-10 15:43:40 -07:00
Seth Alves
cf20596d6d Merge pull request #4406 from ZappoMan/svoFromURL 
Support for importing from a network URL
 2015-03-10 15:41:41 -07:00
Stephen Birarda
6afdb26042 let QMainWindow delete GLCanvas, just stop the QTimer instead 2015-03-10 13:19:32 -07:00
ZappoMan
feddea821a cleanup import from file vs url 2015-03-10 12:35:12 -07:00
ZappoMan
5facb39aa7 support for import entities from network URL 2015-03-10 12:21:37 -07:00
Stephen Birarda
a8046b8316 fix a typo in comment, NULL glWidget pointer 2015-03-10 11:47:35 -07:00
Stephen Birarda
292354e180 manually call delete on GLCanvas in Application dtor 2015-03-10 11:33:49 -07:00
David Rowe
abb62fd8f9 Fix typo found in passing 2015-03-10 10:57:48 -07:00
Seth Alves
afd2c87dfe Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json 2015-03-10 10:12:43 -07:00
Sam Gateau
c1a0d767c9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-03-10 09:37:40 -07:00
Sam Gateau
853cf75f60 adding the atmosphere in the directional lighting pass, debug 2015-03-10 09:37:13 -07:00
David Rowe
2df3eed31e Merge branch 'master' into 20287 
Conflicts:
	interface/src/Application.h
 2015-03-10 09:31:15 -07:00
ZappoMan
89f3a091f1 remove debugging 2015-03-10 09:02:35 -07:00
Andrew Meadows
a758ccd75a Merge pull request #4402 from birarda/master 
add underlying controls for user discoverability
 2015-03-10 08:30:46 -07:00
Atlante45
8bb974f01b Move ModelPropertiesDialog to own file 2015-03-10 14:50:38 +01:00