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

8248 commits

Author SHA1 Message Date
Seth Alves
62ff8bf735 set PROP_LAST_ITEM automatically 2015-04-08 17:07:20 -07:00
Seth Alves
51a0fdf3d4 formatting 2015-04-08 15:43:49 -07:00
Seth Alves
2448051c75 Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol 2015-04-08 15:39:40 -07:00
Seth Alves
1dd01cde00 expand svo to hold acceleration and id of current simulator node 2015-04-08 15:39:34 -07:00
Seth Alves
5c709e2638 quiet compiler 2015-04-08 15:39:07 -07:00
Philip Rosedale
52f82b0768 Merge pull request #4613 from samcake/orange 
fix the rendering bug on mac release
 2015-04-08 11:27:06 -07:00
samcake
4fb5c8f907 fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from. 2015-04-08 11:04:13 -07:00
Andrew Meadows
ad33bf0dfb Merge pull request #4609 from sethalves/island 
physics collision model extents, more vhacd changes
 2015-04-08 09:02:36 -07:00
Philip Rosedale
b949353b0b Merge pull request #4611 from AndrewMeadows/isentropic 
use DynamicCharacterController
 2015-04-08 08:03:01 -07:00
Andrew Meadows
2ccc25e380 remove old kinematic CharacterController 2015-04-07 16:29:52 -07:00
Andrew Meadows
40c94fa00e merge upstream/master into andrew/isentropic 2015-04-07 16:23:38 -07:00
Andrew Meadows
d9146b1033 jump to hover works again 2015-04-07 16:23:06 -07:00
Seth Alves
e8ff727c61 when populating shape-info, give the dimensions of the collision model rather than those of the visual model 2015-04-07 15:47:13 -07:00
Seth Alves
3cfafea5ca Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 15:09:50 -07:00
Andrew Meadows
b5f0c57dd1 jumping and hovering works with dynamic controller 2015-04-07 15:07:46 -07:00
Sam Gateau
ad9129b552 Fixing all the shaders for entities to work correctly with the now supported color attribute field 2015-04-07 14:26:45 -07:00
David Rowe
43a130dabe Fix Stop button not working at the end of a non-looped animation 2015-04-07 14:02:42 -07:00
Sam Gateau
f0efade06d Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-07 12:56:21 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Sam Gateau
9d6839e6a1 Merge branch 'temp1' of https://github.com/samcake/hifi into orange 2015-04-07 11:45:57 -07:00
Sam Gateau
25643479c9 Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly 2015-04-07 11:20:55 -07:00
Seth Alves
bc9e818b95 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-07 11:12:16 -07:00
Sam Gateau
88afb3cedc solution to the color attribute case 2015-04-07 10:04:51 -07:00
Seth Alves
ef5dffecf6 fix filenames in comments 2015-04-07 10:03:14 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Sam Gateau
dee651069c adding support for color attribute in FBX, and displaying it correctly 2015-04-06 23:33:13 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Seth Alves
cd5245d0d6 logging group for render-utils 2015-04-06 18:16:01 -07:00
Seth Alves
55bab2efd6 put physics into its own logging group 2015-04-06 18:09:45 -07:00
Sam Gateau
7f46736bb4 playing with the shadwos 2015-04-06 17:17:25 -07:00
Seth Alves
3efcc3684e split out octree logging 2015-04-06 17:05:09 -07:00
Seth Alves
91861e9e5a split out octree logging 2015-04-06 17:04:49 -07:00
Seth Alves
8bd77fbcc7 separate out logging for fbx and gpu libraries 2015-04-06 16:52:31 -07:00
Seth Alves
074e476797 put entities-renderer logging into its own QLoggingCategory 2015-04-06 16:30:20 -07:00
Seth Alves
d4461f1ecb put avatars and embedded-webserver and entities logging into their own QLoggingCategory 2015-04-06 16:22:54 -07:00
Andrew Meadows
e2ea940249 more cleanup 2015-04-06 16:21:04 -07:00
Andrew Meadows
23951620bb cleanup DynamicCharacterController 2015-04-06 16:19:14 -07:00
Seth Alves
257d66441a put audio-client logging into its own QLoggingCategory 2015-04-06 16:03:28 -07:00
Andrew Meadows
435ce106eb Add DynamicCharacterController prototype 2015-04-06 16:03:13 -07:00
Seth Alves
7af32bd67a put audio and script-engine logging into their own QLoggingCategory 2015-04-06 15:57:18 -07:00
Sam Gateau
07e7f6ea1d FIx review comments 2015-04-06 15:40:29 -07:00
Seth Alves
cb7ff86386 put networking library into its own QLoggingCategory 2015-04-06 15:11:48 -07:00
Seth Alves
d5832f04dc Merge branch 'master' of github.com:highfidelity/hifi into logging-cleanup 2015-04-06 14:45:00 -07:00
Sam Gateau
4abc760db1 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 12:24:41 -07:00
Sam Gateau
4aa695d5f3 fixed an issue with skinned normaled map models not doing the correct transformation 2015-04-06 12:24:01 -07:00
Andrew Meadows
f51a259909 Merge pull request #4598 from sethalves/fix-linux-audio 
avoid repeatedly calling QAudioDeviceInfo::availableDevices on linux
 2015-04-06 10:51:24 -07:00
