Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34513 commits 29 branches 0 tags 1.1 GiB
Commit graph

34513 commits

This branch
This branch
All branches
Author SHA1 Message Date
James B. Pollack
f478261ed0 cleanup 2015-11-06 16:21:53 -08:00
James B. Pollack
5893bfeb06 add user timing 2015-11-06 16:19:49 -08:00
Clément Brisset
143e92ee1b Merge pull request #6300 from jherico/lisa 
Breaking up InputDevices and InputPlugins, cleanup of some shared_ptr madness
 2015-11-06 16:15:53 -08:00
Eric Levin
eda467e252 Merge pull request #6335 from imgntn/promises 
Adapt Promises Library and Add Example
 2015-11-06 16:10:28 -08:00
Brad Davis
bf70ae4724 PR feedback 2015-11-06 15:59:13 -08:00
James B. Pollack
f7d4a3821f add more methods 2015-11-06 15:42:56 -08:00
Anthony J. Thibault
9a484ff00d Fixes for windows 2015-11-06 15:33:06 -08:00
Howard Stearns
619746676b Fix ScriptAvatar (ac agent), and provide a simple working example assignment client script. 2015-11-06 15:31:03 -08:00
Brad Davis
7c433f47c0 Breaking up input devices and input plugins classes. 2015-11-06 15:20:00 -08:00
ericrius1
c1690bcf32 restoring avatarMover app post S3-loss event 2015-11-06 15:19:14 -08:00
James B. Pollack
ced1a4899d promises 2015-11-06 15:10:23 -08:00
Anthony J. Thibault
086b064527 Dumps all urls extracted to stdout. 2015-11-06 15:07:38 -08:00
Andrew Meadows
e410030dd9 Merge pull request #6320 from hyperlogic/tony/blender-avatar-ik-fix 
IK fix for avatars exported from Blender
 2015-11-06 15:00:25 -08:00
Anthony J. Thibault
c002888808 Added cache extractor to the tools directory 
It should find the local High Fidelity/Interface qt cache,
iterate over each file in the cache and output each corresponding
file into the High Fidelity/Interface/extracted dir.
The file path will be determined from the source url.

Untested on windows.
 2015-11-06 14:52:12 -08:00
Brad Davis
4513b638db Adding clip serialization implementation, tests 2015-11-06 14:40:21 -08:00
James B. Pollack
8eea7ff67c Merge pull request #6329 from sethalves/fix-grab-release 
send to server upon grab release
 2015-11-06 14:33:08 -08:00
ericrius1
c289474909 avatr mover 2015-11-06 14:25:01 -08:00
Brad Davis
55dc486556 Merge pull request #6331 from AlessandroSigna/controllers 
Changes to Standard.RY
 2015-11-06 14:24:59 -08:00
ericrius1
a432a62dee model swapping 2015-11-06 13:53:25 -08:00
Eric Levin
7be537c49c Merge pull request #6332 from imgntn/bubblwand_links 
Update Bubblewand Model References
 2015-11-06 13:28:27 -08:00
James B. Pollack
1d41ef868b update bubblewand model refs 2015-11-06 13:11:06 -08:00
AlessandroSigna
fdd4a55057 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83 changed the behaviour of Standard.LY input 2015-11-06 12:46:08 -08:00
samcake
703a6bdb95 Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 12:38:07 -08:00
Clément Brisset
5d80dc0c90 Merge pull request #6324 from sethalves/smooth-hold-action-velocity 
smooth hold action velocity over 2 frames
 2015-11-06 12:25:52 -08:00
Seth Alves
46b7b92b2f prefix private member variables with _ 2015-11-06 11:54:51 -08:00
samcake
a82c2d66ed Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 11:53:49 -08:00
James B. Pollack
cf86d27417 cleanup headers 2015-11-06 11:50:34 -08:00
James B. Pollack
e928c8278b overload a single function and cleanup, add examples 2015-11-06 11:48:51 -08:00
Brad Davis
1dc392bb36 Merge pull request #6330 from Atlante45/master 
// FIXME incredibly evil....
 2015-11-06 11:43:33 -08:00
samcake
640845c944 Merge pull request #6328 from jherico/rec2 
Add recording classes
 2015-11-06 11:39:14 -08:00
Brad Davis
0bf29a441f Add recording classes 2015-11-06 11:14:46 -08:00
Atlante45
e630f3072e Bit of cleanup 2015-11-06 11:14:10 -08:00
Atlante45
c53c0ec53f Fix double delete on shutdown 2015-11-06 11:13:10 -08:00
Stephen Birarda
ed960b02ec Merge pull request #6291 from zzmp/fix/script-engine-run-bail 
Bail early from ScriptEngine::run if stopped
 2015-11-06 10:05:02 -08:00
AlessandroSigna
ced4061d76 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-06 09:47:06 -08:00
samcake
2f9c33dbfb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-11-06 09:35:48 -08:00
samcake
46d9a14951 Work in progress, fixing the animation playback 2015-11-06 09:35:20 -08:00
samcake
63106f6991 Merge pull request #6322 from Atlante45/record 
Recording fixes from Clement.
 2015-11-06 09:28:58 -08:00
Seth Alves
4ed8a1e5d1 changes to send an update to entity-server when AvatarActionHold releases an entity 2015-11-06 09:25:53 -08:00
James B. Pollack
11b01b3b9d Merge pull request #6307 from jherico/barney 
Getting rid of HTTPS external dependencies
 2015-11-05 20:53:43 -08:00
James B. Pollack
2fdc9202e4 Merge pull request #6313 from AlanZimmerman/playa 
Created playaSpawner
 2015-11-05 20:47:00 -08:00
James B. Pollack
5713f19fa4 Merge pull request #6327 from AlessandroSigna/branchJS 
Examples of  the new input mapping system
 2015-11-05 20:06:16 -08:00
AlessandroSigna
715b183a3c unified two ways to do the mapping in a single JS 2015-11-05 19:10:06 -08:00
AlessandroSigna
f9ebbea585 Merge branch 'master' of https://github.com/highfidelity/hifi into branchJS 2015-11-05 19:09:49 -08:00
AlessandroSigna
c6b42f5fbc Added a second way to create mapping 2015-11-05 18:48:24 -08:00
AlessandroSigna
60cb736a48 Merge branch 'master' of https://github.com/highfidelity/hifi 2015-11-05 18:47:36 -08:00
ericrius1
94c5637024 marketplace spawner 2015-11-05 17:27:30 -08:00
AlessandroSigna
23496617c1 Merge branch 'master' of https://github.com/AlessandroSigna/hifi 2015-11-05 17:13:02 -08:00
Atlante45
dbe25651cf constify audio client loop 2015-11-05 16:57:51 -08:00