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

55395 commits

This branch
This branch
All branches
Author SHA1 Message Date
samcake
56e9b1bb37 Adding the populated counter 2017-05-19 18:46:19 -07:00
samcake
c5b5aa93b1 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-19 18:13:42 -07:00
David Rowe
a279d581ae Fix code order 2017-05-20 12:56:23 +12:00
samcake
c449229850 Cleaned up the counters for memory 2017-05-19 17:52:56 -07:00
David Rowe
768415695d Tidying 2017-05-20 12:43:47 +12:00
David Rowe
eef707e4e9 Simplify code 2017-05-20 12:42:40 +12:00
David Rowe
d9baa337d8 Fix call order 2017-05-20 12:41:50 +12:00
Seth Alves
a45b5599c9 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-19 17:37:03 -07:00
Clément Brisset
6e89f7d2f9 Merge pull request #10512 from Atlante45/fix/running-marker 
Fix "Reset Settings" window poping up every time
 2017-05-19 17:36:00 -07:00
Seth Alves
40c8261111 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-19 17:14:58 -07:00
Seth Alves
5c94147f40 children collision hulls appear to be in the right place, now 2017-05-19 17:09:42 -07:00
David Rowe
597312ff45 Reinstate missing guards 2017-05-20 12:08:01 +12:00
Chris Collins
22aca527af Merge pull request #10516 from zfox23/incrementAgentIdentitySequenceId 
Increment _identitySequenceId before sending ID packet for agents
 2017-05-19 17:04:37 -07:00
Zach Fox
487319f7ef Increment _identitySequenceId before sending ID packet for agents 2017-05-19 16:53:25 -07:00
Clément Brisset
fa3ef25f3e Merge pull request #10481 from marko8904/new_landing_in_welcome 
changing the location in welcome to which a user is sent on the first run
 2017-05-19 16:45:14 -07:00
Dante Ruiz
ffcc3c8df9 going back to old lost tracking method 2017-05-20 00:06:54 +01:00
Andrew Meadows
f80e7a3743 less obfuscation 2017-05-19 15:58:54 -07:00
Andrew Meadows
d3956b47d0 remove bad break 2017-05-19 15:35:29 -07:00
Andrew Meadows
bb4d366c40 use SmartPointer for Zone _model 2017-05-19 15:33:23 -07:00
Ryan Huffman
daff53aefb Merge pull request #10505 from huffman/feat/tutorial-update-skybox 
Update content set URL for RC40
 2017-05-19 15:32:27 -07:00
Seth Alves
67f222cb3f be more careful about fixing up entities which arrived before their parents 2017-05-19 15:19:16 -07:00
David Rowe
0d6513c7dc Merge branch 'master' into 21359 2017-05-20 10:11:25 +12:00
Ryan Huffman
26247e8653 Add check for valid mutableData in assignMipData 2017-05-19 15:00:53 -07:00
Seth Alves
386c76545c be more careful about fixing up entities which arrived before their parents 2017-05-19 14:21:05 -07:00
Seth Alves
54dafa0f83 be more careful about fixing up entities which arrived before their parents 2017-05-19 14:14:00 -07:00
Seth Alves
5c93dbd20d be more careful about fixing up entities which arrived before their parents 2017-05-19 13:48:29 -07:00
Andrew Meadows
7b879a7964 Model has a Rig rather than a RigPointer 2017-05-19 13:24:16 -07:00
Seth Alves
936d0e2d50 be more careful about fixing up entities which arrived before their parents 2017-05-19 12:13:43 -07:00
Zach Fox
5e8f120138 Merge pull request #10510 from zfox23/snapshots_ImproveUploadRobustness 
Ensure snapshots without story_ids get uploaded
 2017-05-19 11:57:21 -07:00
Ryan Huffman
64bf5784e6 Fix FileStorage to not close files after they are opened 
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
 2017-05-19 11:16:20 -07:00
Ryan Huffman
c36b85bb05 Add notes to KtxStorage::maybeOpenFile 2017-05-19 11:11:00 -07:00
Seth Alves
735e4b7d05 trying to get child collision hulls to be in the right place after import 2017-05-19 10:59:59 -07:00
Anthony J. Thibault
6ae2e6778e ensure left and right arm flexCoeff are the same. 2017-05-19 10:51:09 -07:00
Atlante45
c2e2682eff Fix "Reset Settings" window poping up every time 2017-05-19 10:50:23 -07:00
Seth Alves
7220fe0ad8 set more physics flags dirty when an entity parent is found 2017-05-19 10:40:24 -07:00
Anthony J. Thibault
621d94eb91 removed temp comments 2017-05-19 10:38:16 -07:00
Zach Fox
6765451cc8 Ensure snapshots without story_ids get uploaded 2017-05-19 10:36:31 -07:00
Marko Kudjerski
986d63cdbb making sure that the first time landing in *welcome domain is updated for dev builds too 2017-05-19 10:17:02 -07:00
Marko Kudjerski
303bb05b3d changing the location in welcome to which a user is sent on the first run 2017-05-19 10:17:02 -07:00
Seth Alves
77ce8a19cf call entityChanged after settings flags 2017-05-19 10:11:02 -07:00
Seth Alves
0c12baa258 call entityChanged after settings flags 2017-05-19 09:57:42 -07:00
Seth Alves
99dfd9ded1 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-19 08:26:02 -07:00
Chris Collins
76a025aade Merge pull request #10507 from Atlante45/merge-back 
Merge Stable back into master
 2017-05-19 06:58:10 -07:00
Ken Cooke
746b41e509 Fix typo in comments 2017-05-18 17:30:07 -07:00
Atlante45
ee9b98ffd7 Merge branch 'stable' of https://github.com/highfidelity/hifi 2017-05-18 17:11:45 -07:00
Ken Cooke
205b9d4aec Fix compiler warnings 2017-05-18 16:49:02 -07:00
Ryan Huffman
eb9acad42e Update content set URL for RC40 2017-05-18 16:36:01 -07:00
Anthony J. Thibault
e99001d86c debug draw ik chains, bug fix for flex coef on tips 
And opened up hip constraints.
 2017-05-18 16:29:55 -07:00
Zach Fox
48200fbd07 Merge pull request #10501 from zfox23/snapshots_disableWhileProcessing 
Prevent another GIF from being captured while one is processing
 2017-05-18 15:53:57 -07:00
Ryan Huffman
72af4219b8 Merge pull request #10499 from huffman/fix/ktx-progressive-image-size 
Fix ktx image size in progrssively loaded cubemaps
 2017-05-18 15:26:52 -07:00