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

20518 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Andrew Meadows
58b965c9a2 lock Octree higher when extracting things from bag 2015-01-09 16:12:43 -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
Atlante45
063e95bd79 Clement doesn't know how to use radians 2015-01-09 14:31:34 -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
Andrew Meadows
4946ec18b6 remove some TODO comments 2015-01-09 09:28:01 -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
Atlante45
891d8d5abf Removed unecessary foreach 2015-01-08 18:22:25 -08:00
David Rowe
a5b3ae397a Code review 2015-01-08 18:20:23 -08:00
Atlante45
ea832cfd45 Added constant 2015-01-08 17:33:47 -08:00
Philip Rosedale
22a609f014 Merge pull request #4071 from Atlante45/head_rotation_fix 
Head rotation fix
 2015-01-08 17:24:23 -08:00
Atlante45
77e4a2ef35 Add byte limit to chaches 2015-01-08 17:06:05 -08:00
Atlante45
1c4903c346 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 16:33:01 -08:00
Brad Hefta-Gaub
0a176b3c9e Merge pull request #4066 from AndrewMeadows/inertia 
thread safety for EntitySimulation
 2015-01-08 16:05:07 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
Atlante45
8dbaeeb646 Delete each entityItems 2015-01-08 13:08:43 -08:00
Andrew Meadows
f8c512b690 fix deleteEntity() to actually delete result 2015-01-08 12:42:16 -08:00
Brad Hefta-Gaub
0ac8f79d2e Merge pull request #4067 from ctrlaltdavid/inconsistent-dll-linkage 
Suppress warnings about inconsistent DLL linkage of lrintf in Windows
 2015-01-08 12:06:00 -08:00
Atlante45
e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 11:54:54 -08:00
Atlante45
6fc3e1cf81 change message size 2015-01-08 11:51:14 -08:00
Atlante45
af9525ed33 Bump AvatarData packet number 2015-01-08 11:49:39 -08:00
Atlante45
4157a3ca40 Remove lean from head rotation 2015-01-08 11:33:14 -08:00
David Rowe
198226450a Suppress warnings about inconsistent DLL linkage of lrintf in Windows 
This warning in Windows builds is due to redefinition of lrintf in gverb
library's ladspa-util.h file.
 2015-01-08 11:26:32 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
Atlante45
b8a3bdb6bd Cleanup headers 2015-01-08 11:25:35 -08:00
Andrew Meadows
b0b2eb5d38 use exact equality for filtering dimension changes 2015-01-08 11:09:32 -08:00
Andrew Meadows
1d371a9627 merge upstream/master into andrew/inertia 2015-01-08 10:24:05 -08:00
Andrew Meadows
c37c1515ba EntitySimulation is lockable 
also DeleteEntityOperator just removes the entities
and EntityTree does the actual delete
(after properly locking its _simulation)
 2015-01-08 10:22:25 -08:00