Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 11:32:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33297 commits 75 branches 59 tags 1.2 GiB
Commit graph

3623 commits

Author SHA1 Message Date
samcake
43d7fe491e wiring the actions 2015-10-15 17:53:53 -07:00
samcake
2ad6c2067b MErging maybe finally ?????? 2015-10-15 14:43:15 -07:00
Brad Davis
80c962a4cc Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-15 12:27:53 -07:00
samcake
cdfe9788d1 Merging 2015-10-15 10:49:08 -07:00
Thijs Wenker
c99573ea64 Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now! 2015-10-15 15:35:35 +02:00
Thijs Wenker
8111432088 Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX 2015-10-15 14:50:20 +02:00
samcake
12e103c90c Get json creating the mappings from js 2015-10-14 17:41:39 -07:00
Brad Davis
e39219c2b5 Fixes and PR comments 2015-10-14 16:51:52 -07:00
Brad Davis
f051a84dc6 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-14 10:54:32 -07:00
Brad Davis
0c31fb1b1b Merge pull request #6069 from ZappoMan/controllers 
Hack in NewControllers into the JS layer of interface to allow testing
 2015-10-13 19:08:26 -07:00
James B. Pollack
0f2ad8dd49 Merge branch 'wall_targets_2' into invert_solids 2015-10-13 10:15:48 -07:00
Brad Hefta-Gaub
8e8ba15aaa Merge pull request #6065 from sethalves/reorder-sims 
grab changes
 2015-10-13 08:35:38 -07:00
Ryan Huffman
9a9bdbbc44 hack in mappings to interface 2015-10-12 17:59:58 -07:00
James B. Pollack
02620c4b0d make targets ungrabbable 2015-10-12 16:59:42 -07:00
Seth Alves
f0ce698d78 switch back to springy grab 2015-10-12 16:57:20 -07:00
James B. Pollack
47471e837f reset targets once they have stopped moving 2015-10-12 16:31:36 -07:00
James B. Pollack
84f0c404ad fix bug related to camera lock for entity orbit and pan 2015-10-12 14:55:52 -07:00
Thijs Wenker
a6da91ee35 Fix walk.js script 2015-10-12 19:03:34 +02: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
0986f86c34 implement StandardController and expose it to JS as Controller.Standard.* 2015-10-11 14:55:07 -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
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
63f3156a61 add Controler.Actions 2015-10-09 21:23:19 -07:00
Brad Hefta-Gaub
d3ee9b0f39 more work on exposing device inputs as JavaScript named constants 2015-10-09 20:58:23 -07:00
Seth Alves
7824d03e11 grab script picks 5x per second rather than 60x 2015-10-09 17:56:32 -07:00
Seth Alves
c6c44e8b81 add a userdata flag that allows toggling of the ignoreForCollisions entity property when an item is held. 2015-10-09 15:42:30 -07:00
Atlante45
75f0a6442f ModelEntities spawned with no dimension autoresize 2015-10-09 12:23:19 -07:00
James B. Pollack
3e2b32530a Update pingPongGun.js 
Gun force shouldn't be so low.
 2015-10-09 10:47:20 -07:00
James B. Pollack
1332b8bef6 remove logging 2015-10-08 17:58:58 -07:00
James B. Pollack
772ea16c71 cleanup 2015-10-08 17:52:33 -07:00
James B. Pollack
ad6fdc813f alignment, targets, sounds, master script 2015-10-08 17:50:41 -07:00
James B. Pollack
62728aa507 alignments 2015-10-08 16:16:11 -07:00
James B. Pollack
d77abc2aba Merge branch 'wall_targets' of https://github.com/imgntn/hifi into wall_targets 2015-10-08 14:08:09 -07:00
James B. Pollack
b1db1db6da Merge remote-tracking branch 'upstream/master' into wall_targets 2015-10-08 14:06:23 -07:00
Ryan Huffman
26c40adecb Merge pull request #6023 from ZappoMan/animationGroupSettings 
Fixes to isEmitting for ParticleEffects
 2015-10-08 12:24:36 -07:00
Brad Hefta-Gaub
f141026990 CR feedback 2015-10-08 11:48:48 -07:00
Brad Hefta-Gaub
a8d1622481 CR feedback 2015-10-08 11:47:54 -07:00
ericrius1
6921e0f022 Aligned targets on wall in toybox 2015-10-08 11:38:02 -07:00
Brad Hefta-Gaub
9f0721c08b Merge pull request #6020 from ericrius1/grabFarNonColliding 
Added grab far events for non physical objects
 2015-10-08 09:56:22 -07:00
ericrius1
aac372cc8a Fixed styling errors 2015-10-08 09:53:06 -07:00
Brad Hefta-Gaub
39f2241eac fix coding standard issue 2015-10-08 09:46:43 -07:00
Brad Hefta-Gaub
bb10d8a7d5 more work on rationalizing particle properties 2015-10-07 20:08:30 -07:00
Brad Hefta-Gaub
b479dd0a12 Merge branch 'master' of https://github.com/highfidelity/hifi into animationGroupSettings 2015-10-07 19:55:01 -07:00
Brad Hefta-Gaub
02a24712ca fix isEmitting property for particle effects, cleaned up some particle property editing in edit.js 2015-10-07 19:52:29 -07:00
James B. Pollack
7a7b16f0a2 wall targets 2015-10-07 18:16:58 -07:00