Sam Gateau
7de54917b8 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-06 10:20:23 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
a85daaee41 COmmented the review questions in code 2015-04-06 10:03:47 -07:00
Sam Gateau
d6f74aa0ad Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-06 09:56:16 -07:00
Seth Alves
2fbfa34c5c removed uneeded logging 2015-04-06 09:14:53 -07:00
Seth Alves
347603269b Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-06 09:07:36 -07:00
Clément Brisset
efbd74f539 Merge pull request #4597 from huffman/light-overlays 
Light overlays
 2015-04-06 16:02:44 +02:00
Sam Gateau
10269bd556 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-04-05 18:37:28 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Seth Alves
076209ab74 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-04 15:01:26 -07:00
Seth Alves
e06dada756 Merge pull request #4592 from AndrewMeadows/thermonuclear 
profiling for physics simulation
 2015-04-04 15:00:44 -07:00
Andrew Meadows
568050686d replace tabs with spaces for indentation 2015-04-04 13:50:16 -07:00
Seth Alves
61fb9adfca avoid calling QAudioDeviceInfo::availableDevices once per second on linux because it blocks the audio thread for ~1 second each time 2015-04-03 19:36:22 -07:00
Seth Alves
fb2f33d037 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-03 19:30:15 -07:00
Sam Gateau
17743c6013 FIxed the broken shadows 2015-04-03 17:58:21 -07:00
Sam Gateau
3b5c8d7b38 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 17:32:34 -07:00
ZappoMan
7f4c577e80 end of file 2015-04-03 17:25:39 -07:00
Sam Gateau
38d1e29a1d getting ready for pr for a few syntax issues 2015-04-03 17:16:18 -07:00
Sam Gateau
2dcabb97b4 getting ready for pr for a few syntax issues 2015-04-03 17:10:51 -07:00
Sam Gateau
b8db0ff2d7 getting ready for pr for a few syntax issues 2015-04-03 17:05:08 -07:00
ZappoMan
1a463a0256 more work on improved avatar UI adding model names and backward compatible support 2015-04-03 17:03:22 -07:00
Seth Alves
9ef9452cf6 make filename extension checking less wrong 2015-04-03 16:39:45 -07:00
Ryan Huffman
5fd960fb43 Add entity light cutoff/dimensions constraints 2015-04-03 15:32:53 -07:00
Andrew Meadows
abd78fede5 fix: change of dimensions would not update physics 2015-04-03 15:11:57 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Sam Gateau
3f581d03d2 mirror means we render the Closkwise side 2015-04-03 10:45:30 -07:00
Sam Gateau
7718680091 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-04-03 10:33:24 -07:00
Sam Gateau
6f5c411a46 Fixing a few issues and syntax, trying to understand why the shadows are not rendering correctly 2015-04-03 10:32:20 -07:00
Andrew Meadows
223c62c6f9 Merge pull request #4587 from jherico/warnings 
Working on removing some of the warnings in the xcode build
 2015-04-03 09:31:36 -07:00
