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

9038 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
7d27830064 domain-server patches while looking for payload/pool errors 2014-01-29 14:23:39 -08:00
Stephen Birarda
15ba5f7ab1 correct OctreeServer config parsing 2014-01-29 13:48:31 -08:00
AndrewMeadows
4ff400f59f Merge pull request #1725 from birarda/packet-changes 
I looked it over but did not test.  A lot of uint64_t --> qint64 and name changes.
 2014-01-29 13:13:20 -08:00
Stephen Birarda
7d8b7a79ac fix Particle update signature 2014-01-29 12:30:20 -08:00
Stephen Birarda
2dd71435ee fix build breakers for new packet type 2014-01-29 12:25:05 -08:00
Stephen Birarda
33edcea5fb resolve conflicts on merge with upstream master 2014-01-29 12:23:06 -08:00
AndrewMeadows
3cfca795e2 Merge pull request #1731 from ZappoMan/more_scripting 
I looked the code over and also did some basic testing (started servers on localhost, logged in with interface).
 2014-01-29 11:34:52 -08:00
ZappoMan
616cfac293 fix init bug 2014-01-29 11:21:45 -08:00
ZappoMan
b36cc0bcf9 removed old cruft around mousePitch in Head and unified pitch 2014-01-29 02:09:49 -08:00
ZappoMan
ecd2477007 adding lookWithMouse.js example that uses mouse instead of multi-touch to add the look around feature 2014-01-29 01:01:41 -08:00
ZappoMan
98cdc656c4 more scripting support, including adding a Quat helper class that makes JS quat math easier 2014-01-29 00:56:08 -08:00
ZappoMan
434756a40f removed some dead comments 2014-01-28 20:40:00 -08:00
ZappoMan
bcc7cfb15e removed some debug 2014-01-28 20:38:47 -08:00
ZappoMan
9d87d58723 Merge branch 'master' of https://github.com/worklist/hifi into more_scripting 
Conflicts:
	libraries/particles/src/ParticlesScriptingInterface.cpp
 2014-01-28 20:36:35 -08:00
ZappoMan
39a33b8c7d Merge pull request #1723 from ey6es/master 
Fixes for translucent textures (such as that used in jellyhead.fbx).
 2014-01-28 19:57:40 -08:00
ZappoMan
a73733e57b controller scripting example 2014-01-28 19:48:06 -08:00
ZappoMan
305e69def6 really get controller key, mouse, etc scripting working 2014-01-28 19:47:45 -08:00
ZappoMan
febb306a62 cleaned up some registration of global objects 2014-01-28 19:46:59 -08:00
Andrzej Kapolka
5bd7609fbb Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-28 17:32:55 -08:00
ZappoMan
acf580531b Merge pull request #1729 from birarda/trailing-slash 
handle trailing slash in HTTPManager
 2014-01-28 16:58:20 -08:00
Stephen Birarda
d624654a29 serve a 301 redirect when trailing slash is missing, closes #1712 2014-01-28 16:25:04 -08:00
Andrzej Kapolka
b6a15ea6c5 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-28 15:12:32 -08:00
ZappoMan
7882d50c5f hacking on controller events 2014-01-28 14:58:20 -08:00
ZappoMan
5addc35cd8 hacking on controller events 2014-01-28 14:58:08 -08:00
ZappoMan
50f36c6b74 Merge pull request #1722 from AndrewMeadows/fix-particle-avatar-collisions 
Fix particle avatar collisions
 2014-01-28 14:57:25 -08:00
Andrew Meadows
e13bc71f39 Adding avatar info back into ParticleCollisionSystem ctor arguments. 2014-01-28 14:43:36 -08:00
Andrew Meadows
714dbf8493 Moving MY_AVATAR_KEY back into AvatarManager.cpp 2014-01-28 14:37:32 -08:00
Andrew Meadows
f972bfd024 Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions 
Conflicts:
	interface/src/avatar/AvatarManager.cpp
 2014-01-28 14:30:59 -08:00
Andrew Meadows
1cc992a7f8 import --> include 2014-01-28 14:18:21 -08:00
Andrew Meadows
167acb8873 Adding avatars back into ParticleCollisionSystem. 
Had to add Application::_myAvatar to the AvatarManager list so that
particles would properly collide.
 2014-01-28 14:16:34 -08:00
Stephen Birarda
4bb72b9f3f remove MAX_HOSTNAME_BYTES 2014-01-28 13:44:47 -08:00
Stephen Birarda
423e1598f0 use NodeSet in place of QSet<NodeType_t> where possible 2014-01-28 13:41:39 -08:00
Stephen Birarda
4de270b832 cleanup Node types, closes #1726 2014-01-28 13:38:33 -08:00
Stephen Birarda
fe410ae3e9 fix packet header size constraints 2014-01-28 12:56:05 -08:00
Stephen Birarda
8384ff79df remove one Qt type replacement 2014-01-28 12:36:43 -08:00
Stephen Birarda
cda06d1cb3 replace uint64_t with quint64 for Qt friendlyness 2014-01-28 12:35:42 -08:00
Stephen Birarda
7b4921e761 use quint64 in place of uint64_t for QDataStream 2014-01-28 12:34:08 -08:00
Stephen Birarda
3a706a2759 repair the count of avatars and servers 2014-01-28 12:31:25 -08:00
Stephen Birarda
2aaa9ce3f6 resolve conflicts on merge with upstream master 2014-01-28 12:30:43 -08:00
Stephen Birarda
b009cd8e67 repair more node communication problems after refactor 2014-01-28 12:25:44 -08:00
Andrzej Kapolka
cf05cf6178 Didn't need to disable depth writes after all (for now). 2014-01-28 12:03:41 -08:00
Andrzej Kapolka
3edb81baf4 Check for texture translucency, render translucent mesh parts after opaque 
ones, without alpha testing, and with back face culling enabled.
 2014-01-28 12:01:32 -08:00
Stephen Birarda
ffefc529f3 ensure UUID pulled from packet header is exactly 16 bytes 2014-01-28 11:53:09 -08:00
ZappoMan
64afd17d14 include particle radius in model scaling 2014-01-28 11:49:11 -08:00
ZappoMan
dc25868403 cleanup 2014-01-28 11:26:55 -08:00
Stephen Birarda
75e2fa491a some type fixes for marshalling/un-marshalling of data 2014-01-28 11:26:36 -08:00
ZappoMan
bd0631838d example of setting particle model with JS 2014-01-28 11:19:04 -08:00
ZappoMan
427abd4509 add model properties to particles 2014-01-28 11:18:37 -08:00
Stephen Birarda
85ebad979f repair assignment flow errors from packet changes 2014-01-28 11:15:38 -08:00
Andrzej Kapolka
30fdb595dd Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-28 11:14:21 -08:00