Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 21:02:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
20663 commits 71 branches 56 tags 1.2 GiB
Commit graph

20663 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Brad Hefta-Gaub
c80414dd96 Merge pull request #4081 from AndrewMeadows/inertia 
move static const variables in EntityItem to be simple consts
 2015-01-10 20:00:58 -08:00
Andrew Meadows
e711b86519 scale DEFAULT_DIMENSIONS correctly 
also remove a block of commented out cruft
 2015-01-10 19:07:58 -08:00
Andrew Meadows
1184f5b668 merge upstream/master into andrew/inertia 2015-01-10 12:45:14 -08:00
Andrew Meadows
25e64d619c move statics out of EntityItem 
This makes for much more readable core dumps
 2015-01-10 11:46:42 -08:00
Philip Rosedale
33bb241f8a Merge pull request #4080 from AndrewMeadows/bispinor 
fixes for EntityServer crashes
 2015-01-10 10:40:41 -08:00
Andrew Meadows
ecd352fd4d merge upstream/master into andrew/bispinor 2015-01-10 07:47:52 -08:00
Andrew Meadows
99e1fdd46e fix for EntityServer crash 
adding EntityItem::_element backpointer for easier add/remove logic
 2015-01-10 07:44:26 -08:00
Thijs Wenker
1d6066c837 replaced GetVersionEx with new Version helpers to resolve deprecation warnings. 2015-01-10 01:41:07 +01:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
Andrew Meadows
58b965c9a2 lock Octree higher when extracting things from bag 2015-01-09 16:12:43 -08:00
Ryan Huffman
e00b629133 Fix gl projection matrix stack overflow when rendering to HUD 
The projection matrix stack is considerably smaller than the modelview
stack and was overflowing on Windows and Linux machines that were tested.
 2015-01-09 16:11:17 -08:00
Brad Hefta-Gaub
f18594cfdb Merge pull request #4076 from Atlante45/master 
Don't call delete later unless you have to
 2015-01-09 15:43:45 -08:00
Atlante45
6d67b8e20c Don't call delete later unless you have to 2015-01-09 15:32:08 -08:00
Philip Rosedale
225563ba00 Merge pull request #4075 from Atlante45/head_rotation_fix 
Head rotation fix
 2015-01-09 15:11:21 -08:00
ZappoMan
17e48554d8 implement support for proper cleanup in BatchItemDetails 2015-01-09 15:06:11 -08:00
Atlante45
063e95bd79 Clement doesn't know how to use radians 2015-01-09 14:31:34 -08:00
chris
981f8bb224 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-09 11:41:47 -08:00
Atlante45
02b9aaacf8 Bump packet version 2015-01-09 11:16:58 -08:00
Atlante45
f2b7cb005a Removed leans/Changed Head rotation in avatardata packets 2015-01-09 11:16:49 -08:00
Atlante45
16e1fc8c3a Added isMyAvatar to AvatarData too 2015-01-09 11:16:05 -08:00
Atlante45
05d2887c94 Move Torso twist to HeadData with Lean 2015-01-09 11:15:01 -08:00
Ryan Huffman
8d8352946b Add rescale button to edit properties window 2015-01-09 10:01:58 -08:00
Andrew Meadows
4946ec18b6 remove some TODO comments 2015-01-09 09:28:01 -08:00
ZappoMan
925b13cc93 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-09 09:19:53 -08:00
Philip Rosedale
336378679f Merge pull request #4068 from ctrlaltdavid/type-definitions 
Fix miscellaneous types and casts
 2015-01-09 08:40:08 -08:00
Philip Rosedale
285e588266 Merge pull request #4072 from Atlante45/network_replies_cleanup 
Windows crash fix
 2015-01-09 07:42:36 -08:00
Atlante45
441a1e4fee Turns out windows doesn't like constexpr 2015-01-08 18:35:23 -08:00