Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 01:00:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
33890 commits 75 branches 59 tags 1.2 GiB
Commit graph

3803 commits

Author SHA1 Message Date
Brad Davis
036ae62dd3 Merge remote-tracking branch 'upstream/master' into HEAD 2015-10-29 14:00:52 -07:00
Brad Hefta-Gaub
1c2973f17d removed old metavoxel example, since the api is no longer available 2015-10-29 12:34:24 -07:00
Brad Hefta-Gaub
1f53e425eb Merge branch 'master' of https://github.com/highfidelity/hifi into controllers 2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368 Merge pull request #6222 from ZappoMan/hardwareChanged 
Handle input plugin register/remove when activated/deactivated by menus
 2015-10-29 12:24:17 -07:00
Brad Hefta-Gaub
3bbba99e2b Merge pull request #6178 from samcake/color 
Refactor the KeyLIght properties in their own group
 2015-10-29 10:44:44 -07:00
samcake
517387621a Fixing the keyLIght Direction ui for edit.js and fix the case for D to d 2015-10-29 10:40:28 -07:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Eric Levin
42fb683085 Merge pull request #6184 from imgntn/toybox_sounds 
Add Arcade Game Sound To Toybox
 2015-10-29 10:24:23 -07:00
samcake
025422792d Fixing the keyLIght Direction ui for edit.js 2015-10-29 10:13:28 -07:00
Brad Hefta-Gaub
a3cd032a41 register/remove devices when the input plugins are activated/deactivated 2015-10-29 10:06:21 -07:00
Andrew Meadows
f9012d5051 Merge pull request #6187 from sethalves/fix-actions-ttl 
fix actions bug
 2015-10-29 09:30:21 -07:00
samcake
630cdb8a9d Modify the html presentiong the zone enity properties to match the internal new representation 2015-10-28 17:29:06 -07:00
samcake
a5b95d7307 Fixing the entity properties view with the new properties group 2015-10-28 16:46:56 -07:00
Brad Davis
570b4a32da Merge pull request #6206 from samcake/controllers 
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
 2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	interface/src/avatar/MyAvatar.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-10-28 13:38:22 -07:00
samcake
b90af1a1ce Fixing typo and review comments 2015-10-28 13:21:45 -07:00
samcake
07c13f4d66 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-28 12:54:46 -07:00
Brad Hefta-Gaub
30f7c44f61 emit hardwareChanged signal to scripts 2015-10-28 09:34:18 -07:00
samcake
6ec87086bc Adding the state controller 2015-10-27 16:57:06 -07:00
Atlante45
1bebdc8e70 Fix scripts syntax errors 2015-10-27 12:11:27 -07:00
James B. Pollack
da5db326e8 make cat quieter 2015-10-26 16:03:10 -07:00
Brad Hefta-Gaub
9c4199ef16 Merge pull request #6186 from jherico/pingpong 
Fixing spray can script
 2015-10-26 14:56:06 -07:00
Seth Alves
8d0aaed41a fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl' 2015-10-26 13:50:21 -07:00
Brad Davis
b2c3311947 Merge pull request #6174 from samcake/controllers 
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
 2015-10-26 13:46:32 -07:00
Brad Davis
d91d0a2027 Fixing spray can script 2015-10-26 12:47:31 -07:00
James B. Pollack
fc8184ffed add arcade sound 2015-10-26 12:25:51 -07:00
Brad Davis
34b5178393 Fixing ping-ping entity script 2015-10-26 11:55:23 -07:00
Brad Hefta-Gaub
88ba6cda24 Merge pull request #6177 from jherico/guns 
Controller Branch - Fix gun.js
 2015-10-26 10:51:08 -07:00
Brad Davis
75b2ee94b2 PR feedback 2015-10-25 19:37:41 -07:00
Brad Davis
3e50174114 Updating gun.js to new controller API 2015-10-24 16:26:50 -07:00
Brad Hefta-Gaub
394511ac1b fix frisbee.js to work with new API 2015-10-24 09:50:09 -07:00
Brad Davis
f61cf843bc Merge pull request #6172 from ZappoMan/fixScripts 
fix walkApi.js to detect hydra in official way
 2015-10-23 21:04:17 -07:00
Brad Hefta-Gaub
6cffe8cb6a Merge pull request #6169 from EdgarPironti/controllers2 
fix toyball.js
 2015-10-23 20:21:00 -07:00
Brad Hefta-Gaub
0b99728575 Merge pull request #6175 from AlessandroSigna/controllers 
fix stick.js
 2015-10-23 20:20:00 -07:00
Brad Hefta-Gaub
3a2328a887 Merge pull request #6173 from EdgarPironti/controllers 
Fixed sword.js
 2015-10-23 20:07:52 -07:00
AlessandroSigna
7f3f202567 fix stick.js 2015-10-23 18:23:15 -07:00
samcake
eae316100a Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-23 18:18:27 -07:00
samcake
d400c694f6 Cleaning up for release 2015-10-23 18:09:54 -07:00
EdgarPironti
0d15182adb Fixed sword.js 2015-10-23 18:09:43 -07:00
Brad Hefta-Gaub
4a19a14682 fix walkApi.js to detect hydra in official way 2015-10-23 17:53:34 -07:00
Brad Davis
304fe49628 Merge pull request #6170 from ZappoMan/fixScripts 
various controller script updates
 2015-10-23 17:43:54 -07:00
Brad Hefta-Gaub
060f87d14a CR feedback 2015-10-23 17:33:45 -07:00
samcake
be843a0035 adding a rnning average on the velocity values returned by the hydra and adding a simple js to test 2015-10-23 17:32:54 -07:00
Brad Hefta-Gaub
9aaef9aabd fix hydraPaint.js to use new API 2015-10-23 17:32:06 -07:00
EdgarPironti
0959c98132 Fixed tab 2015-10-23 17:26:44 -07:00
Brad Davis
4e6f64833f Conditional support from JS 2015-10-23 17:24:04 -07:00
Brad Hefta-Gaub
9ba1b800d9 CR feedback 2015-10-23 17:15:39 -07:00
Brad Hefta-Gaub
090dc5409b CR feedback 2015-10-23 17:14:59 -07:00
Brad Hefta-Gaub
ed20e7d209 CR feedback 2015-10-23 17:14:13 -07:00
EdgarPironti
c64290b5cd Removed unused variables 2015-10-23 17:13:29 -07:00