Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
21404 commits 2 branches 0 tags 1.1 GiB
Commit graph

88 commits

Author SHA1 Message Date
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
0c78af9abb Working on text rendering refactor 2015-02-03 18:57:39 -08:00
Clément Brisset
206e1e48f6 Merge pull request #4086 from huffman/std-to-qstring 
Std to qstring
 2015-01-12 16:19:28 -08:00
Andrew Meadows
99e1fdd46e fix for EntityServer crash 
adding EntityItem::_element backpointer for easier add/remove logic
 2015-01-10 07:44:26 -08:00
chris
8bb69d0a90 Update std::string instances to QString 2015-01-09 16:22:52 -08:00
ZappoMan
b940dcfdb3 more voxel-ectomy cleaning up some remaining references to voxels 2015-01-06 09:27:48 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
72cced12a6 guards for NULL collisions, possible fix to fountain crash 2014-12-23 11:30:32 -08:00
Andrew Meadows
9e9929da91 merge upstream/master into andrew/thermonuclear 2014-12-08 11:22:39 -08:00
ZappoMan
08092e7abe removed dead code 2014-12-06 15:06:00 -08:00
ZappoMan
7ea85073f4 introduce precision picking in API form 2014-12-06 11:45:49 -08:00
ZappoMan
1fec69698e get the triangle picking for submeshes working, remove some debug 2014-12-05 23:23:21 -08:00
Andrew Meadows
7d96ad5836 cleanup of EntitySimulation API 
* remove EntityItem::_simulationState (only useful to EntitySimulation)
* move code from SimpleEntitySimuation to EntitySimulation
* EntitySimulation now maintans many QSets of entities
* cleanup and clarify use of EnityTree::updateEntity()
* reduced cost of polling for entity expiries
* changed "UpdateFlags" to "DirtyFlags" and clarified what they're for
 2014-12-05 18:08:53 -08:00
ZappoMan
ae647d39d0 fix models with registrations other than 0,0,0 2014-12-05 16:14:18 -08:00
ZappoMan
0ccbb98bde more work on improved model picking 2014-12-05 15:03:35 -08:00
ZappoMan
a6b86da47a basics of triangle picking working for models 2014-12-05 11:31:27 -08:00
ZappoMan
11f10f9512 make sphere entities pick off their actual sphere, fix bug in ray picking multiple items with different distances 2014-12-04 10:54:04 -08:00
ZappoMan
cd92185c5b Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickWork 
Conflicts:
	examples/newEditEntities.js
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	libraries/entities/src/EntityTree.h
 2014-12-03 15:07:47 -08:00
ZappoMan
63d1ac8375 implement support for entity subclasses to implement their own detailed ray intersection, make likes light pickability toggle 2014-12-02 14:56:12 -08:00
Andrew Meadows
3781c23480 add entities to simulation after unpacking 2014-11-26 17:09:53 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Andrew Meadows
97d1dc4200 use updateFoo() where entity properties need relay 
clear EntityItem updateFlags when processed
 2014-11-19 15:12:22 -08:00
Andrew Meadows
47615ba9c2 changeEntityState() --> updateEntityState() 2014-11-17 17:38:26 -08:00
Andrew Meadows
af606f01a9 combined SimulationStates Moving and Changing 
also funnel entity updates by UDP packet through a single list
 2014-11-17 17:35:44 -08:00
ZappoMan
8ec3f8ce99 implement support for calling preload when the script changes 2014-11-11 14:21:06 -08:00
ZappoMan
2bc7896dee first cut at preload script behavior 2014-11-11 13:46:48 -08:00
ZappoMan
768a854b00 cleanup 2014-11-06 14:00:26 -08:00
ZappoMan
90b079d5a8 remove debug 2014-11-06 13:51:48 -08:00
ZappoMan
5333f0eb19 quiet some debug 2014-11-06 13:45:30 -08:00
ZappoMan
2b62402a57 possible fix for entities not always updating bug 2014-11-06 13:17:46 -08:00
ZappoMan
13e358549d add periodic pruning of the octree on load and save 2014-11-05 14:56:38 -08:00
ZappoMan
bbd476d564 handled multiple collisions correctly, and don't collide if fully enclosed 2014-09-26 14:55:05 -07:00
ZappoMan
2d81d7c554 add support for ignore collisions and collisions will/wont move entities 2014-09-26 11:43:56 -07:00
ZappoMan
9cd76983a2 swith to using shape collider instead of spheres 2014-09-25 14:35:20 -07:00
ZappoMan
eda168a6d9 first cut at shape collisions 2014-09-24 19:51:37 -07:00
ZappoMan
54ef5d4698 fixed bugs in MovingEntitiesOperator, improved getDistanceToBottomOfEntity, isRestingOnSurface 2014-09-12 07:45:33 -07:00
ZappoMan
77dff69805 fix ray picking to work with registation points 2014-09-11 17:03:01 -07:00
ZappoMan
695569b64b reconcile use of getAACube() and handle rotations properly 2014-09-11 16:43:53 -07:00
ZappoMan
2757f16045 remove calls to calculateRotatedExtents() use Extents.rotate() instead 2014-09-11 12:29:47 -07:00
ZappoMan
b78b8ccbb0 first cut at replacing radius with dimensions 2014-09-09 13:33:05 -07:00
Andrew Meadows
e7b39ae119 removed unused variable 2014-09-05 16:42:24 -07:00
ZappoMan
dc31381fc1 better handling of old model files 2014-09-05 02:19:17 -07:00
ZappoMan
d08e7ef96d fix bug in way too small entities 2014-09-03 15:20:42 -07:00
ZappoMan
66a2f58192 fix to runaway saving file and optimizations to general encoding paths 2014-09-03 10:55:56 -07:00
ZappoMan
2b5d631290 removed a ton of old dead debug code 2014-09-02 08:44:43 -07:00
ZappoMan
f16a48e187 quiet some debugging 2014-09-01 22:38:18 -07:00
ZappoMan
b244e78af4 working on addressing issues with sibling cells and server clock skew causing some properties to be ignored 2014-09-01 21:48:03 -07:00
ZappoMan
1fa587b88a suppress unchanged entities 2014-08-29 21:51:08 -07:00