Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-28 11:47:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
28083 commits 23 branches 0 tags 1.2 GiB
Commit graph

28083 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
5e65f422fa Move mute environment handling to Application 2015-07-09 15:30:25 -07:00
Sam Gateau
e14f10ed0f Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 15:29:17 -07:00
Bing Shearer
99c563602f Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist. 2015-07-09 15:25:37 -07:00
Brad Hefta-Gaub
f0a1bc15a9 Merge pull request #5286 from samcake/daft 
Migrating the rendering openGL calls from DeferredLightingEffect to gpu::Batch
 2015-07-09 15:23:45 -07:00
Seth Alves
2dc4922da3 bring over code from entity-level-locking branch 2015-07-09 15:23:05 -07:00
Sam Gateau
8c178d03df Merge branch 'master' of https://github.com/highfidelity/hifi into daft 2015-07-09 15:16:52 -07:00
Brad Hefta-Gaub
81c74dda1f Merge pull request #5289 from jherico/marge 
Improve batched font rendering smoothing
 2015-07-09 15:09:07 -07:00
samcake
1f13106f51 FIxed the issue on mac due to the abs function not correctly executing 2015-07-09 15:05:03 -07:00
ZappoMan
a8a4c99529 on script shutdown, wait to process all pending edit messages before ending the script engine 2015-07-09 15:01:16 -07:00
Seth Alves
5312beeaf4 if an action changes its own arguments, cause reserialisation 2015-07-09 14:50:31 -07:00
Brad Davis
06563264e2 Improve batched font rendering smoothing 2015-07-09 14:34:33 -07:00
Seth Alves
a01fb6f1dc if an action changes its own arguments, cause reserialisation 2015-07-09 14:32:34 -07:00
Bing Shearer
85f6fdb8cf Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample) 2015-07-09 14:20:10 -07:00
Bing Shearer
25708678f6 Fixed shutdown procedure for Datagrams so that there is no crash on exit 2015-07-09 14:18:53 -07:00
Seth Alves
85f206d49d if an action is updating its own arguments, cause updates to go out over network 2015-07-09 14:13:01 -07:00
Ryan Huffman
dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets 
Conflicts:
	interface/src/DatagramProcessor.cpp
	interface/src/octree/OctreePacketProcessor.cpp
	libraries/entities/src/EntityEditPacketSender.cpp
	libraries/networking/src/LimitedNodeList.h
	libraries/networking/src/NLPacket.h
 2015-07-09 14:08:35 -07:00
Stephen Birarda
1b4e333c49 Merge pull request #3 from birarda/atp 
initial networking API changes for new protocol
 2015-07-09 16:51:37 -04:00
Seth Alves
050c472d6a Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation 2015-07-09 13:39:37 -07:00
Stephen Birarda
2417981c9d resolve conflicts on merge with clement/protocol 2015-07-09 13:27:59 -07:00
Atlante45
57d4e64926 Missing deref 2015-07-09 13:24:07 -07:00
Stephen Birarda
caed7da99b create the avatarPacket in ScriptEngine with the right size 2015-07-09 13:23:20 -07:00
Atlante45
a9cfcf241d Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 13:22:45 -07:00
Stephen Birarda
893e1864fd cleanup _newestEntryAtIndex calc in RBH insert 2015-07-09 13:22:41 -07:00
Atlante45
c0b8f83ca0 Better ring index compute 2015-07-09 13:22:09 -07:00
Stephen Birarda
16e7b2625b don't sink the audioPacket in ScriptEngine 2015-07-09 13:20:10 -07:00
Stephen Birarda
7ee08130f0 fix for avatar packet size in ScriptEngine 2015-07-09 13:18:11 -07:00
Atlante45
7e4999b717 int64_t to qint64 for consistency 2015-07-09 13:12:48 -07:00
Atlante45
01f1a6e2b9 Fix NLPacket::create 2015-07-09 13:12:21 -07:00
Atlante45
f90f3a05be Fail in Packet::create if size is invalid 2015-07-09 13:11:43 -07:00
Stephen Birarda
6f2e9f4899 cleanup return in SentPacketHistory 2015-07-09 13:06:34 -07:00
Atlante45
e1fc242967 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:45:46 -07:00
Stephen Birarda
14b73ae00f remove qtimespan that isn't used anymore 2015-07-09 12:45:32 -07:00
Atlante45
ba8bc1f4da Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:43:37 -07:00
Stephen Birarda
dd30813ae0 remove an extra line in DomainServer 2015-07-09 12:39:43 -07:00
Stephen Birarda
f68845e806 remove hash and sequence number replacement in PacketHeaders 2015-07-09 12:33:34 -07:00
Atlante45
2b6d79e030 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-09 12:33:23 -07:00
Stephen Birarda
3da1a81363 remove packet header population from PacketHeaders 2015-07-09 12:32:52 -07:00
Atlante45
e4051f9e30 Remove unnecessary .get() 2015-07-09 12:32:18 -07:00
Stephen Birarda
6dc7745826 remove two lines from PacketHeaders 2015-07-09 12:29:21 -07:00
Stephen Birarda
11a4c20a21 fix payloadSize write in DomainServer 2015-07-09 12:23:54 -07:00
Stephen Birarda
bcea400ee4 delete the old methods to get closer to an even PR 2015-07-09 12:23:12 -07:00
Philip Rosedale
c4911dbbd4 Merge pull request #5288 from AndrewMeadows/arsenic 
fix ObjectActionOffset logic
 2015-07-09 12:22:23 -07:00
Brad Hefta-Gaub
489a8b4b3d Merge pull request #5285 from jherico/homer 
Move log file writing to a separate thread
 2015-07-09 12:22:13 -07:00
Stephen Birarda
01d1a17231 fix indentation in LimitedNodeList 2015-07-09 12:20:28 -07:00
Seth Alves
d197bf2a85 use palm rotation data in hold action 2015-07-09 12:18:32 -07:00
Stephen Birarda
4c8f32ce7b add an assert for an NLPacketList segment that is oversized 2015-07-09 12:13:15 -07:00
Stephen Birarda
cafa8b65f5 specify the size of the DTLS required packet 2015-07-09 12:07:18 -07:00
Stephen Birarda
adf2ce85f1 pack the size of the connection denied reason 2015-07-09 12:03:15 -07:00
Andrew Meadows
55207a8fb1 enforce coding standards 2015-07-09 11:59:28 -07:00
Stephen Birarda
a38cb56c1c fix an accidental comment add 2015-07-09 11:56:24 -07:00