Clément Brisset
7bd6d5ca5b Merge pull request #4588 from ZappoMan/svoImportFixes 
add logging for delete operations in the server
 2015-04-03 17:51:36 +02:00
ZappoMan
45ab438339 add logging for delete operations in the server 2015-04-02 16:44:04 -07:00
Bradley Austin Davis
44c9d4a742 Working on removing some of the warnings in the xcode build 2015-04-02 16:12:44 -07:00
Andrew Meadows
27d6d9f720 add Bullet profiling hooks for physics simulation 2015-04-02 15:20:16 -07:00
Seth Alves
cc7cda39f1 Merge pull request #4586 from ZappoMan/svoImportFixes 
BUG FIX - Import entities sometimes fails
 2015-04-02 14:30:06 -07:00
ZappoMan
84940d8e43 fix SVO import 2015-04-02 14:13:19 -07:00
Clément Brisset
c7540af787 Merge pull request #4585 from birarda/no-gpu-link 
fix for resampled stereo audio array size
 2015-04-02 21:31:53 +02:00
Stephen Birarda
3f079e10aa user AudioConstants for size of int16_t 2015-04-02 11:35:23 -07:00
Stephen Birarda
41290dd3e3 push data pointer for recursive read from front 2015-04-02 11:34:39 -07:00
Stephen Birarda
164c06a190 fix resampled stereo audio array size 2015-04-02 10:41:52 -07:00
Andrew Meadows
a824403132 Merge pull request #4582 from sethalves/island 
Comma toggles rendering of collision hulls; more changes to vhacd stuff
 2015-04-02 10:37:17 -07:00
Seth Alves
41ec2fdbe3 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-02 09:19:54 -07:00
Andrew Meadows
fc4e6e9355 merge upstream/master into andrew/bispinor 2015-04-02 09:04:15 -07:00
Andrew Meadows
f4f219ca36 tweak jump velocity and hover transition 2015-04-02 09:03:33 -07:00
Andrew Meadows
f804b2311d remove hover-friendly behavior 2015-04-02 08:40:47 -07:00
Clément Brisset
01dc1b058c Merge pull request #4580 from birarda/master 
use non-persistent settings to avoid lobby crash confusion
 2015-04-02 17:37:24 +02:00
Seth Alves
57a4f3abe3 clear _saveNonCollisionGeometry when it's not needed, remove some debug prints 2015-04-02 06:57:27 -07:00
Seth Alves
abf83bcf9e Merge branch 'master' of github.com:highfidelity/hifi into island 2015-04-01 18:26:26 -07:00
Seth Alves
eb78fa0f85 if switching to the mode where collision hulls are drawn, updateGeometry and simulate 2015-04-01 18:24:25 -07:00
Seth Alves
997f7251c7 dont need _collisionGeometryScale 2015-04-01 18:23:43 -07:00
Seth Alves
78af7f900e don't need _collisionGeometryScale 2015-04-01 18:23:25 -07:00
Seth Alves
bfab522ee7 debuging render mode 2015-04-01 17:52:30 -07:00
Seth Alves
8940ba0c2a new member variables related to rendering collision hulls 2015-04-01 17:52:18 -07:00
Seth Alves
00449ef7c0 new member variable to remember the order in which meshes appeared in the model file 2015-04-01 17:50:35 -07:00
Seth Alves
36cd69c38a new member variable to remember the order in which meshes appeared in the model file 2015-04-01 17:50:20 -07:00
Seth Alves
420424a5ee make it possible to sort meshes into the same order they appear in the model file 2015-04-01 17:49:49 -07:00
Seth Alves
81200bb2a0 save collision hull scaling in model 2015-04-01 17:49:01 -07:00
Stephen Birarda
b27a86fb25 always render yourself, handle change of render values elsewhere 2015-04-01 17:36:43 -07:00
Andrew Meadows
b537625e59 Merge pull request #4574 from ZappoMan/crashOnExit 
fix crash on shutdown related to entity scripts connecting to signals
 2015-04-01 17:26:33 -07:00
