Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-06 04:40:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55087 commits 21 branches 0 tags 1.2 GiB
Commit graph

55087 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony J. Thibault
be7a9a2383 warning fixes 2017-05-16 11:00:25 -07:00
Ryan Huffman
8eacf0ad4b Remove unnecessary assert in Model.cpp 
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
 2017-05-16 10:56:33 -07:00
Andrew Meadows
e9c703b147 add deprecation log for DYNAMIC_TYPE_SPRING 2017-05-16 10:34:39 -07:00
Andrew Meadows
d705f529a0 use 'tractor' instead of 'spring' in JS files 2017-05-16 08:35:54 -07:00
Andrew Meadows
e6accb61b0 more purging of legacy 'Spring' action 2017-05-16 08:09:20 -07:00
Andrew Meadows
9b3754c2ee remove unused API from ObjectDynamic and friends 2017-05-15 22:13:03 -07:00
Andrew Meadows
9e08dadaf4 Remove ObjectActionSpring 2017-05-15 22:11:42 -07:00
David Rowe
0cd5fe35da Lint 2017-05-16 15:54:55 +12:00
David Rowe
8ab261d1b0 Work around Script.clearTimeout() occasionally failing 2017-05-16 15:52:34 +12:00
Liv Erickson
32fd905918 style pass 2017-05-15 20:49:30 -07:00
Liv Erickson
ae458dcbcf changing models to more generally reference entities in comment 2017-05-15 20:33:22 -07:00
David Rowe
4b175e98e9 Delete persistence entity if recording fails to load for manual playback 2017-05-16 15:30:30 +12:00
Liv Erickson
a606f8a8d4 Fixing code style 2017-05-15 20:28:48 -07:00
David Rowe
6d9bf2b33e Typos 2017-05-16 13:58:42 +12:00
Liv
08eb6442b5 Add function findEntitiesByType EntityScriptingInterface 
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
 2017-05-15 18:36:36 -07:00
Andrew Meadows
9a4b624029 Merge pull request #10464 from zfox23/fixIdentityUpdatedAt_FINAL_REAL_V2 
Implement PR10462 correctly & fix identity packet bugs again
 2017-05-15 17:50:58 -07:00
Zach Fox
bc1e97032a Thanks to Andrew! 2017-05-15 17:39:19 -07:00
David Rowe
6bdd498ecf Cancel autoplay when manually playing 2017-05-16 10:47:52 +12:00
Zach Fox
64ae5119ae Merge pull request #10462 from zfox23/fixIdentityUpdatedAt 
Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs
 2017-05-15 15:44:26 -07:00
Zach Fox
e492ca9364 Improve the test - thanks Dave! 2017-05-15 14:55:05 -07:00
Zach Fox
a2a24b22a8 Force _identityUpdatedAt to stay above 0 2017-05-15 14:25:47 -07:00
David Rowe
5c5eb298f5 Better error message 2017-05-16 09:20:58 +12:00
David Rowe
8480a8e7d5 Merge branch 'master' into 21334 2017-05-16 08:52:31 +12:00
Sam Gateau
1e42878d7f Merge pull request #10460 from samcake/orange 
Fix the default skybox texture
 2017-05-15 13:38:41 -07:00
samcake
0b393c845a Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2017-05-15 13:38:03 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation 
cleanup Head::simulate() code
 2017-05-15 11:21:43 -07:00
Seth Alves
8ff8d70f84 Merge pull request #10457 from vladest/sit-script-crash 
Fix crash in sit script
 2017-05-15 11:07:37 -07:00
Seth Alves
d7432048a0 Merge pull request #10456 from vladest/market-crash-fix 
Market crash fix
 2017-05-15 10:58:02 -07:00
samcake
b627fe463b Generate correct KTX for the default Sky 2017-05-15 10:50:10 -07:00
Anthony J. Thibault
1e276d113c Added support for weights per target 2017-05-15 09:26:24 -07:00
Anthony J. Thibault
67fbb15faa WIP: initial implementation of flexCoefficients 2017-05-15 09:26:23 -07:00
Chris Collins
263e4de951 Merge pull request #10454 from samcake/orange 
Fixing potential crashes when loading  invalid KTX cached textures
 2017-05-14 17:41:06 -07:00
ZappoMan
9c81a89ac3 add test script 2017-05-14 08:37:26 -07:00
ZappoMan
149750fe21 make the octree sparse 2017-05-14 08:36:54 -07:00
Philip Rosedale
6e82343b29 Merge pull request #10406 from amvmoody/21289 
21289 - Edit: Add the ability to duplicate an object with hand controller
 2017-05-13 20:43:52 -07:00
Vladyslav Stelmakhovskyi
cc10fc81b7 Fix crash in sit script 2017-05-13 20:57:04 +02:00
Brad Hefta-Gaub
ed7a63c89c Merge pull request #10451 from druiz17/puck-lost-tracking 
Better handing when the pucks lose tracking and openvr still send you a "valid" data
 2017-05-13 10:20:42 -07:00
ZappoMan
5065c7c5c4 more warning fixes 2017-05-13 10:17:59 -07:00
ZappoMan
da404ce2ce fix warning 2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi
49a45f0300 Merge branch 'master' into market-crash-fix 2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi
20c27fc133 Fix crash on save Map data settings from scripts 2017-05-13 14:20:28 +02:00
Sam Cake
b38be7e561 warning -1 2017-05-12 20:20:03 -07:00
ZappoMan
dcb70aa504 more cleanup 2017-05-12 19:03:08 -07:00
ZappoMan
4af3c760e6 more cleanup 2017-05-12 18:57:33 -07:00
ZappoMan
f1bd06cfa0 cleanup some unneeded class 2017-05-12 18:33:28 -07:00
samcake
c4e8885842 not testing in storage for alignment 2017-05-12 18:27:58 -07:00
samcake
f35b0297fa Replace the alignment test by a nice function 2017-05-12 18:25:07 -07:00
samcake
d734358290 Adding a comment for debug sake 2017-05-12 18:15:00 -07:00
samcake
5bc8e09865 Fixing the test... 2017-05-12 18:10:48 -07:00
samcake
bdb0414add Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-12 18:04:22 -07:00