griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
37,129 Commits 1 Branch 0 Tags
001b8af4ffa01ac0ccfb1c4d7e392bbc2219cf7d
Commit Graph

222 Commits

Author SHA1 Message Date
Tamito Kajiyama
9ca7f6659f Merged changes in the trunk up to revision 44419. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt
 2012-02-25 01:26:45 +00:00
Campbell Barton
edb04d1461 bmesh docs now written in sphinx doc generator. 
* http://www.blender.org/documentation/blender_python_api_2_62_0/bmesh.types.html
* http://www.blender.org/documentation/blender_python_api_2_62_0/bmesh.utils.html
 2012-02-24 09:53:29 +00:00
Tamito Kajiyama
910f04ca63 Merged changes in the trunk up to revision 44221. 
Conflicts resolved:
release/datafiles/blender_icons.png
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenloader/intern/readfile.c
 2012-02-18 11:26:11 +00:00
Campbell Barton
5af9e8d5ca remove section in gotcha's doc about matrix col/row order since this has been changed. 2012-02-17 20:41:41 +00:00
Campbell Barton
caf92365a5 autogenerated rna api changelog (no rebuilds needed) 2012-02-15 17:41:48 +00:00
Campbell Barton
f7c032b765 py api docs - remove sphinx .doctree before zipping, saves some space 18mb --> 3.1 mb 2012-02-12 19:55:25 +00:00
Tamito Kajiyama
5c5685f6c5 Merged changes in the trunk up to revision 44039. 2012-02-12 00:09:48 +00:00
Campbell Barton
387ce06732 Disable PDF doc since its giving errors with latex indentation. 
upload the zipped version of HTML docs instead.
 2012-02-10 15:00:55 +00:00
Campbell Barton
fd60de606a Style cleanup of gpu rst file. 2012-02-09 06:38:54 +00:00
Tamito Kajiyama
8160829303 Merged changes in the trunk up to revision 43881. 2012-02-04 14:22:05 +00:00
Campbell Barton
4fd4a2e7b9 added note in docs about not beaing able to create new data by calling the class direct. 2012-01-31 22:37:36 +00:00
Dalai Felinto
359917fb2b pydoc cleanup + remove unused bge.logic constants 
+ adding PINGPONG as action actuator constant in rst
 2012-01-30 06:47:01 +00:00
Tamito Kajiyama
831f339980 Merged changes in the trunk up to revision 43748. 
Conflicts resolved:
source/blender/editors/include/UI_resources.h
 2012-01-29 12:00:04 +00:00
Dalai Felinto
5585b3e908 rst bge touch ups: making the title of the examples slightly more noticeable 
-  it's still not correct, comparing to the other examples, but at least it looks okish.
-  fixed some small typos
 2012-01-23 19:53:23 +00:00
Mitchell Stokes
686ce92fe8 Committing patch "[#27676] Change window size/resolution in realtime" by me. 
Description:
This patch allows the user to change the size of the window (or the resolution in fullscreen mode) using the new bge.render.setWindowSize() method. This only works in the Blenderplayer since it doesn't make a whole lot of sense for the embedded player.
 2012-01-22 20:25:25 +00:00
Mitchell Stokes
57d48d4493 Committing patch "[#29763] Adding an active_events property to SCA_PythonKeyboard and SCA_PythonMouse" 
Here is the description:
As the summary says, this patch adds a new event to both SCA_PythonKeyboard and SCA_PythonMouse. This property is similar to the events property that both have, but it only returns events which are not KX_NO_INPUTSTATUS. This moves the "no input" check from Python to C, which gave my input handling code a 2x speed up. Python sucks (performance-wise) with iterating lists and SCA_PythonKeyboard has close to 200 events (I think something like 177, but I don't know for sure).
 2012-01-22 05:45:56 +00:00
Dalai Felinto
6964b5a6c4 cucumber merge: world scaling + video texture constants 
revisions: 38166,38167,38177,38179,38180,38187,38242

To be implemented after merge:
1) add pydocs(rst) for the video texture new defines
2) see if a NodeSetLocalMatrix would fit well

#43439 by kupoman
Changing the worldTransform and localTransform python attributes to use BLI_math to simplify the code

#38242 by kupoman
Adding the constants SOURCE_ERROR, SOURCE_EMPTY, SOURCE_READY, SOURCE_PLAYING, SOURCE_STOPPED to the video texture module. Updates to the documentation will follow after a merge with trunk

#38187 by kupoman
Updates to the documentation to reflect that worldScale is now writable, and added localTransform and worldTransform to KX_GameObject.

#38180 by kupoman
The Transform attribute of KX_GameObject was based on world space data. I converted that one to worldTransform, and added a localTransform for local space transform information.

#38179 by kupoman
Fixed the transform attribute of KX_GameObject's set method to properly deal with negative scaling.

#38177 by kupoman
Updated the transform property on KX_GameObject so that it is now read/write, and added the corresponding set method. Also simplified the get method by calling GetOpenGLMatrix instead of making the matrix myself.

#38167 by kupoman
Adding a read only transform attribute to KX_GameObject that returns a 4x4 matrix representing the object's transformations.

#38166 by kupoman
Adding a worldScale attribute to KX_GameObject. This attribute scales the object independently of its parent's scale.
 2012-01-22 03:21:28 +00:00
Tamito Kajiyama
e0df491d1e Merged changes in the trunk up to revision 43404. 
Conflicts resolved:
source/blender/python/SConscript
 2012-01-15 23:13:12 +00:00