Stephen Birarda
ee088e12f3 leverage scene scripting values to toggle rendering 2015-04-01 17:06:06 -07:00
Stephen Birarda
3f4a9c64f9 add render bools to the scene scripting interface 2015-04-01 16:53:17 -07:00
Andrew Meadows
b37384d759 exit hover now not quite automatic when over floor 
remove MyAvatar::jump() method for more general API
 2015-04-01 15:13:27 -07:00
ZappoMan
d87fe9efff fix typo 2015-04-01 14:47:04 -07:00
ZappoMan
c66db5d8e4 another approach 2015-04-01 14:43:27 -07:00
ZappoMan
d7188bac0b another approach 2015-04-01 14:38:01 -07:00
Andrew Meadows
0249b8c9c5 fix backwards comparison logic 2015-04-01 13:56:05 -07:00
Ryan Huffman
f0dd20b21e Merge pull request #4570 from samcake/orange 
Clean up the sunLightExample.js and create the cookies.js
 2015-04-01 13:55:03 -07:00
ZappoMan
aac824fb99 fix crash on shutdown 2015-04-01 13:47:25 -07:00
Brad Hefta-Gaub
1de1527414 Merge pull request #4569 from ctrlaltdavid/20431 
CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading
 2015-04-01 13:00:16 -07:00
Sam Gateau
3b92910a91 Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters 2015-04-01 12:22:35 -07:00
Andrew Meadows
e27f800c75 Merge pull request #4561 from sethalves/island 
scaling hints to hash, larger collision shapes
 2015-04-01 09:40:18 -07:00
Stephen Birarda
a1f1f7603d Merge pull request #4564 from PhilipRosedale/master 
Buttons at bottom in dice, gun so not to conflict with edit.js
 2015-04-01 09:06:34 -07:00
Sam Gateau
ad11503466 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-31 23:12:17 -07:00
Philip Rosedale
8114fdd1e2 move button locations, names some constants in avatar controller 2015-03-31 21:51:50 -07:00
Seth Alves
380d03b3b2 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 19:00:19 -07:00
Stephen Birarda
1d5f1807f7 Merge pull request #4562 from sethalves/editors-are-rezzers 
add a bool value to Node which indicates if it is allowed to rez new ent...
 2015-03-31 18:53:29 -07:00
Seth Alves
8bca8ad4ef bump protocol versions for PacketTypeDomainList and PacketTypeDomainListRequest 2015-03-31 18:37:42 -07:00
Seth Alves
4e83301c65 add a bool value to Node which indicates if it is allowed to rez new entities 2015-03-31 18:27:46 -07:00
Philip Rosedale
6a171c2f22 Merge pull request #4559 from birarda/constant-metaverse-url 
add a networking constants class with the metaverse server URL
 2015-03-31 18:13:41 -07:00
Sam Gateau
0d721ec1e9 merging 2015-03-31 17:47:05 -07:00
Sam Gateau
9b63739a72 Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations 2015-03-31 17:35:34 -07:00
Seth Alves
859628a4fd fix comment 2015-03-31 17:20:16 -07:00
Seth Alves
23c69ad9e1 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 17:19:59 -07:00
Seth Alves
d17289f566 Merge pull request #4556 from birarda/damaged-xcode 
handle a domain-server port change once connection initiated
 2015-03-31 17:12:01 -07:00
Andrew Meadows
7fb9427f29 Merge pull request #4549 from jherico/dbg_macro 
Enabling the use of #ifdef DEBUG as a platform neutral idiom
 2015-03-31 17:08:12 -07:00
