556912792a
Merged changes in the trunk up to revision 54110.
...
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
2013-01-26 23:49:13 +00:00
97d8e34d61
correct addon tutorial section on keymap register/unregister and add label next to image color-depth option.
...
having buttons labelled [8, 16] on their own is not very meaningful.
2013-01-22 06:41:12 +00:00
769ab3eed8
code cleanup:
...
- cycles ui used 'cscene' for scene.cycles and scene.cycles_curves
- style cleanup
2013-01-15 23:17:45 +00:00
9f2e845181
code cleanup: use BMW_begin insode for loops body.
2013-01-14 09:53:56 +00:00
94ae0232b0
Merged changes in the trunk up to revision 53729.
...
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
2013-01-12 02:02:53 +00:00
feccbaabbd
Merged changes in the trunk up to revision 53584.
...
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
2013-01-05 22:24:05 +00:00
Lukas Toenne
123191881b
Added some python API examples for the new get/set callbacks in bpy.props.
2013-01-05 15:50:51 +00:00
9b9da2820b
Adding some example for new UIList...
2013-01-05 11:14:35 +00:00
e9c7aaaa3c
patch [ #33609 ] Syntax highlighting for OSL in Text Editor
...
from Patrick Boelens (senshi). with modifications to split it into its own function.
also added C style multi-line comment support /* ... */
I've left out the part of this patch that sets the language in the space, since I think this might be better stored in the text block.
For now it simply uses OSL syntax highlighting when the extension is '.osl'.
2012-12-29 18:25:03 +00:00
4ed4be1fc2
example use of addon preferences.
2012-12-29 11:07:31 +00:00
18f134304c
BGE: Adding a jumpCount to KX_CharacterWrapper. This can be used to have different logic for a single jump versus a double jump. For example, a different animation for the second jump.
2012-12-29 10:22:19 +00:00
13f49f3101
BGE: Adding a maxJumps to the character controller to adjust how many jumps a character can perform before having to touch the ground. By default this is set to 1, which means a character can only jump once before having to touch the ground again. Setting this to 2 allows for double jumping.
2012-12-26 01:25:53 +00:00
40449b1994
Merged changes in the trunk up to revision 53280.
2012-12-23 00:23:11 +00:00
84966c3d0a
BGE: Committing async LibLoad from Swiss. This does the lib loading in a separate thread to keep the BGE from freezing. Here is an example from the docs:
...
# Print a message when an async LibLoad is done
import bge
def finished_cb(status):
print("Library (%s) loaded in %.2fms." % (status.libraryName, status.timeTaken))
bge.logic.LibLoad('myblend.blend', 'Scene', async=True).onFinish = finished_cb
LibLoad() now returns a KX_LibLoadStatus object for information on the library loading. LibNew() and LibFree() are unaffected by this commit. In other words, the async option only works for LibLoad(). Furthermore it only works for Scenes, not Actions or Meshes.
2012-12-22 05:38:32 +00:00
f2f2b6153a
BGE: Adding a Python interface for handling joysticks without needing logic bricks. These new SCA_PythonJoystick objects can be accessed using bge.logic.joysticks, which is a list of joysticks. The length of the list is the number of maximum supported joysticks, and indexes that do not have a joystick available are set to None. This means joysticks can be checked for using something like:
...
if bge.logic.joysticks[0]:
activate_player_one()
if bge.logic.joysticks[1]:
activate_player_two()
etc..
The interface exposed by SCA_PythonJoystick is very similar to the joystick logic brick except for one key difference: axis values are normalized to a -1.0 to 1.0 range instead of -32767 to 32767, which is what the logic brick exposed.
2012-12-21 02:28:59 +00:00
d433cd65f7
Merged changes in the trunk up to revision 53146.
...
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
2012-12-19 01:49:58 +00:00
a6e9c9fda0
update api changelog
2012-12-11 02:13:42 +00:00
ec33687d6c
Merged changes in the trunk up to revision 52815.
2012-12-08 12:35:14 +00:00
4fd9df25c6
Add 2 documents to the python api reference.
...
- Blender/Python Addon Tutorial: a step by step guide on how to write an addon from scratch
- Blender/Python API Reference Usage: examples of how to use the API reference docs
Thanks to John Nyquist for editing these docs and giving feedback.
2012-12-07 05:27:09 +00:00
57d7c1f226
pydna experimental ctypes DNA api was broken with more recent python versions, and some minor doc edits.
2012-12-05 03:38:01 +00:00
af51827dda
add a message when solidify is used with only-edges, this isn't properly supported.
...
also minor edits to py-api-ref
-- This line, and those below, will be ignored--
M doc/python_api/sphinx_doc_gen.py
M doc/python_api/rst/include__bmesh.rst
M source/blender/modifiers/intern/MOD_solidify.c
2012-12-05 01:02:41 +00:00
ca25fd0307
fix [ #33389 ] Curve points restricted to 0..1 range,
...
also added note on python3.3's faulthandler module.
2012-12-03 07:10:31 +00:00
61da29996a
fix own mistake with recent commit to skip calculating tessface. If you were already in editmode the tessfaces wouldn't get recalculated.
...
also minor edits to bmesh rst.
2012-12-03 02:26:13 +00:00
f7f4148b40
change uiButGetStrInfo() to use a trailing NULL arg rather then passing the number of args as an arg.
2012-12-02 04:51:15 +00:00
b290f9a6cc
add bmesh.free() to example & template
2012-12-01 07:16:08 +00:00
ed0e2fbd9f
Merged changes in the trunk up to revision 52690.
...
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c
2012-12-01 02:47:59 +00:00
c3e1813820
Fix related to #33340 : add a warning to bge from_id documentation to not store id()
...
in game object integer properties since it may not fit in 32 bits integers.
2012-11-29 01:25:38 +00:00
f828a318f5
include an example in the api docs for using bmesh operators to make 2 links in a chain.
2012-11-28 15:08:45 +00:00
4fe35721e6
bmesh operator api reference - add in 'bmesh' arg at the start of each operator, also use :class: references.
2012-11-28 01:14:11 +00:00
9775f1d743
generate api reference for 'bmesh.ops', restructured text is extracted from bmesh_opdefines.c.
...
see:
http://www.blender.org/documentation/blender_python_api_2_64_9/bmesh.ops.html
2012-11-27 06:56:51 +00:00
53840c7db5
Merged changes in the trunk up to revision 52546.
...
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c
2012-11-26 02:32:34 +00:00
f22fb939d3
BGE Docs: Adding some docs for some of the Steering Actuator attributes. I grabbed the docs from the UI descriptions from RNA for the Steering Actuator. However, these aren't the best descriptions, and both the UI descriptions and the docs could use some attention. Also, steeringVec and facingMode didn't have corresponding UI elements, so I've left them undocumented for now. Someone who knows what they do can hopefully document them.
2012-11-23 07:47:53 +00:00
c6f98cfa95
BGE Docs: Adding docs for bge.logic.NextFrame() and bge.logic.PrintMemInfo() based on their doc strings. There was also an :rtype: in the bge.logic.setExitKey() docs that should have been :type:.
2012-11-22 22:38:31 +00:00
de57d61f62
BGE Docs: Adding docs for KX_Scene.drawObstacleSimulation() based on its doc string.
2012-11-22 22:25:12 +00:00
ff94827965
BGE Docs: Documenting missing Sound Actuator attributes based on RNA UI strings.
2012-11-22 22:13:27 +00:00
f90298bc0a
BGE Docs: Adding docs for the KX_GameObject.playAction() play_mode constants.
2012-11-22 21:52:30 +00:00
2765f1fffc
BGE Docs: Reordering the "Various" constants so they are in alphabetical order.
2012-11-22 21:37:12 +00:00
899290dd47
BGE Docs: Moving the KX_ArmatureSensor.type constant docs from bge.types.rst to bge.logic.rst where the rest of the constants docs are.
2012-11-22 11:09:42 +00:00
989b5983c8
BGE Docs: Changing ROT_* Armature Channel constants in the docs to be ROT_MODE_* to match the actual constants from bge.logic.
2012-11-22 09:20:36 +00:00
9b571c2d54
BGE Docs: Fixing indentation.
2012-11-22 09:12:21 +00:00
762016c746
indentation edits
2012-11-22 08:30:54 +00:00
74ffa7bb8a
BGE Docs: Adding some basic docs for the KX_STEERING_* constants. Right now just their names and values are in the docs, not what they actually do.
2012-11-22 08:22:46 +00:00
d9f6edff14
BGE Docs: Moving the BL_ArmatureChannel.rotation_mode constant docs from bge.types.rst to bge.logic.rst where the rest of the constants docs are.
2012-11-22 08:16:30 +00:00
8dd96bcefb
BGE Docs: Moving the BL_ArmatureConstraint constant docs from bge.types.rst to bge.logic.rst with the rest of the constants docs are.
2012-11-22 08:07:13 +00:00
5da6c02188
BGE Docs: Adding RM_* mode constants from KX_NavMeshObject.draw()
2012-11-22 08:01:02 +00:00
a660ebc16e
Moving the Armature Actuator constant docs from bge.types.rst to bge.logic.rst with the rest of the constants docs are. Not only is this more consistent, but it also makes Campbell's script happier.
2012-11-22 07:52:17 +00:00
6a5d5ed206
Some KX_CONSTRAINTACT_* constants were incorrectly documented as KX_CONSTRAINT_*.
2012-11-22 07:31:51 +00:00
8a62ec63c8
Adding docs for KX_NavMeshObject based on doc strings found in KX_NavMeshObject.cpp.
2012-11-22 07:24:00 +00:00
30a292b61f
BGE: KX_PhysicsObjectWrapper was not being used anywhere in the code base, but it was being maintained (style, docs, name changes, etc), so I'm removing it.
2012-11-22 07:08:02 +00:00
b7f5c1c121
more bge reference api docstrings, leaving KX_FontObject and KX_NavMeshObject as TODO.
2012-11-22 06:04:12 +00:00
