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

8649 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philip Rosedale
6ba5daad0c better comments in script 2014-01-22 08:44:43 -08:00
Philip Rosedale
5d9cf23ac5 Added drumSticks example script 2014-01-22 08:38:45 -08:00
Philip Rosedale
70b3ea4482 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-21 17:24:51 -08:00
Andrzej Kapolka
7fb062cf84 Merge pull request #1608 from ey6es/master 
Compile fix (for me, anyway).
 2014-01-21 17:23:46 -08:00
Andrzej Kapolka
2651c06367 Compile fix (for me, anyway). 2014-01-21 17:21:57 -08:00
Philip Rosedale
753a13dc0f Merge pull request #1604 from birarda/scripted-avatar 
initial hooks for scripted avatars with mesh and skeleton
 2014-01-21 17:15:22 -08:00
Stephen Birarda
8df40b5d60 clearly init the skeleton URL in profile 2014-01-21 17:07:40 -08:00
Stephen Birarda
f9b38af96f remove processing of Avatar URLs from AvatarMixer 2014-01-21 16:56:00 -08:00
Stephen Birarda
105fb42b34 rewrite mesh and skeleton requests from data-server 2014-01-21 16:46:04 -08:00
Stephen Birarda
8e5d4b69f4 fix packet offset for owner UUID 2014-01-21 16:14:33 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Stephen Birarda
417aa7ad59 re-expose an Avatar to the ScriptEngine 2014-01-21 15:59:55 -08:00
Stephen Birarda
aa9f7ff31d hook the DataServerScriptingInterface to the ScriptEngine 2014-01-21 13:21:03 -08:00
Stephen Birarda
e08f4d2eba more DataServerClient API tweaks 2014-01-21 13:13:57 -08:00
Stephen Birarda
f4f8fe2e67 Merge pull request #1600 from kordero/19480 
Code Review for Job #19480
 2014-01-21 11:14:43 -08:00
Lucas Crisman
1423f91717 Allow domain-server to read configuration from file 2014-01-21 15:48:44 -03:00
Stephen Birarda
7c5c71ec42 Merge pull request #1532 from murillodigital/master 
Update required query and notification
 2014-01-21 09:55:25 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
Philip Rosedale
b508318473 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-21 09:36:11 -08:00
Leonardo Murillo
90329e0465 Merge branch 'master' of github.com:/worklist/hifi 2014-01-21 11:29:37 -06:00
Leonardo Murillo
a4c057b01f PR fix 2014-01-21 11:27:03 -06:00
Andrew Meadows
141c20f4ef Fix formatting to abide by compressed K&R style. 2014-01-21 09:26:23 -08:00
Leonardo Murillo
18a6d74165 removing comment 2014-01-21 11:24:23 -06:00
Leonardo Murillo
b2ef07f485 PR Fixes 2014-01-21 11:17:43 -06:00
Leonardo Murillo
cc147bc8bf PR fixes 2014-01-21 10:39:29 -06:00
Leonardo Murillo
b972d4260c PR Fixes 2014-01-21 10:31:16 -06:00
Leonardo Murillo
a9c294099e Merge branch 'master' of github.com:/worklist/hifi 2014-01-21 10:00:00 -06:00
ZappoMan
6fd4903672 Merge pull request #1599 from hifialanwu/master 
#19488 scripts save on exit and load on entry
 2014-01-21 02:20:57 -08:00
ZappoMan
b48ec97f5b Merge pull request #1598 from AndrewMeadows/paddle-fixes-2 
Paddle fixes 2
 2014-01-21 02:12:47 -08:00
aw
0eed041deb scripts save on exit and load on entry 2014-01-20 22:58:01 -08:00
Andrew Meadows
b0edc7ee6f Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes-2 2014-01-20 17:39:41 -08:00
Andrew Meadows
966cd76e2c Adding static friction for easier "catching" of particles on paddle hands. 2014-01-20 17:34:24 -08:00
Andrew Meadows
516a590e4f Modifying how the "particle is stopped" logic reads with minimal modification to how it works. 2014-01-20 17:33:09 -08:00
Stephen Birarda
340ae8ebd1 column width repair 2014-01-20 17:17:26 -08:00
Stephen Birarda
d9ae27953b move DataServerClient to shared for use in other targets 2014-01-20 17:12:52 -08:00
Stephen Birarda
80fcc87437 some spacing fixes in Profile 2014-01-20 17:09:03 -08:00
Stephen Birarda
0ac5ec0690 hook old data server functionality through profile 2014-01-20 17:05:31 -08:00
Stephen Birarda
cf40fb0ef8 repairs to new Qt'ed DataServer and DataServerClient 2014-01-20 16:55:14 -08:00
Stephen Birarda
657589fa64 add sequence number handling to the data-server 2014-01-20 14:52:45 -08:00
Philip Rosedale
c5652935a5 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-20 14:50:43 -08:00
Philip Rosedale
19793a9a4a Merge pull request #1595 from ey6es/master 
Fix hand jerkiness when flying (by always keeping the hand positions relative to the body orientation/position).
 2014-01-20 14:50:20 -08:00
Stephen Birarda
8930cf889b bump data server packet version to 1 2014-01-20 14:48:14 -08:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08:00
Andrzej Kapolka
b98ceec21c Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-20 13:45:49 -08:00
Andrzej Kapolka
804ce83fa6 Get the base position/orientation directly from the avatar to prevent 
jerkiness when flying with the Hydra.  Also, restore arm lengths when the
Hydra becomes inactive.
 2014-01-20 13:44:41 -08:00
Andrew Meadows
1ed57e044a Fixing measure of "old" particles while simplifying the math (faster!). 2014-01-20 13:40:15 -08:00
Andrew Meadows
1eb2f19320 Removing one more usecTimestampNow() call in Particle::update() 2014-01-20 13:34:08 -08:00
Andrew Meadows
79e4b6d691 Removing per-particle calls to usecTimestampNow() which can add up when simulating a lot of particles. 2014-01-20 13:27:19 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -08:00
Andrew Meadows
61e1b25e70 ParticleTreeElement::_particles is now a QList<> instead of std::vector<> for faster erase() 2014-01-20 12:43:27 -08:00