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

34009 commits

This branch
This branch
All branches
Author SHA1 Message Date
Howard Stearns
9e223a9502 Merge branch 'master' of https://github.com/highfidelity/hifi into safe-avatar-list-access 2015-10-27 12:57:41 -07:00
Atlante45
c0138bd189 Rename check functions and make them static 2015-10-27 12:39:40 -07:00
ericrius1
8fcc071026 only can draw on whiteboard 2015-10-27 12:24:29 -07:00
Brad Hefta-Gaub
00d5c8f682 Merge pull request #6197 from EdgarPironti/controllers 
Fixed standard.json
 2015-10-27 12:23:21 -07:00
Atlante45
ffe73348fb Move check functions to cpp only 2015-10-27 12:11:27 -07:00
Atlante45
a53a576aa3 checkExceptions after testing entity scripts in the sandbox 2015-10-27 12:11:27 -07:00
Atlante45
ea56f965a4 Lambda conversion fix for windows 2015-10-27 12:11:27 -07:00
Atlante45
1bebdc8e70 Fix scripts syntax errors 2015-10-27 12:11:27 -07:00
Atlante45
3e43a3c345 Some more script checks 2015-10-27 12:11:27 -07:00
Atlante45
13b7fa6b5d Typo 2015-10-27 12:11:27 -07:00
Atlante45
c8c9118d4d Improve script engine error logging + some cleanup 2015-10-27 12:11:27 -07:00
Atlante45
3742c169b5 Make handler generators more readable 2015-10-27 12:11:27 -07:00
ericrius1
f0a1335957 fixed paint initially showing up white 2015-10-27 12:09:07 -07:00
ericrius1
fa22249f7a Improving model 2015-10-27 12:03:30 -07:00
EdgarPironti
596b315286 Fixed standard.json 2015-10-27 11:35:30 -07:00
ericrius1
8a85468254 changing model, repositioning 2015-10-27 10:39:44 -07:00
Seth Alves
4c64da9ce5 try to avoid negative roll-over when moving to or from server time 2015-10-27 10:27:32 -07:00
samcake
a0104884f5 Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers 2015-10-27 09:59:48 -07:00
samcake
87cf3b237b Supporting a InHMD action and using it to enable COmfort mode 2015-10-27 09:59:22 -07:00
Ryan Huffman
2cd2af2b13 Add headers to line.js and lineExample.js 2015-10-27 09:49:52 -07:00
Brad Davis
ef2d71e576 Merge remote-tracking branch 'upstream/master' into HEAD 
Conflicts:
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-10-27 09:41:58 -07:00
Ryan Huffman
983c551ce3 Clean up line.js and make lifetime settable 2015-10-27 09:13:16 -07:00
black plastick
d34fc35544 added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts. 2015-10-27 08:11:20 -04:00
Philip Rosedale
bc07de3892 Merge pull request #6194 from howard-stearns/hydra-hack 
Do not shut down hydra when it says there are no devices.
 2015-10-26 22:04:49 -07:00
Brad Hefta-Gaub
c6f0410f4a Merge pull request #6192 from AlessandroSigna/controllers 
fix keyboard mapping (keyboardMouse.js)
 2015-10-26 20:02:45 -07:00
howard-stearns
cbade6a095 Do not shut down hydra when it says there are no devices. Count to 
allowedHydraFailures in settings.
 2015-10-26 19:27:22 -07:00
AlessandroSigna
5bce95189b fix keyboard mapping (keyboardMouse.js) 2015-10-26 18:14:57 -07:00
James B. Pollack
c8e1aca4b6 fix box dimensions 2015-10-26 18:10:45 -07:00
James B. Pollack
7a7f649bf7 change from far grab to near grab 2015-10-26 17:55:13 -07:00
James B. Pollack
2d873012a3 make reset buttons invisible entities instead of text 2015-10-26 17:51:55 -07:00
Howard Stearns
5e66207bc6 Merge pull request #6190 from hyperlogic/tony/owen-ik-fix 
Bug fix for hand IK when using the Owen avatar.
 2015-10-26 17:42:12 -07:00
Anthony J. Thibault
485e36d824 Bug fix for hand IK when using the Owen avatar. 
The IK was assiming that the "Hips" bone index was always 0.
This was not the case for Owen.  Now we lookup the Hips index
and cache it for use during the hipsOffset computation.
 2015-10-26 17:17:46 -07:00
Ryan Huffman
2abb6a2fd5 Clean up line.js 2015-10-26 16:45:58 -07:00
Ryan Huffman
1a1ab29978 Add lineExample.js 2015-10-26 16:45:43 -07:00
James B. Pollack
da5db326e8 make cat quieter 2015-10-26 16:03:10 -07:00
James B. Pollack
90131f1291 make target reset wider 2015-10-26 16:00:14 -07:00
James B. Pollack
f436857a62 add reset buttons for basketballs and targets 2015-10-26 15:28:35 -07:00
Brad Hefta-Gaub
55d0b8a99e Merge pull request #6181 from jherico/capi 
Remove new/old value division from endpoint::apply
 2015-10-26 14:58:11 -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
85a975b1f4 Merge pull request #6185 from Atlante45/cmake 
Remove cmake debug code
 2015-10-26 14:54:01 -07:00
Seth Alves
7d9b566d0a Merge branch 'cmake' of github.com:Atlante45/hifi into fix-actions-ttl 2015-10-26 14:51:39 -07:00
black plastick
f5d12ee2c6 Added AvatarList script events for assigment client scripts: 
AvatarList.avatarAddedEvent(sessionUUID);
    AvatarList.avatarRemovedEvent(sessionUUID);
 2015-10-26 17:46:08 -04:00
Seth Alves
0dff037f56 fuck you, const! 2015-10-26 13:55:07 -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
samcake
990764d855 Really fixing the MovingAverage class... 2015-10-26 13:29:13 -07:00
Ryan Huffman
913026280c Fix EntityTreeRenderer dropping contact end events 2015-10-26 13:02:39 -07:00
Ryan Huffman
837430329b Fix collision start/end in single physics simulation to be lost 2015-10-26 13:02:17 -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