Brad Hefta-Gaub
90498969e2 Merge pull request #4558 from birarda/master 
fix deadlock opportunity in killNodeWithUUID
 2015-03-31 17:00:50 -07:00
Seth Alves
164e5ff816 Merge branch 'master' of github.com:highfidelity/hifi into island 2015-03-31 17:00:48 -07:00
Stephen Birarda
e22b33e96d fix QUrl include for ubuntu 2015-03-31 17:00:04 -07:00
Seth Alves
05cb0b830c make max collision size be 1000x1000x1000 rather than 100x100x100 2015-03-31 16:59:43 -07:00
Seth Alves
bacd6445f2 pull comments that get used as scaling hints into a hash table 2015-03-31 16:59:13 -07:00
David Rowe
0a55bcb0c5 Remove XMLHttpRequest's facility to read local files 2015-03-31 16:56:04 -07:00
Stephen Birarda
61806935bb add a networking constants class with metaverse URL 2015-03-31 16:40:21 -07:00
Philip Rosedale
9635c6d248 Merge branch 'master' of https://github.com/worklist/hifi 2015-03-31 16:29:55 -07:00
Stephen Birarda
86174d6a29 Merge pull request #4551 from ZappoMan/neverCullAvatarParts 
never cull mesh parts for avatars
 2015-03-31 16:29:01 -07:00
Philip Rosedale
b7f0be761c gun buildings fall on creation, dice stops correctly 2015-03-31 16:27:09 -07:00
Stephen Birarda
64921c38b6 don't overlock in killNodeWithUUID 2015-03-31 16:25:22 -07:00
Stephen Birarda
cf7a6dda74 Merge branch 'master' of https://github.com/highfidelity/hifi into damaged-xcode 2015-03-31 16:14:59 -07:00
Stephen Birarda
740438d08d handle domain-server local port changes once connected 2015-03-31 16:11:41 -07:00
Brad Hefta-Gaub
b43761a6c1 Merge pull request #4545 from samcake/orange 
No more FLat global lighting, always use one of the SPherical harmonics presets
 2015-03-31 15:52:49 -07:00
Brad Hefta-Gaub
d77333953e Merge pull request #4552 from sethalves/island 
Fix various collision-model related bugs
 2015-03-31 15:47:53 -07:00
Sam Gateau
74f04c0c84 remove useless comment 2015-03-31 14:57:51 -07:00
Sam Gateau
07a36158e6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-03-31 14:46:56 -07:00
Seth Alves
af6ce8fb07 HERE COMES AN S 2015-03-31 14:37:41 -07:00
Seth Alves
48144a46b1 don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there. 2015-03-31 14:34:35 -07:00
Seth Alves
95cc8672c0 remove unneeded assert 2015-03-31 14:32:43 -07:00
ZappoMan
a889191916 never cull mesh parts for avatars 2015-03-31 14:27:34 -07:00
David Rowe
154dacf791 Fix typo 2015-03-31 14:21:56 -07:00
Seth Alves
55d506bb53 formatting 2015-03-31 14:04:49 -07:00
Seth Alves
ea2c5ff622 formatting 2015-03-31 14:04:33 -07:00
Seth Alves
9e0118492e make sure to not leave in-use resources in UnusedResource list 2015-03-31 14:04:21 -07:00
Seth Alves
347ef3c4e1 use scaling from visual model on collision model rather than using the bounds from the collision model 2015-03-31 14:03:37 -07:00
Stephen Birarda
3ed097ff86 Merge pull request #4548 from AndrewMeadows/inertia 
fix typo that broke avatar motion
 2015-03-31 13:42:20 -07:00
Bradley Austin Davis
02b69f4a70 Enabling the use of #ifdef DEBUG as a platform neutral idiom 2015-03-31 13:32:13 -07:00
Stephen Birarda
e5637a1f28 Merge pull request #4547 from ZappoMan/preloadOnImport 
fix issue with preload not being called on import
 2015-03-31 13:31:13 -07:00
