Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-24 01:33:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
7978 commits 71 branches 56 tags 1.2 GiB
Commit graph

7978 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
7458839218 Merge pull request #1405 from ey6es/master 
Fix for menu shortcuts; just include widget library rather than using aw...
 2013-12-18 17:31:17 -08:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
Philip Rosedale
9786d1b21d Merge pull request #1404 from PhilipRosedale/master 
Fix to see other people animate hydra hands
 2013-12-18 16:43:43 -08:00
Philip Rosedale
17f35ce97b Fix to see other people animate hydra hands 2013-12-18 16:37:15 -08:00
Philip Rosedale
29a30c7adc Merge pull request #1396 from ZappoMan/controller_scripting_interface 
Generic Controller exposed to JavaScript interface in client
 2013-12-18 16:25:46 -08:00
ZappoMan
41490991ff Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	interface/src/Application.h
 2013-12-18 15:50:03 -08:00
Andrzej Kapolka
47097cd0fd Merge pull request #1403 from ey6es/master 
Build fix.
 2013-12-18 13:57:04 -08:00
Andrzej Kapolka
3f0b5aa748 Build fix. 2013-12-18 13:56:30 -08:00
Stephen Birarda
1892564e6a Merge pull request #1395 from stojce/19461 
Code Review for Job #19461
 2013-12-18 13:02:51 -08:00
Stojce Slavkovski
d72c4e4f65 removed commented code 2013-12-18 20:40:15 +01:00
Stojce Slavkovski
45d926da41 CR fixes 2013-12-18 20:37:45 +01:00
ZappoMan
4f3f6c0327 fixed build buster 2013-12-18 10:42:35 -08:00
ZappoMan
8549894ff8 add support for palm and tip spatial data to JS interface 2013-12-18 09:53:47 -08:00
ZappoMan
efdef1ad35 added all buttons triggers and joysticks 2013-12-18 09:33:48 -08:00
ZappoMan
70e9781ad9 CR feedback new class names 2013-12-18 08:42:34 -08:00
Stojce Slavkovski
a2ad70524f Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 17:36:33 +01:00
ZappoMan
14b31654ff Merge pull request #1400 from PhilipRosedale/master 
HandBall:  Sounds for throw, catch, new ball.  Tuned forces.
 2013-12-18 07:36:56 -08:00
Stojce Slavkovski
397eb13680 removed legacy resources path locator 2013-12-18 08:05:34 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Philip Rosedale
13be1ea825 added catch, throw, new ball sounds. Tuned ball speed for handball. 2013-12-17 22:08:52 -08:00
Philip Rosedale
b3bb33e48c Merge remote-tracking branch 'upstream/master' 2013-12-17 20:12:31 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
ZappoMan
a59650beac Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 2013-12-17 19:50:39 -08:00
ZappoMan
634eb29c65 Merge pull request #1399 from ey6es/metavoxels 
First pass at/proof of concept of "metavoxels."
 2013-12-17 19:08:51 -08:00
Andrzej Kapolka
45c31cece3 Removed insertion test code. 2013-12-17 18:23:12 -08:00
Andrzej Kapolka
a90dbe314b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 18:10:39 -08:00
ZappoMan
a443570106 Merge pull request #1397 from birarda/master 
fix for 8 channel audio output
 2013-12-17 18:04:12 -08:00
Andrzej Kapolka
f7aa464bf2 Somehow, I overwrote this value in Camera. 2013-12-17 17:21:56 -08:00
Andrzej Kapolka
ff2b77d311 Back to a more modest depth. 2013-12-17 17:16:09 -08:00
Andrzej Kapolka
8ddf6297a5 Fixed Xcode warnings. 2013-12-17 17:13:41 -08:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00
Stephen Birarda
c6dc93c28e fix for 8 channel output devices (HDMI capture) 2013-12-17 16:08:38 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -08:00
ZappoMan
4b3fd2166d make getNumPalms() const 2013-12-17 15:28:29 -08:00
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57 first cut at scriptable controller 2013-12-17 15:23:09 -08:00
Stephen Birarda
82f035c018 Merge pull request #1394 from ZappoMan/agent_script_engine_refactor 
make Agent class use common ScriptEngine class
 2013-12-17 14:36:35 -08:00
ZappoMan
f469553b8c CR feedback 2013-12-17 14:27:54 -08:00
Stojce Slavkovski
4509b8dbe5 don't cut long lines 2013-12-17 23:16:16 +01:00
ZappoMan
88c319a0da remove dead code 2013-12-17 14:15:34 -08:00
ZappoMan
7b3a778fb4 get Agent working with ScriptEngine 2013-12-17 14:13:16 -08:00
ZappoMan
43054ad893 cleanup 2013-12-17 13:56:07 -08:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
Andrzej Kapolka
d535d3b115 More progress on getting values in and out of scripts. 2013-12-17 13:44:56 -08:00
Stojce Slavkovski
36109c090e 720px width 2013-12-17 22:41:38 +01:00
ZappoMan
5c946090db Merge branch 'master' of https://github.com/worklist/hifi into agent_script_engine_refactor 2013-12-17 13:34:13 -08:00
Stojce Slavkovski
9d3cc9a5b4 70% initial width 2013-12-17 22:32:36 +01:00
Stojce Slavkovski
4566114175 Log dialog geometry 2013-12-17 22:25:26 +01:00