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

20840 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
1566157250 Use the DeferredBuffer.slh in point and spot lights 2015-01-12 15:52:31 -08:00
Thijs Wenker
336a96bd48 Merge branch 'master' of https://github.com/worklist/hifi into 20255 2015-01-13 00:44:39 +01:00
Atlante45
8415098fc2 Set different caches size depending on cache type 2015-01-12 15:36:36 -08:00
Sam Gateau
67da1148ac global ambient light back 2015-01-12 15:22:47 -08:00
Atlante45
59c9e0bb50 Wire CachesSizeDialog in Menu 2015-01-12 15:19:36 -08:00
Stephen Birarda
208af5cbca Revert "don't play muzak from lobby to avoid error" 
This reverts commit 69f5c769b8.
 2015-01-12 15:14:49 -08:00
Sam Gateau
c45f618852 Factorising the shader code to unpack data from the deferred buffer 2015-01-12 15:00:35 -08:00
Atlante45
7bf57b3cca Removed unecessary method/cleanup header 2015-01-12 14:53:31 -08:00
Chris Collins
8f3aba3585 Removing double entry of gun.js 
Removing double entry of gun.js
 2015-01-12 14:39:13 -08:00
Andrew Meadows
7a2ecd27fd fix typo 2015-01-12 14:32:32 -08:00
ZappoMan
7b65c75414 first cut at restoreFromMostRecentBackup 2015-01-12 14:32:13 -08:00
Andrew Meadows
2274a119be Merge pull request #4083 from ctrlaltdavid/sdl2-instructions 
Add instructions for building with SDL2
 2015-01-12 14:24:45 -08:00
Andrew Meadows
22d500bd54 Merge pull request #4074 from huffman/rescale-properties 
Add rescale button to edit properties window
 2015-01-12 14:22:45 -08:00
Andrew Meadows
9f1a612865 Merge pull request #4073 from Atlante45/editModels 
editModels => hydraGrab
 2015-01-12 14:21:02 -08:00
Atlante45
e62fbe2557 Cleanup some headers 2015-01-12 14:09:26 -08:00
Atlante45
fd2b0edf7a Alphabetical order 2015-01-12 14:01:56 -08:00
Atlante45
894c4c9d59 All dialogs in Menu are QPointers 2015-01-12 14:00:23 -08:00
Atlante45
19f321c171 Fixed caches not in DM 2015-01-12 13:56:41 -08:00
Atlante45
38dc1643ef New Caches size dialog 2015-01-12 12:46:11 -08:00
Atlante45
5be5dc716f Make sure every widget has diolog has a parent 2015-01-12 12:45:50 -08:00
Atlante45
e70e435dcc Added Min/Max values for cache size 2015-01-12 12:45:13 -08:00
ZappoMan
1562aab6da intitial pass at lock file 2015-01-12 12:35:17 -08:00
Andrew Meadows
081037bc5f merge upstream/master into andrew/inertia 2015-01-12 12:34:50 -08:00
David Rowe
022760be1d Remove menu item for Show Voxel Nodes which is no longer available 
And change Show Entity Nodes shortcut from Ctrl-Shift-2 to Ctrl-Shift-1.
 2015-01-12 11:52:51 -08:00
Andrew Meadows
bece05a994 entity prop defaults move to their own header 2015-01-12 11:49:31 -08:00
Atlante45
81bf1e4f53 Some code maintainance 2015-01-12 11:46:38 -08:00
Atlante45
bad96e0ba4 cache size getter/setter 2015-01-12 11:37:42 -08:00
Atlante45
ea0ffd0125 Introduce reserveUnusedResource 2015-01-12 11:37:00 -08:00
Atlante45
cb3f07e6f5 Remove unusedResourcesMaxCount 2015-01-12 11:18:55 -08:00
Atlante45
08317b51da Use removeUnusedResources 2015-01-12 11:12:50 -08:00
Atlante45
98dd401ea3 Remove duplicate definition 2015-01-12 11:12:19 -08:00
David Rowe
17925c7a81 Use more appropriate QNetworkReply error code 
This error code is available now that Interface is built with Qt 5.3.
 2015-01-12 11:06:05 -08:00
Sam Gateau
06b44626f3 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-12 10:09:50 -08:00
Stephen Birarda
037726815b Merge pull request #4087 from birarda/master 
remove muzak in lobby to avoid error
 2015-01-12 10:08:01 -08:00
Stephen Birarda
69f5c769b8 don't play muzak from lobby to avoid error 2015-01-12 10:07:20 -08:00
Stephen Birarda
d30490c760 resolve conflicts on merge with upstream master 2015-01-12 09:25:37 -08:00
Ryan Huffman
bf71aa6163 Remove Visage dependency from cmaklists 2015-01-12 09:15:14 -08:00
Atlante45
5cdc76ad35 Put cache max size/count as class members 2015-01-11 22:48:42 -08:00
Thijs Wenker
e4fd027d15 "load script from URL" button in Running scripts window 2015-01-12 00:49:41 +01:00
Thijs Wenker
8feb51013b running script window treeview fully works 2015-01-12 00:41:38 +01:00
Brad Hefta-Gaub
3ccb81803d Merge pull request #4085 from AndrewMeadows/bispinor 
remove functional code from inside assert
 2015-01-11 15:30:15 -08:00
Andrew Meadows
89a782c55a remove functional code from inside assert 2015-01-11 13:31:37 -08:00
Philip Rosedale
343ee4ea67 Merge pull request #4084 from ZappoMan/master 
Fix Philip's entity delete crash
 2015-01-11 12:46:46 -08:00
ZappoMan
60f55c7f3f remove important code from assert so it still runs in release build 2015-01-11 12:07:16 -08:00
David Rowe
968a34f966 Add instructions for building with SDL2 2015-01-11 11:44:16 -08:00
Sam Gateau
26a316db3a Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-11 11:35:19 -08:00
Sam Gateau
e639c5a549 playing with the ambient lighting 2015-01-11 11:33:21 -08:00
Brad Hefta-Gaub
d1eddad00b Merge pull request #4082 from AndrewMeadows/bispinor 
remove lock at EntityTreeRenderer::loadEntityScript
 2015-01-11 11:11:29 -08:00
Andrew Meadows
5309fb6a43 remove lock at EntityTreeRenderer::loadEntityScript 2015-01-11 10:44:36 -08:00
Thijs Wenker
5a8e00f503 Merge branch 'master' of https://github.com/worklist/hifi into 20255 2015-01-11 18:42:51 +01:00