Campbell Barton
166a37532f remove *.select_inverse operators where the *.select_all operator has an invert option. 2012-01-14 06:58:03 +00:00
Dalai Felinto
14e75b6c84 bge api doc update 
bge.texture materialId wasn't showing up
bge.type was outdated (I removed the glew example, I hope no one mind)
 2012-01-13 08:58:12 +00:00
Campbell Barton
153be23dbe give a more useful error when attempting to opengl render in background mode. 
add some tips to the python docs.
 2012-01-13 06:59:16 +00:00
Campbell Barton
2d2d0da51b remove blender 2.5 references in docs 2012-01-12 15:16:08 +00:00
Tamito Kajiyama
76a211d809 Merged changes in the trunk up to revision 43219. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/pipeline.c
 2012-01-08 11:57:53 +00:00
Campbell Barton
cce9c43295 correct api doc examples and a typo 2012-01-05 05:43:35 +00:00
Campbell Barton
9a0bf1ffa4 Correct use of your vs you're in py api docs 2012-01-04 03:22:37 +00:00
Tamito Kajiyama
0896a22723 Merged changes in the trunk up to revision 42902. 
Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c
source/blender/makesdna/DNA_mesh_types.h
source/blender/python/intern/bpy.c
 2011-12-27 22:12:46 +00:00
Campbell Barton
3c480e85e3 update the api changelog 2.60 --> 2.61 2011-12-22 21:44:52 +00:00
Tamito Kajiyama
3197796cf7 Merged changes in the trunk up to revision 42425. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c
 2011-12-05 02:12:49 +00:00
Campbell Barton
4c93e0ada3 include mathutils.noise in sphinx docs 2011-12-04 06:55:32 +00:00
Campbell Barton
9aaa67cc4c corrections for docs 2011-11-28 17:19:25 +00:00
Tamito Kajiyama
b6569ee4e7 Merged changes in the trunk up to revision 42116. 2011-11-26 13:11:55 +00:00
Campbell Barton
1c6dc61d17 blacklist language property for sphinx docs, encoding was messing up PDF generation. 2011-11-24 22:24:07 +00:00
Campbell Barton
6e28ac2d7b pep8 edits and avoid naming conflicts with python builtins 2011-11-24 19:36:12 +00:00
Brecht Van Lommel
2345efc6c5 Patch #29336: renaming UV (Texture) Layer to UV Map in the user interface, 
by Gaia Clary.

Rationale: the name was confusing and not always used consistently, and this
map itself is not something that can be layered, rather the map can be used
as texture coordinates in some layered setup.

The original intent was to indicate this contained more than just UV's, but
the game engine settings have already been moved out, and apparently users
didn't really get this from the name anyway.
 2011-11-23 17:25:25 +00:00
Tamito Kajiyama
2676f2d58f Merged changes in the trunk up to revision 42021. 
Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c
 2011-11-20 21:02:12 +00:00
Campbell Barton
d9e99abe37 hide overly picky warnings from 'pylint' for pep8 script, indentation edits. 2011-11-19 16:17:35 +00:00
Campbell Barton
c6c6a3578b tab -> spaces 2011-11-18 04:55:43 +00:00
Campbell Barton
e9be8b4a0a document py gotchas 
- dont assume you get the data names you ask for
- beware of collisions with library names
- beware of py modules calling sys.exit
 2011-11-18 04:48:27 +00:00
Campbell Barton
1cfbde0eb4 pass encoding to uses of decode() incase the default isnt utf-8. ignore decode errors in some cases. 
This should fix an error with generated qtcreator projects.

also replace decoded bytes for unicode escape sequences in the VIEW3D_MT_edit_text_chars menu.
 2011-11-17 04:05:54 +00:00
Campbell Barton
747f06d3d2 set cycles scripts as pep8 & make some minor changes. 
also update sphinx doc generator.
 2011-11-15 02:58:01 +00:00
Tamito Kajiyama
80e398e7b2 Merged changes in the trunk up to revision 41638. 
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
 2011-11-08 06:30:02 +00:00
Campbell Barton
f086201518 cmake & pep8 tidy up, also some style edits. 
remove unneeded collection length function.
 2011-11-08 01:32:34 +00:00
Guillermo S. Romero
95948d0e0e SVN maintenance. 2011-11-07 23:50:12 +00:00
Campbell Barton
057bf2a02b misc doc edits 
- remove recently added sphinx reference workaround.
- tested doxygen, correct some warnings, set tab width and added pymathutils group.
- added convenience target 'make doc_doxy'
 2011-11-05 01:48:10 +00:00
Campbell Barton
209ceb6969 correct some warnings, also sensor_x was being paassed to object_camera_matrix(...) for x and y args, looks like an accident 2011-11-04 15:21:34 +00:00
Campbell Barton
87cd81b162 - added docs and examples for bpy.app.handlers 
- correct error in own last commit for BKE_screen_find_big_area()
 2011-11-04 04:27:46 +00:00
Tamito Kajiyama
65668dc5eb Merged changes in the trunk up to revision 41368. 
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
 2011-10-30 02:03:40 +00:00
Tamito Kajiyama
16702c1729 Merged changes in the trunk up to revision 41225. 
Conflicts resolved:
source/blender/render/intern/source/pipeline.c
 2011-10-29 15:46:14 +00:00
Campbell Barton
f8d0c8b11e patch [#29049] Minor phrasing and grammar patch 2011-10-28 01:10:46 +00:00
Campbell Barton
617d3cb852 pass -noaudio when running blender for various utilities - doc-gen and tests. 2011-10-19 21:55:27 +00:00