Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 19:35:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13894 commits 76 branches 59 tags 1.2 GiB
Commit graph

13894 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrzej Kapolka
3293ab788b Fix for script object deltas. 2014-06-09 17:19:36 -07:00
Andrzej Kapolka
496b0f1673 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-09 16:52:03 -07:00
Andrzej Kapolka
590f045ed1 Script value streaming tests, fixes. 2014-06-09 16:51:41 -07:00
Andrzej Kapolka
78ad06f61c Merge pull request #3005 from AndrewMeadows/bug-fix 
Fix IK for hydra hands.
 2014-06-09 16:29:11 -07:00
Andrew Meadows
589b2e8fb7 recover some code for one less magic vec3 2014-06-09 16:12:54 -07:00
Andrew Meadows
e8b6338de9 Fix IK for hydra hands. 2014-06-09 15:40:29 -07:00
wangyix
8312e1642d replaced takeFirst() with dequeue() for consistency 2014-06-09 15:15:43 -07:00
Stojce Slavkovski
3a6cbc257c Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-10 00:08:28 +02:00
Stojce Slavkovski
e25817cd88 switch to amazon image resources 2014-06-10 00:08:10 +02:00
matsukaze
c8c8bccbf3 Job #19766 BUG: Stop or reload all scripts crashes interface fixed. 
QUrl(name).toString() does not equal name, therefore removing name from
ScriptEngineHash was failing, and a dangling pointer was left in the
script engine hash map.
 2014-06-09 17:52:50 -04:00
Andrzej Kapolka
7bf8fd155d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-09 14:35:39 -07:00
Andrzej Kapolka
fd469c543c More script streaming bits. 2014-06-09 14:35:20 -07:00
matsukaze
a8d504fc81 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-06-09 17:29:50 -04:00
Leonardo Murillo
adac661e9f Merge pull request #3003 from birarda/master 
add a crash guard for negative silent samples
 2014-06-09 15:15:18 -06:00
Stephen Birarda
ee71d34f02 add a crash guard around negative silent samples 2014-06-09 14:03:47 -07:00
Brad Hefta-Gaub
6cf30cf9d1 Merge pull request #3002 from wangyix/master 
added code to nack and re-send dropped octree data packets
 2014-06-09 13:52:21 -07:00
wangyix
e45f2fed4b changed writelock to readlock 
plus a coding standard fix
 2014-06-09 13:42:45 -07:00
Brad Hefta-Gaub
2a4e6a1311 Merge pull request #3001 from Barnold1953/OculusOverlay 
Simple raypicking for scripts with oculus rift.
 2014-06-09 13:21:24 -07:00
wangyix
ff2a5342ee removed another extra space 2014-06-09 12:57:50 -07:00
wangyix
412d3e19fe removed debug prints in parseNackPacket() 2014-06-09 12:56:00 -07:00
wangyix
0fce7e721a removed more spaces 2014-06-09 12:40:01 -07:00
wangyix
968ea3563c removed an extra space 2014-06-09 12:37:42 -07:00
wangyix
aa694d6967 removed debug code 2014-06-09 12:35:26 -07:00
wangyix
f13ae84da6 Merge branch 'packet_recovery_pull' 2014-06-09 12:04:12 -07:00
wangyix
529dd827a2 moved around code in sendNack() a bit 2014-06-09 12:00:19 -07:00
Andrzej Kapolka
32cf08ce65 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-09 11:55:30 -07:00
barnold1953
936f04cece Simple raypicking for scripts with oculus rift. 2014-06-09 11:55:29 -07:00
Andrzej Kapolka
28490f9bbc Merge pull request #2994 from AndrewMeadows/ragdoll 
Ragdoll Part 2: make MyAvatar's skeleton's collision shapes follow ragdoll
 2014-06-09 11:55:19 -07:00
Andrzej Kapolka
58bd1f7ab5 More script streaming bits. 2014-06-09 11:54:43 -07:00
Andrew Meadows
4f9da0cc37 fix whitespace formatting 2014-06-09 11:50:31 -07:00
Andrzej Kapolka
e936697cf0 Merge pull request #2987 from leechfarm/master 
Fix for users with some special characters in their password not being able to log in
 2014-06-09 11:31:30 -07:00
AndrewMeadows
d8f21b9f44 Merge pull request #3000 from ey6es/master 
Avoid crash on zero-length normals.
 2014-06-09 11:29:49 -07:00
wangyix
3bc457d4d2 added octree scene stats locking and unlocking 2014-06-09 11:14:02 -07:00
Andrzej Kapolka
a1e208ae3d Simplification. If the normal is zero, then the cross product will also be 
zero, so we can just have the one check and postpone normalization until
afterwards.
 2014-06-09 11:03:50 -07:00
Andrzej Kapolka
6eac0ee2ae Avoid crash on zero-length normals. 2014-06-09 10:58:56 -07:00
Andrzej Kapolka
ae22aa1a21 Working on JS type streaming. 2014-06-09 10:53:44 -07:00
Andrzej Kapolka
4d423c679c Added some typedefs to simplify the various mapping types. 2014-06-09 10:21:55 -07:00
Andrzej Kapolka
45c35d3a68 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-09 10:05:09 -07:00
AndrewMeadows
5ed1dfc4b0 Merge pull request #2999 from ey6es/metavoxels 
Provide a way to stream enums that aren't object properties, added tests for delta streaming, fixed Windows initialization bug.
 2014-06-09 08:48:20 -07:00
Stojce Slavkovski
2cde2f5303 use worklist for assets 2014-06-08 16:03:43 +02:00
Stojce Slavkovski
83b096ca1d myBalance 
- balance formatting
	- symbol layout changes
 2014-06-08 15:56:37 +02:00
Stojce Slavkovski
939f8c49de return balance in satoshis 2014-06-08 15:55:16 +02:00
Stojce Slavkovski
b3279e03ca references fix 2014-06-07 23:27:51 +02:00
Stojce Slavkovski
8de2bdfb99 expose account details via AccountScriptingInterface 2014-06-07 23:17:49 +02:00
Stojce Slavkovski
39c1daca43 Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 22:29:36 +02:00
Stojce Slavkovski
976b76ac85 myBalance new layout changes 2014-06-07 22:29:06 +02:00
Stojce Slavkovski
6365f6b857 Extend TextOverlay to accept font size 
Fix TextRenderer color rendering
 2014-06-07 22:24:35 +02:00
Brad Hefta-Gaub
8f71335bec Merge pull request #2993 from Atlante45/temp_branch 
More editModels.js work
 2014-06-07 09:17:30 -07:00
Stojce Slavkovski
9810335adf Merge branch 'master' of https://github.com/worklist/hifi into 19755 2014-06-07 10:33:41 +02:00
Stojce Slavkovski
fea1433ced Add initial mybalance script 2014-06-07 10:32:36 +02:00