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

21531 commits

This branch
This branch
All branches
Author SHA1 Message Date
Atlante45
af2177a4ac Remove gl include 2015-01-27 02:00:41 -08:00
Atlante45
20358a87d6 Moved some headers around 2015-01-27 01:43:01 -08:00
Atlante45
79bf70acb4 Guard QXmpp with #ifdef 2015-01-27 01:41:12 -08:00
Atlante45
dbdb87a1a2 Moved Menu dependency out of audio 2015-01-27 01:21:59 -08:00
Atlante45
71b565c33c Merge branch 'master' of https://github.com/highfidelity/hifi into pull_out_menu_mess 
Conflicts:
	interface/src/Application.cpp
 2015-01-27 01:21:33 -08:00
Philip Rosedale
e8f4783bea border, new size for blocks, smoother hydra grab action 2015-01-26 22:06:59 -08:00
Philip Rosedale
8b5a451886 Grab now correctly adds linear velocity so that you can grab and throw things 2015-01-26 21:09:21 -08:00
Philip Rosedale
005cd2ba53 Add block building toolset, first version 2015-01-26 20:44:47 -08:00
Philip Rosedale
bf0cde060c Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 20:35:34 -08:00
Philip Rosedale
e0c9af853c remove 'STICKS' mode, add drop line to better tell what something you are holding is above 2015-01-26 20:19:46 -08:00
Philip Rosedale
4c10f6f23b Merge pull request #4171 from Atlante45/hydra_grab_fix 
Hydra grab fix
 2015-01-26 19:48:30 -08:00
ZappoMan
83d1cc911a hacking 2015-01-26 19:38:24 -08:00
Atlante45
cf631bf3fc Remove unnecessary stopAnimation in script to get rid of sacades 2015-01-26 19:20:47 -08:00
Atlante45
f84f6e9b66 Restore joints state on stopAnimation 2015-01-26 19:12:18 -08:00
Philip Rosedale
6d3a9f7bc0 merge fix 2015-01-26 18:43:42 -08:00
Philip Rosedale
2108cac38e Merge pull request #4170 from Atlante45/hydra_grab_fix 
Fixed mapped rotation + doubled it
 2015-01-26 18:27:42 -08:00
Atlante45
64f8495681 Fixed mapped rotation + doubled it 2015-01-26 18:20:08 -08:00
Philip Rosedale
dd352e5a1a Merge branch 'master' of https://github.com/worklist/hifi 2015-01-26 17:31:35 -08:00
Philip Rosedale
78e1769468 Merge pull request #4169 from Atlante45/hydra_grab_fix 
Hydra grab fix
 2015-01-26 17:31:13 -08:00
ZappoMan
02c0700db3 support for skipping forward on new edit packets from server 2015-01-26 17:25:06 -08:00
Philip Rosedale
a1babe3a33 Put paddle exactly in hand, add animation of fingers gripping paddle 2015-01-26 17:20:31 -08:00
Atlante45
4b3291d946 Some cleanup in hydraGrab.js 2015-01-26 17:11:49 -08:00
Atlante45
4278407137 Account for avatar scale in Hand(Data) get/set 
When using localToWorld/WorldToLocal type functions
 2015-01-26 16:48:33 -08:00
Philip Rosedale
bfdbe2e675 Detach both guns on shutdown 2015-01-26 16:25:07 -08:00
Stephen Birarda
3ceadf31b3 Merge pull request #4165 from murillodigital/ice-monitoring 
Check just for http availability
 2015-01-26 14:30:33 -08:00
ZappoMan
d9835701b0 added comment 2015-01-26 12:48:57 -08:00
ZappoMan
81185cfe56 removed some debugging 2015-01-26 12:46:22 -08:00
ZappoMan
08fbcbaf40 tweaks for debugging 2015-01-26 12:38:02 -08:00
Brad Hefta-Gaub
d207304db0 Merge pull request #4166 from ctrlaltdavid/20279 
Temporarily re-enable audio selection on Windows
 2015-01-26 12:08:53 -08:00
ZappoMan
a1ec44b8e0 add developer menu item to disable sending physics updates 2015-01-26 12:05:57 -08:00
David Rowe
9aaa3a6fe4 Temporarily re-enable audio selection on Windows 
This is to test current behavior on different users' PCs before
re-enabling permanently.
 2015-01-26 11:48:44 -08:00
Leonardo Murillo
d26804e68c Check just for http availability 2015-01-26 13:45:14 -06:00
ZappoMan
73b9c06ec0 added some debugging 2015-01-26 11:13:30 -08:00
ZappoMan
f85774c687 adding some debugging 2015-01-26 09:45:33 -08:00
David Rowe
c8a755df1b Remove unused variable 2015-01-26 08:32:23 -08:00
Philip Rosedale
09527cc264 hit target 2015-01-25 21:52:08 -08:00
Philip Rosedale
67632fa589 remove debug 2015-01-25 21:51:12 -08:00
Philip Rosedale
901044fc53 First version, popcorn machine 2015-01-25 21:40:16 -08:00
Sam Gateau
1a044b4ea6 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-01-23 23:31:24 -08:00
David Rowe
812fbc58fb Use custom User-Agent string 2015-01-23 19:13:29 -08:00
Andrzej Kapolka
23f9c799dd Merge branch 'master' of https://github.com/highfidelity/hifi 2015-01-23 18:20:14 -08:00
Andrzej Kapolka
34110b6745 Partial subdivision implementation. 2015-01-23 18:19:45 -08:00
Sam Gateau
c05d627cc1 Clean up 2015-01-23 17:13:26 -08:00
Andrew Meadows
18e0a91ea8 Merge pull request #4158 from ZappoMan/fixGlitches 
fix last simulated and last updated to correctly be sent over the wire
 2015-01-23 16:45:27 -08:00
ZappoMan
de75eec877 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGlitches 2015-01-23 16:23:56 -08:00
Philip Rosedale
1048c9cda3 Merge branch 'master' of https://github.com/worklist/hifi 2015-01-23 16:09:51 -08:00
Philip Rosedale
806c1851be add save/restore of gravity 2015-01-23 16:09:45 -08:00
Philip Rosedale
ba65112463 Merge pull request #4159 from Atlante45/master 
Request blocking calls
 2015-01-23 16:08:23 -08:00
Atlante45
7a1300d66c Request blocking calls 2015-01-23 16:05:06 -08:00
Andrew Meadows
eb4678659a remove EntityItem::getDistanceToBottomOfEntity() 
and also isRestingOnSurface()
 2015-01-23 15:56:44 -08:00