Andrew Meadows
9739d68370 fix typo that broke avatar motion 2015-03-31 13:20:06 -07:00
Brad Hefta-Gaub
e27a89b7c3 Merge pull request #4539 from birarda/settings-thread-delete-later 
fix for cleanup of SettingsManager thread
 2015-03-31 13:09:06 -07:00
ZappoMan
df99c314aa fix issue with preload not being called on import 2015-03-31 12:44:44 -07:00
Sam Gateau
edf0ca2b06 Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset 2015-03-31 10:29:03 -07:00
Sam Gateau
d4dac0477b changed again the state field storage for hopefully the better by using the Cache class and compressing it 2015-03-31 09:47:56 -07:00
andrew
a2b5fdb540 merge 2015-03-31 09:28:23 -07:00
andrew
fdfb8bd1b4 fix intermittent crash on windows during login 2015-03-31 09:26:33 -07:00
Andrew Meadows
f1b1ed014b merge upstream/master into andrew/inertia 2015-03-31 08:33:31 -07:00
Seth Alves
c8e623ace7 remove some debugging prints, added some comments 2015-03-31 07:18:20 -07:00
Seth Alves
52fc75a114 merge upstream 2015-03-31 07:18:04 -07:00
samcake
1a18719031 and make it compile on mac... remove the field map from state just because it's unecessary 2015-03-30 21:53:59 -07:00
Philip Rosedale
4961cf37b6 Merge pull request #4540 from ZappoMan/scriptCaching 
quiet warning flood when scripts are bad
 2015-03-30 21:48:13 -07:00
Philip Rosedale
5325478940 Merge pull request #4528 from ZappoMan/avatarUI 
Support for Auto-detecting FST type, and adding type hint to FST files when packaged
 2015-03-30 21:31:22 -07:00
ZappoMan
a88b3c02d2 quiet warning flood when scripts are bad 2015-03-30 18:24:34 -07:00
Stephen Birarda
7d5b8c430a remove extra added space 2015-03-30 18:06:51 -07:00
Sam Gateau
ee4b9a483b found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 18:04:44 -07:00
Stephen Birarda
1cb12bd1da Merge branch 'master' of https://github.com/highfidelity/hifi into settings-thread-delete-later 2015-03-30 18:03:35 -07:00
Stephen Birarda
b7174b5170 fix for cleanup of SettingsManager thread 2015-03-30 18:03:18 -07:00
Andrew Meadows
b8ff253f86 unlock after character is properly updated 2015-03-30 18:03:18 -07:00
Andrew Meadows
bdfe75b1f5 remove character from PhysicsEngine on shutdown 2015-03-30 18:03:18 -07:00
Seth Alves
63a59aa00a fix a couple of crashes 2015-03-30 18:03:18 -07:00
Philip Rosedale
ce05d3104a Merge pull request #4535 from ZappoMan/scriptCaching 
Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts
 2015-03-30 18:02:52 -07:00
Brad Hefta-Gaub
e1da9331e3 Merge pull request #4533 from jherico/tr2 
Fixing consecutive spaces issue with text renderer
 2015-03-30 17:34:42 -07:00
ZappoMan
0366ce9bf5 removed dead code 2015-03-30 17:33:25 -07:00
Sam Gateau
ee3ec3fe1a found the issue brekaing the render, i didn't do the Blend enable sync properly 2015-03-30 17:28:58 -07:00
Andrew Meadows
94c1cf12f5 deleting _dynamicsWorld doesn't crash on shutdown 2015-03-30 17:12:19 -07:00
Seth Alves
acf30782b6 include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script 2015-03-30 17:04:47 -07:00
ZappoMan
31072b2b2e only start one download per url even if still pending 2015-03-30 16:48:41 -07:00
ZappoMan
e2d8d82096 more script caching cleanup 2015-03-30 16:34:04 -07:00
Philip Rosedale
f116ac131d Merge pull request #4532 from AndrewMeadows/inertia 
fix crash in PhysicsEngine on shutdown
 2015-03-30 16:31:34 -07:00
