Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-06-04 14:30:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55173 commits 6 branches 1 tag 1.1 GiB
Commit graph

55173 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
e0dd047263 Merge pull request #10472 from zfox23/snapshot_fixSnapshotDeletion 
Snapshots: Fix case when user story would be incorrectly deleted
 2017-05-16 12:54:10 -07:00
Zach Fox
aa0394c2ef Fix case when user stories would be incorrectly deleted 2017-05-16 11:07:03 -07:00
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
Chris Collins
3018c30427 Merge pull request #10467 from highfidelity/RC-39-Hotfix 
Build 39.1 Hotfix for T-Pose avatars
 2017-05-15 21:19:47 -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
Zach Fox
0510572a2f Thanks to Andrew! 2017-05-15 20:12:13 -07:00
Zach Fox
0738c7fce7 Improve the test - thanks Dave! 2017-05-15 20:11:56 -07:00
Zach Fox
a2950be5e7 Force _identityUpdatedAt to stay above 0 2017-05-15 20:11:49 -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
Atlante45
cde7d68570 Fix domain settings not getting cleared on re-assignment 2017-05-15 18:20:47 -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
Chris Collins
bbe27975dc Merge pull request #10399 from highfidelity/RC-39 
Beta Release 39 - Includes up to Developer Release 6457
 2017-05-15 13:48:27 -07: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
Sam Cake
91d439442d warning -1 2017-05-14 17:45:52 -07:00
samcake
9d6cf5b7f8 not testing in storage for alignment 2017-05-14 17:45:46 -07:00
samcake
05ad4b13a5 Replace the alignment test by a nice function 2017-05-14 17:45:41 -07:00
samcake
62f2bf722d Adding a comment for debug sake 2017-05-14 17:45:34 -07:00
samcake
833eb0b527 Fixing the test... 2017-05-14 17:45:29 -07:00
samcake
665316a574 Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-14 17:45:22 -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
Zach Fox
6720c0c02b Fix the twitter mention 2017-05-14 17:36:05 -07:00
Zach Fox
806b6e1acf Clarifying comments 2017-05-14 17:35:53 -07:00
Zach Fox
81706c1502 Finally, the actual fix? 2017-05-14 17:35:45 -07:00
Zach Fox
97f67e27d1 This is a better method. 2017-05-14 17:35:39 -07:00