Code

History

Commits on master to libraries/entities/src/EntityScriptingInterface.cpp490+
  1. Merge branch 'master' into homerBrad Davis committed 11 years ago9b81842
  2. Fixing potential access to null objectBrad Davis committed 11 years agofd1cfad
  3. respond to code reviewSeth Alves committed 11 years agob1c5a04
  4. Fixing some entity race condition crashesBrad Davis committed 11 years agoaa989c3
  5. merge from upstreamSeth Alves committed 11 years ago9c4fdfd
  6. octree uses shared pointersSeth Alves committed 11 years ago31fcd55
  7. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years agoed19987
  8. Merge branch 'master' of https://github.com/highfidelity/hifi into protocolStephen Birarda committed 11 years ago33f6933
  9. allow setting cuboid voxel spaces. clean up some lockingSeth Alves committed 11 years ago7369ca1
  10. Merge branch 'master' of https://github.com/highfidelity/hifi into update_protocolAtlante45 committed 11 years ago179ee73
  11. back out previous attempt at theading polyvox code. lay groundwork for threading that can be reasoned aboutSeth Alves committed 11 years agodc31c7e
  12. resolve conflicts on merge with upstream/masterStephen Birarda committed 11 years ago0f77ab8
  13. in edged mode, make sure border voxels are zeroed out. expose some more voxel matrix math to javascriptSeth Alves committed 11 years agob129c2a
  14. have functions that change polyvox voxes return true if they changed anything, else false. added voxelCoordsToWorldCoords and worldCoordsToVoxelCoordsSeth Alves committed 11 years ago5ecdbaa
  15. resolve conflicts on merge with upstream masterStephen Birarda committed 11 years ago0529788
  16. attempting to fix windows and linux builds againericrius1 committed 11 years ago9125b3a
  17. fixing ambiguous "call to overloaded function compiler" errors on windows and linux buildsericrius1 committed 11 years agoe36099f
  18. cleaningericrius1 committed 11 years ago47bc8f5
  19. Renaming varsbwent committed 11 years agoaab1f70
  20. Add gettable naturalPosition property for model entitiesbwent committed 11 years ago67760fa
  21. shuffle Packet headers, use static enum for PacketTypeStephen Birarda committed 11 years ago9e7fb9a
  22. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago8d6ff2d
  23. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago256c786
  24. resolve conflicts on merge with uptream/masterStephen Birarda committed 11 years ago821c16c
  25. merged and normals flippingericrius1 committed 11 years ago0ce6737
  26. Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointersAtlante45 committed 11 years ago80fe090
  27. fix activation of object when action changesAndrew Meadows committed 11 years ago9ce9c54
  28. bring over code from entity-level-locking branchSeth Alves committed 11 years ago2dc4922
  29. replace lingering PacketTypes in old formatStephen Birarda committed 11 years ago74940a2
  30. fix spaces created by xcode find/replaceStephen Birarda committed 11 years agoffa6edc
  31. more PacketType to PacketType::Value replacementsStephen Birarda committed 11 years agob3c3e5a
  32. rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.Seth Alves committed 11 years ago2468612
  33. Fix smart pointer castsAtlante45 committed 11 years agoee13407
  34. changed quad entity to PolyLineericrius1 committed 11 years agoad54b4c
  35. merge andrew's sim-ownership branchSeth Alves committed 11 years ago1d12206