Bradley Austin Davis
87c4f8433c Fixing consecutive spaces issue with text renderer 2015-03-30 16:21:57 -07:00
ZappoMan
74d50a9250 more work on improving script caching 2015-03-30 16:21:47 -07:00
Andrew Meadows
c6b34df06c unlock after character is properly updated 2015-03-30 16:07:56 -07:00
Seth Alves
4aa6748e11 Merge branch 'fix-physics-crash' of github.com:sethalves/hifi into vhacd-knobs 2015-03-30 16:02:27 -07:00
Seth Alves
ee7247a5b4 fix a couple of crashes 2015-03-30 15:56:01 -07:00
Andrew Meadows
9b13f186e3 remove character from PhysicsEngine on shutdown 2015-03-30 15:51:58 -07:00
ZappoMan
36657c9473 first cut at script caching 2015-03-30 14:36:48 -07:00
Seth Alves
071b6a21de Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs 2015-03-30 13:44:39 -07:00
Andrew Meadows
10af59296d Merge pull request #4499 from sethalves/multi-hull-collisions 
Multi hull collisions
 2015-03-30 12:11:56 -07:00
Andrew Meadows
2404fb126f Merge pull request #4527 from sethalves/valgrind 
Valgrind told me to do it
 2015-03-30 11:56:17 -07:00
Seth Alves
e730109c51 quiet debuging spew 2015-03-30 11:46:48 -07:00
Seth Alves
f90211e830 Merge pull request #1 from AndrewMeadows/cyclohexane 
optimizations when creating convex hull shapes
 2015-03-30 11:38:49 -07:00
Philip Rosedale
2951d17bf3 Merge pull request #4529 from AndrewMeadows/inertia 
fix crash for bad avatar body on login
 2015-03-30 11:30:39 -07:00
Seth Alves
186cb1ec7a merge from upstream 2015-03-30 11:28:47 -07:00
Seth Alves
8a5192c1d9 attempt to handle registration point in hull collisions 2015-03-30 11:22:31 -07:00
Andrew Meadows
da9ceac9ae fix crash for bad avatar body on login 2015-03-30 11:06:02 -07:00
Philip Rosedale
685de8cc7f Merge pull request #4522 from huffman/rename-attribution 
Rename attribution to marketplaceID
 2015-03-30 10:57:28 -07:00
Sam Gateau
ab9be0cb41 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-30 10:11:08 -07:00
Sam Gateau
2a58a65a8f back to the office monday morning, State almost working in the full piupeline 2015-03-30 10:10:39 -07:00
Andrew Meadows
adf076a630 optimizations when creating convex hull shapes 2015-03-30 09:56:30 -07:00
Seth Alves
7137b41375 free these so it's easier to see other leaks in valgrind 2015-03-30 09:30:37 -07:00
Seth Alves
4bf86bb824 another [] needed after delete 2015-03-29 17:59:57 -07:00
Sam Gateau
3baa4eadeb Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-29 10:16:09 -07:00
Sam Gateau
ce659e6307 Introducing the gl state capture in order to resync the gpu::state with the true gl state 2015-03-29 10:15:18 -07:00
Seth Alves
26230cf493 uninitialized variable (quiet valgrind) 2015-03-29 05:40:39 -07:00
ZappoMan
80df8caefb Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI 2015-03-28 18:43:03 -07:00
Seth Alves
a47ae9212b quiet compiler 2015-03-28 17:13:31 -07:00
Seth Alves
1e166eef0f valgrind says _ghostObject is used before it's initialized 2015-03-28 17:12:55 -07:00
Seth Alves
96bfc53391 prototype has no code and isn't used 2015-03-28 17:11:56 -07:00
Seth Alves
78b46cff2b quiet compiler 2015-03-28 17:11:36 -07:00
Seth Alves
faa3ed6c29 valgrind wants [] 2015-03-28 17:11:23 -07:00
Sam Gateau
21b5d6f404 refining the state interface and the GLBackend for it with a true cache 2015-03-28 11:26:06 -07:00
ZappoMan
a765b4c8a5 fix to preload getting called when you change a script 2015-03-27 18:56:55 -07:00
ZappoMan
002fba8018 first cut at predicting FST type for set avatar 2015-03-27 16:56:03 -07:00
ZappoMan
baa2f947e5 classifying FSTReader and moving ModelType into that class 2015-03-27 16:30:00 -07:00
Seth Alves
90f51e7d4c print a warning when ShapeManager is skipping over a too-large or too-small shape 2015-03-27 16:15:54 -07:00
Seth Alves
fd69a54f10 Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-27 15:55:20 -07:00
Stephen Birarda
80ecbed02b Merge pull request #4524 from ctrlaltdavid/fix-xmlhttprequest-auth 
Fix authorization of API calls in XMLHttpRequest
 2015-03-27 15:35:14 -07:00
