bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity
25,437 Commits 2 Branches 0 Tags 745 MiB
25fec1592e
Commit Graph

1618 Commits

Author SHA1 Message Date
Joerg Mueller
25fec1592e Audaspace (GSoC): First merging commit 
* All audaspace changes from the GSoC branch including the aud Python module
* This commit also includes some minor changes in source/gameengine/Ketsji/KX_PythonInit.cpp:
  - Fixing names of some constants
  - removing outdated stopDSP() python function
  - Autoinclusion of bge instead of GameLogic
  - Fix for some error messages: GameLogic -> bge.logic
 2010-08-16 11:41:07 +00:00
Joerg Mueller
2b7a774ab0 svn merge -r 31314:31370 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-08-16 09:37:08 +00:00
Campbell Barton
d1759639dc - remove unused includes IMB_*, BIF_* & MEM_* 
- remove MEM_guardedalloc.h from header files (include directly)
 2010-08-16 05:46:10 +00:00
Joerg Mueller
47d38dbd20 svn merge -r 31211:31313 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-08-13 10:50:29 +00:00
Joerg Mueller
fd2a9a0ed0 Blender Py API: GameLogic -> bge.logic 2010-08-11 12:14:16 +00:00
Joerg Mueller
d48991c6c6 Blender Py API: Implemented missing KX_PYATTRIBUTE_TODOs and -DUMMYs. 2010-08-11 10:36:16 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Campbell Barton
ad4fc20ec9 moved idcode functions into their own file (was added as a todo in the comments), these were mixed in with file reading code - BLO_readfile.h bot these functions are not spesific to reading. 2010-08-10 15:14:19 +00:00
Joerg Mueller
4eadcdc389 Fix for [#22924] KX_PolygonMaterial.diffuse does not return expected list[r,g,b] 2010-08-10 10:26:25 +00:00
Joerg Mueller
64b36ffbb3 svn merge -r 31060:31144 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-08-07 15:45:07 +00:00
Campbell Barton
a8129f6b41 fix for fake python bge.* module, this is really nasty temp py code! (not a good example) 2010-08-06 12:46:22 +00:00
Joerg Mueller
06d2dc86a1 svn merge -r 30954:31059 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-08-05 08:23:26 +00:00
Campbell Barton
a0cece42c6 bugfix [#23148] "ImportError: __import__ not found" on changing Render FPS 
The BGE was getting the namespace dict directly from __main__ which conflicts
with my recent fix to get the pickle module working which to overwrote the __main__ module on script execution.

Simple fix is to have the BGE and Blender use the same method of getting namespaces.
Renamed CreateGlobalDictionary() to bpy_namespace_dict_new() and moved into bpy_internal_import.c

pickle still wont work in the BGE since we make a copy of __main__ namespace but for speed would rather not have to replace the __main__ module many times per second.
 2010-08-05 03:25:45 +00:00
Stefan Gartner
d50cc7826f == Makefiles == 
* add support for LCMS (disabled by default, set WITH_LCMS to true to enable it)
 * fixed typo that prevented TIFF support to be properly enabled
 * enable ray optimization by default (scons and cmake already did this)
 * fixed building with libsndfile on darwin (disabled by default)
 * quicktime: use audaspace headers from $(NAN_AUDASPACE)/include instead of intern
 * gameengine: add -DWITH_FFMPEG to compiler flags when building with ffmpeg support
 2010-08-04 08:42:18 +00:00
Campbell Barton
708ef64663 include cleanup, no functional changes 
- removed DNA_brush_types.h from DNA_scene_types.h (and some other similar cases)
- removed DNA_wave_types.h (never used)
- removed Main.wave
 2010-08-04 04:01:27 +00:00
Campbell Barton
940d1dcd0a remove commented scons lines from cmake files, fixed use of pointer poll function for ID drobdowns (currently unused) 2010-08-03 08:12:55 +00:00
Joerg Mueller
86fc34b924 Audaspace: 
* Added a stopCallback function that is called when the end of a sound is reached.
* Fixed the scrubbing not working.
* Minor SoundActuator cleanup.
 2010-08-02 18:22:34 +00:00
Campbell Barton
ec2c52c9c8 SCons 
- remove scons option WITH_BF_FHS, its not needed anymore.
- comment WITH_BF_DOCS, was using epydocs which we dont use now.
- blenderlite target was broken, always using openmp.
- building without python wasnt working.

- fixed some warnings.
 2010-08-02 16:27:41 +00:00
Joerg Mueller
5c9cf81cf9 Audaspace: 
* Fixed some compiler warnings
* Implemented device looping
* Note: Scrubbing in the sequencer is broken atm
 2010-07-31 10:03:08 +00:00
Joerg Mueller
61c9e46aad svn merge -r 30718:30912 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-07-30 22:34:27 +00:00
Joerg Mueller
c59b930d13 Audaspace: Refactored the complete 3D Device code giving a nicer API. 2010-07-30 22:20:08 +00:00
Mitchell Stokes
1b7d264f1e Fixing a typo in the BGE Python API: 
BL_ArmatureChannel.rotaion_euler -> BL_ArmatureChannel.rotation_euler

Making the docs match the code:
  BL_ArmatureChannel.rotation -> BL_ArmatureChannel.rotation_quaternion
  BL_ArmatureChannel.euler_rotation -> BL_ArmatureChannel.rotation_euler
 2010-07-30 04:57:27 +00:00
Brecht Van Lommel
c0ba0c1171 Fix #22986: glsl didn't take object hiding into account yet for lamps. 2010-07-27 11:10:34 +00:00
Brecht Van Lommel
5e5b0cbb26 Game engine was not updated yet to disable vertex/normal state on exit as 
other parts of Blender expect, might have caused issues with VBO's in some
cases.
 2010-07-27 11:07:34 +00:00
Campbell Barton
f7b046c108 Hopefully fix building with MSVC 2008 from rev 30746. 
SCA_PythonController.cpp(303) : error C2133: 'mod_path' : unknown size
 2010-07-26 17:46:10 +00:00
Campbell Barton
ed5d0bb62f patch from Mitchell Stokes with some changes. 
BGE Py Controllers were effectively doing this...
 "a.b.c" --> "__import__('a').b.c()"

This was annoying because it meant module 'a' would need to import 'b' explicitly.

Now use import like this.
 "a.b.c" --> "__import__("a.b").c()"

Note that this has the slight disadvantage that these need to be modules, where as before they could be collections of functions in a class instance for eg. So its possible this breaks existing files but dont think anyone used this since its a fairly obscure use case.
 2010-07-26 08:49:16 +00:00
Joerg Mueller
147a5229a1 svn merge -r 30566:30717 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-07-25 13:12:58 +00:00
Campbell Barton
885bbe6999 from Luca's recent commit noticed there are more typo's: lenght -> length 2010-07-25 01:45:53 +00:00
Mitchell Stokes
eabbbcdff9 Fixing a crash when using either BL_ArmatureBone.parent and BL_ArmatureBone.children. 2010-07-24 09:26:05 +00:00
Campbell Barton
9c3376a030 bugfix [#22716] Game engine corrupts rig ID-Properties. 2010-07-23 19:47:25 +00:00
Joerg Mueller
3e908a8112 Moved constants names from KX_ACT_CONSTRAINT_foo to KX_CONSTRAINTACT_foo. 2010-07-21 09:46:24 +00:00
Joerg Mueller
46155bc009 svn merge -r 30513:30565 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-07-21 07:24:52 +00:00
Campbell Barton
75410037fd - correct some spelling errors. 
- remove FreeCamera struct (wasnt used)
- remove world color alpha values (not used anywhre).
 2010-07-20 10:41:08 +00:00
Joerg Mueller
4490e409a4 svn merge -r 30418:30512 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-07-19 22:43:45 +00:00
Campbell Barton
fd31436897 spelling correction: alredy --> already 2010-07-17 18:08:14 +00:00
Joerg Mueller
2ffe3e46c5 svn merge -r 30323:30417 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2010-07-16 17:43:08 +00:00
Mitchell Stokes
952821dfd4 BGE doc updates: 
Fixed some typos and added docs for the following functions:

startGame()
endGame()
restartGame()
LibLoad()
LibNew()
LibFree()
 2010-07-16 09:10:46 +00:00
Campbell Barton
5daf9354d2 change some references to .B.blend, .Blog to new names 2010-07-15 11:51:43 +00:00
Campbell Barton
dd3f9cff91 patch from Goran Milovanovic for the BGE python api. 
camera.ortho_scale (use when in ortho mode only)

(own previous commit incorrectly removed thumb metadata from new imbuf)
 2010-07-14 20:52:04 +00:00
Joerg Mueller
a61e7041ce Removed stopDSP, relict from FMOD. 2010-07-14 09:01:31 +00:00
Joerg Mueller
7a89b679c9 Merging revision 30126:30261 from trunk. 2010-07-13 11:14:49 +00:00
Benoit Bolsee
44c30fbbac BGE bug #22760: VideoTexture not available when Blender is compiled without FFMPEG. VideoTexture can be used without FFMPEG, no need to disable it. 2010-07-12 13:25:57 +00:00
Mitchell Stokes
1a98efa426 Fixing a crash created by an earlier GLSL lighting fix for dynamic loading. When implementing the fix I forgot to check for materials that did not have a blender shader (ie, non GLSL materials). 2010-07-11 09:31:19 +00:00
Guillermo S. Romero
3eebaceaa6 Fix spelling. 2010-07-09 23:14:07 +00:00
Joerg Mueller
9772eb4d5f Audaspace: 
* Renamed AUD_Handle to AUD_Channel in the C-API to prevent errors with the C++ version of AUD_Handle.
* Added Python API!!!
 2010-07-09 12:35:40 +00:00
Joerg Mueller
3cef95cd93 Fix for ipo conversion on file transition in the game engine. 2010-07-08 17:47:46 +00:00
Brecht Van Lommel
f65c15cd5a Fix #22772: remove unnecessary -fpascal-strings flag on OS X, only 
some debug code in webplugin needed it.
 2010-07-07 15:26:02 +00:00
Joerg Mueller
229b7639e7 Merged revision 29562 from /branches/soc-2010-nexyon. 2010-06-19 10:50:23 +00:00
Mitchell Stokes
08a94f9bbd BGE: When dynamically loading scenes (bge.logic.LibLoad()) in GLSL mode, the lights in the loaded scene would not affect the current scene and vice versa. To fix this, I've updated to merge code to update the scenes that the shaders are using to the scene being merged into. 2010-06-16 19:07:20 +00:00
Mitchell Stokes
aeb9c44461 A bad assignment was causing the VideoTexture to set off a breakpoint when being initialized in debug mode. (Benoit gave the go ahead for this fix) 2010-06-16 08:36:18 +00:00