Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-14 03:45:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33176 commits 76 branches 59 tags 1.2 GiB
Commit graph

33176 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ryan Huffman
9ddcfdf94d Cleanup PacketReceier and ReceivedMessage 2015-10-16 09:21:10 -07:00
Ryan Huffman
7682ab00e3 Add ReceivedMessage and receive progress 2015-10-15 14:09:53 -07:00
Clément Brisset
3e65c3bc35 Merge pull request #6064 from birarda/default-asset-server 
turn on the asset server by default
 2015-10-12 17:21:33 -07:00
Howard Stearns
e8b074c85c Merge pull request #6031 from AndrewMeadows/ik-moves-hips 
IK moves hips
 2015-10-12 17:03:33 -07:00
Stephen Birarda
60f5a06308 turn on the asset-server by default 2015-10-12 16:44:51 -07:00
Stephen Birarda
8240dff03f Merge pull request #6061 from Atlante45/asset-drop 
Asset drop
 2015-10-12 16:37:50 -07:00
James B. Pollack
6265563084 Merge pull request #6056 from ericrius1/entityResetFix 
Fixed syntax error in hiddenEntityResetScript
 2015-10-12 15:38:18 -07:00
Atlante45
b7ba99380a Pretty up loading debug 2015-10-12 15:32:44 -07:00
Atlante45
7eadb11404 Remove optional upload caching 2015-10-12 15:09:17 -07:00
Atlante45
0e0a8301eb Collapse line 2015-10-12 15:06:51 -07:00
Atlante45
cfba5752ce Change checkbox text 2015-10-12 15:03:37 -07:00
Atlante45
0cdad78581 Move debug to helper functions 2015-10-12 15:03:37 -07:00
Atlante45
4abac35c72 Cache on upload 2015-10-12 15:03:37 -07:00
Atlante45
51acf07c15 Factor couple methods in AssetUtils 2015-10-12 15:03:37 -07:00
Stephen Birarda
ae32b0dc98 Merge pull request #6058 from Atlante45/asset-drop 
All file types eligible for upload to asset server
 2015-10-12 15:02:34 -07:00
Atlante45
eea89ba010 CR - Rename method 2015-10-12 14:26:28 -07:00
Andrew Meadows
8ebdd25b71 more cleanup 2015-10-12 14:07:23 -07:00
Andrew Meadows
22786dea7d cleanup 2015-10-12 13:35:26 -07:00
Atlante45
7b41efcf86 All file types eligible for upload to asset server 2015-10-12 13:35:21 -07:00
Andrew Meadows
e1a5afcff3 re-enable avatar position update when moving HMD 2015-10-12 11:42:03 -07:00
Andrew Meadows
44243aaa52 remove some debug code 2015-10-12 11:39:54 -07:00
U-GAPOS\andrew
f01847de14 experimental HMD hips tracking 2015-10-12 11:39:54 -07:00
Andrew Meadows
35d2a5b5ea track tipRotation for HmdHead target 2015-10-12 11:39:54 -07:00
Andrew Meadows
5f1068c404 cleanup and optimization of IK loop 2015-10-12 11:39:54 -07:00
Andrew Meadows
6a96d5f0c5 don't bother to create targets with bad types 2015-10-12 11:39:54 -07:00
Andrew Meadows
bc48f70877 move IKTarget into its own files 2015-10-12 11:39:54 -07:00
Andrew Meadows
56f038d5a7 simpler logic for tracking hips offset 2015-10-12 11:39:54 -07:00
Andrew Meadows
03eaa95258 initial hip translation from IK 
works for 2D 3rd person but probably not well for HMD
 2015-10-12 11:39:54 -07:00
ericrius1
08a94189b7 explicitly setting isSpotlight to false 2015-10-12 09:31:12 -07:00
ericrius1
ab32470699 Fixed syntax error in hiddenEntityResetScript 2015-10-12 09:12:33 -07:00
Brad Hefta-Gaub
f8956a853b Merge pull request #6051 from jherico/marge 
Cleanup CMake files
 2015-10-11 16:22:56 -07:00
Brad Davis
8024d9f017 Merge pull request #6055 from ZappoMan/newControllerInterface 
implement StandardController and expose it to JS as Controller.Standard.*
 2015-10-11 16:10:42 -07:00
Brad Hefta-Gaub
21a473035e more CR feedback 2015-10-11 15:37:17 -07:00
Brad Hefta-Gaub
312bbf6167 CR feedback 2015-10-11 15:15:20 -07:00
Brad Hefta-Gaub
9667a103aa actually add new files 2015-10-11 15:02:11 -07:00
Brad Hefta-Gaub
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -07:00
Brad Hefta-Gaub
61ab1a1935 Merge pull request #6054 from ZappoMan/fixEdit 
temp fix to get editing working again
 2015-10-11 14:03:04 -07:00
Brad Hefta-Gaub
e09fe30f05 damn you visual studio 2015-10-11 14:02:33 -07:00
Brad Hefta-Gaub
b5b4c2153a temp fix to get editing working again 2015-10-11 14:00:35 -07:00
Brad Hefta-Gaub
b880855998 Merge pull request #6029 from jherico/homer 
Low level support for URL overrides when loading content
 2015-10-11 11:34:07 -07:00
Brad Davis
cd1b758534 PR comments 2015-10-11 00:32:31 -07:00
Brad Davis
6f5f6450df Cleanup CMake files 2015-10-11 00:01:03 -07:00
Brad Davis
e5fc2e5525 Low level support for URL overrides when loading content 2015-10-10 23:00:15 -07:00
Brad Davis
700c11563c Merge pull request #6050 from ZappoMan/newControllerInterface 
Expose Controller.Hardware.* constants to JavaScript
 2015-10-10 12:43:43 -07:00
Brad Hefta-Gaub
83bf8c8742 Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:43:07 -07:00
Brad Hefta-Gaub
b7b2c30eaa Merge pull request #6049 from sethalves/less-picky 
grab script picks less
 2015-10-10 09:41:49 -07:00
Seth Alves
5c95306e8e merge from upstream 2015-10-10 09:34:13 -07:00
Brad Hefta-Gaub
ded677e90f Merge branch 'master' of https://github.com/highfidelity/hifi into newControllerInterface 2015-10-10 09:33:55 -07:00
Brad Hefta-Gaub
25481e0a25 Merge pull request #6038 from Atlante45/asset-drop 
Asset file drop
 2015-10-10 09:32:58 -07:00
Brad Hefta-Gaub
69d6e5d298 Merge pull request #6046 from sethalves/flip-you-for-real 
add a userdata flag to toggle ignoreForCollisions while holding an entity
 2015-10-10 09:25:57 -07:00