David Rowe
c456760419 Extract API URL into a const 2015-03-27 15:24:55 -07:00
Philip Rosedale
53970cb530 Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix 
fix bug in default avatars
 2015-03-27 14:54:35 -07:00
ZappoMan
1821683453 fix bug in default avatars 2015-03-27 14:44:35 -07:00
Seth Alves
cfa30594cc make obj reader handle faces with more than 4 vertices 2015-03-27 14:24:36 -07:00
David Rowe
1ee797efa4 Fix authorization of API calls in XMLHttpRequest 2015-03-27 13:59:52 -07:00
Andrew Meadows
5b85a2aa44 merge upstream/master into andrew/inertia 2015-03-27 13:56:54 -07:00
Andrew Meadows
bee8c0e237 "hover" if the "jump" key is held down long enough 2015-03-27 13:56:03 -07:00
Andrew Meadows
be5fdbf217 enable avatar collisions by default 
also remove old gravity features
 2015-03-27 13:36:20 -07:00
Ryan Huffman
81cb1e98ba Rename attribution to marketplaceID 2015-03-27 13:35:58 -07:00
ZappoMan
6189926105 add type hint to FST in model packager 2015-03-27 13:23:29 -07:00
Philip Rosedale
6550b4e311 Merge pull request #4509 from AndrewMeadows/inertia 
character transitions into "hover" when stepping over abyss
 2015-03-27 13:16:36 -07:00
Seth Alves
087248dffc fix locking in ResourceCache::checkAsynchronousGets 2015-03-27 13:14:20 -07:00
Sam Gateau
f1a0783347 Merge branch 'master' of https://github.com/highfidelity/hifi into temp1 2015-03-27 10:34:17 -07:00
Sam Gateau
9c44100bb8 cleaning the State class code 2015-03-27 10:33:29 -07:00
Brad Hefta-Gaub
2255c30d58 Merge pull request #4512 from Atlante45/ordered_fst 
Hint order for FST files
 2015-03-27 09:41:50 -07:00
Andrew Meadows
b9b2c30bba use QObject::deleteLater() not explicit delete 2015-03-27 09:01:44 -07:00
Andrew Meadows
e75bb3cd9c merge upstream/master into andrew/inertia 2015-03-27 08:14:36 -07:00
Atlante45
e16c8852fb extra ; 2015-03-27 14:43:09 +01:00
Atlante45
daaba330d5 Turn lambda into helper function 2015-03-27 14:41:32 +01:00
Andrew Meadows
821ac605f5 smoother motion on steps 
faster motion when "flying"
cleanup of MyAvatar::updatePosition()
 2015-03-26 19:48:52 -07:00
Seth Alves
16875338bf Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions 2015-03-26 18:55:43 -07:00
Seth Alves
7da87d6e15 set up a way to request ResourceCache downloads from a non-networking thread. 2015-03-26 18:37:55 -07:00
ZappoMan
8e7ead2ead fix locking issue in enter/leave entity scripts 2015-03-26 16:05:31 -07:00