kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
13,924 Commits 2 Branches 0 Tags 753 MiB
704fef314a
Commit Graph

725 Commits

Author SHA1 Message Date
Brecht Van Lommel
704fef314a Various game engine fixes: 
* Fix issue with add transparency mode with blender materials.
* Possible fix at frontface flip in the game engine.
* Fix color buffering clearing for multiple viewports, it used
  to clear as if there was one.
* Fix for zoom level in user defined viewports, it was based on
  the full window before, now it is based on the viewport itself.
* For user defined viewports, always use Expose instead of
  Letterbox with bars, the latter doesn't make sense then.
 2008-09-14 00:32:18 +00:00
Brecht Van Lommel
fa825e70e3 Game engine: added Rasterizer.get/setMaterialMode to set texface, 
multitexture or glsl materials. This does not affect existing
scenes, only newly created ones.
 2008-09-13 19:19:51 +00:00
Benoit Bolsee
8925ae6042 BGE patch: use new btScaledBvhTriangleMeshShape to allow shape sharing between replicas and avoid BVH rebuild in case of scaling. This will save memory and speed up greatly the instantiation of static mesh. 2008-09-13 16:03:11 +00:00
Benoit Bolsee
ba9d3aa4ab BGE patch: fix transform bug on compound shape: child shape didn't take into account parent inverse node. Fix scaling bug on instantiation of compound shape: child shape didn't have correct shape. Note: global scaling doesn't work on compound shape (limitation of Bullet); don't set any scale on the top dynamic object. 2008-09-13 11:46:07 +00:00
Campbell Barton
dfb5ebb12e return dummy python values when no joystick is present 2008-09-13 11:43:01 +00:00
Brecht Van Lommel
21d74deda6 Fixes for game engine runtime on Mac OS X, there were issues 
working with relative paths. Still doesn't work optimal, since
paths are relative to game.blend which is in the app bundle
under Contents/Resources, so other files need to be moved there
manually at the moment.
 2008-09-12 16:06:17 +00:00
Ton Roosendaal
6ebd6cfa73 Bugfixes in SDL joystick, apparently it gives NULLs in OSX. 2008-09-12 15:26:00 +00:00
Daniel Genrich
f274336f2f svn merge -r 16453:16485 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-12 12:58:08 +00:00
Campbell Barton
0dea748e01 save and load configuration actuator, (option in game actuator menu) 
saves a marshal'd GameLogic.globalDict to the blendfile path with the blend extension replaced with bgeconf

Use this in YoFrankie to save keyboard layout and graphics quality settings.
 2008-09-12 02:15:16 +00:00
Benoit Bolsee
b16b0f91ec Repair rayCast part 2: return correct polygon information and true normal 2008-09-11 20:16:30 +00:00
Campbell Barton
97178fecd9 BGE message python api could return a CList type or None which makes exception checks annoying. just return an empty CList rather then None. 2008-09-11 14:58:13 +00:00
Brecht Van Lommel
729af67742 Bugfix: saved game engine runtimes failed to load library .blend 
files with relative paths.
 2008-09-11 13:00:54 +00:00
Campbell Barton
dca6bd87ef removed debug print 2008-09-10 22:49:11 +00:00
Daniel Genrich
c40fe7b255 svn merge -r 16411:16453 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-10 10:53:38 +00:00
Brecht Van Lommel
75078d62df Fix for bug #17589: removing a lamp in the game engine with glsl 
materials did not work correct.
 2008-09-10 09:51:06 +00:00
Benoit Bolsee
74ab278d46 BGE bug #17549: fix crash on removeParent() with static mesh. Fix scaling bug on setParent(). Add python setWorldPosition() to allow setting object position in world coordinate regardless if it is a root or a child object. 2008-09-09 22:40:10 +00:00
Benoit Bolsee
f305bb22b7 Patch 17508: Blender Web Plugin - XEmbed. Enable XEmbed integration of blenderplayer, using -i as input parameter to pass embedder window id. create a minimal web plugin to embed blenderplayer on web pages (using gecko/mozilla as browser). Only for *nix. 2008-09-09 21:15:30 +00:00
Benoit Bolsee
f3fc5a8b61 BGE bug #17574 fixed: GE Text input doesn't register in 2.47. Force registration of keyboard sensor with no link as this is typically the setting for key logging. 2008-09-07 19:58:37 +00:00
Daniel Genrich
44f9276b67 svn merge -r 16396:16411 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-07 19:47:15 +00:00
Benoit Bolsee
0bf03ef2f1 BGE patch: Simulate dupligroup operation when parent and child are not active/inactive at the same time: don't convert the child. This unusual situation is used in Apricot for testing. 2008-09-07 10:47:33 +00:00
Benoit Bolsee
667c8d83fb BGE patch: break parent relationship when child and parent are not active/inactive at the same time. This unusual situation is used in Apricot for test purposes. 2008-09-06 22:06:01 +00:00
Benoit Bolsee
9f05477ea1 svn merge -r 16371:16396 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-06 17:49:26 +00:00
Campbell Barton
c7fe2199a7 object_find, didnt get images from an objects material textures 
KX_PythonInit.cpp - own error in recent commit.
 2008-09-06 17:04:54 +00:00
Kent Mein
115cf18bed converted my gen_utils.h fix to PyObjectPlus.h 
Also added a fix for PyMarshal_WriteObjectToString

Now I just need to figure out linking of the gameengine on my imac.

Kent
 2008-09-06 14:13:31 +00:00
Kent Mein
8675ff6d1d Trying to keep things compiling on my imac (10.4.11) 
I'm getting this error now:
GPG_Application.cpp: In member function 'void GPG_Application::stopEngine()':
/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3/marshal.h:12: error: too many arguments to function 'PyObject* PyMarshal_WriteObjectToString(PyObject*)'
GPG_Application.cpp:720: error: at this point in file

Are we offically not supporint older versions of python now? :)

Kent
 2008-09-06 02:46:11 +00:00
Brecht Van Lommel
e279aadb97 Bugfix: game engine could crash with empty display arrays on 
windows (caused by invisible faces for example).
 2008-09-06 01:18:53 +00:00
Campbell Barton
5eab0da633 BGE set visible actuator, option to set visibility recursively to make managing visibility for collections of objects a lot easier. 
BGE Python api's ob.setVisible() also takes an optional recursive arg thats off by default
 2008-09-05 16:22:14 +00:00
Brecht Van Lommel
330aa94ecc * GLSL lamps now respect 3d viewport layers. 
* Fix undo crash related to sound. Sounds still stop working in
  the game engine after undo, but seems to be a different issue.
 2008-09-05 14:33:36 +00:00
Campbell Barton
e3a1547eea BGE Py API 
added exception messages for replaceMesh.setMesh() and allowed None as an argument.
added exception messages for other BGE module functions.
 2008-09-05 02:53:12 +00:00
Daniel Genrich
dd03596bfe svn merge -r 16351:16368 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2008-09-04 23:33:19 +00:00
Benoit Bolsee
2d50ead6b8 Partial repair of raycast system with Bullet 2.71. Still to be done: face and normal information 2008-09-04 23:07:43 +00:00
Brecht Van Lommel
cb89decfdc Merge of first part of changes from the apricot branch, especially 
the features that are needed to run the game. Compile tested with
scons, make, but not cmake, that seems to have an issue not related
to these changes. The changes include:

* GLSL support in the viewport and game engine, enable in the game
  menu in textured draw mode.
* Synced and merged part of the duplicated blender and gameengine/
  gameplayer drawing code.
* Further refactoring of game engine drawing code, especially mesh
  storage changed a lot.
* Optimizations in game engine armatures to avoid recomputations.
* A python function to get the framerate estimate in game.

* An option take object color into account in materials.
* An option to restrict shadow casters to a lamp's layers.
* Increase from 10 to 18 texture slots for materials, lamps, word.
  An extra texture slot shows up once the last slot is used.

* Memory limit for undo, not enabled by default yet because it
  needs the .B.blend to be changed.
* Multiple undo for image painting.

* An offset for dupligroups, so not all objects in a group have to
  be at the origin.
 2008-09-04 20:51:28 +00:00
Kent Mein
f0eaf424ab Added SDL headers so gamestuff compiles with Makefiles again. 
Kent
 2008-09-04 15:29:43 +00:00
Campbell Barton
961a26d500 fix for 2 python refcounting errors 2008-09-03 23:51:55 +00:00
Daniel Genrich
096b4638c4 Revert rev16344 on trunk, bullet work is done in sim_physics branch as discussed on sunday meeting 2008-09-03 11:11:11 +00:00
Campbell Barton
cfa07e8d2b BGE Py api, deleting properties didnt raise an error when the property wasnt there. also added some exception messages and renamed joystick getConnected() to isConnected() 2008-09-03 06:43:07 +00:00
Erwin Coumans
1926e84650 Finally upgraded to latest Bullet subversion, about to release 2.71. Some recent changes in extern/bullet2 need to be re-applied, will check with Benoit. Ray tests in 0_FPS_Template.blend is broken, didn't figure out why yet. 
HELP BUILD SYSTEM MAINTAINERS: Please help with updating all build systems: the newly added files need to be added. Note that the src/SoftBody has been added for future extension of real-time soft bodies.
 2008-09-03 02:27:16 +00:00
Benoit Bolsee
fe93743518 BGE patch 17547 approved: Cleaned up pydoc for BGE, compiles now error free 2008-09-02 22:13:07 +00:00
Benoit Bolsee
0fe906f49e BGE patch: simple fix to synchronize sensor pulse mode with sensor state transitions. 2008-09-02 18:34:54 +00:00
Campbell Barton
84dcfa181b BGE Bugfix, SDL joysticks arrow keys didnt work when 2 joysticks were being used at the same time. 
The event queue was running for every joystick sensor without checking if the events were for that joystick.
seperating the event queue for each joystick is overkill so instead deal with all joysticks events in once function.

Also removed some unused functions
 2008-09-02 06:12:19 +00:00
Campbell Barton
81ad271d15 BGE joystick sensor bugfix, was sending true events logic tick (as if the true pulse option was enabled). 2008-09-02 02:03:03 +00:00
Campbell Barton
7b9ee57c0b BGE joystick sensor py api function 'getConnected()', returns true if the joystick is connected and working. 
SCA_Joystick.h seemed to have twice as many newlines as needed.
 2008-09-01 06:25:13 +00:00
Campbell Barton
e8049903ac BGE python api for get/setting the joystick index, minor cleanup also. 2008-09-01 00:12:39 +00:00
Benoit Bolsee
234b616078 BGE bug #17459 fixed: action actuators depending on their order in the actuator list. 2008-08-31 21:53:39 +00:00
Benoit Bolsee
7f257df5b4 BGE patch 17547 applied in trunk: Cleaned up pydoc for BGE, compiles now error free 2008-08-31 19:07:10 +00:00
Benoit Bolsee
74339c639a BGE patch approved: BGE Multiple Joysticks 2008-08-31 18:42:58 +00:00
Campbell Barton
e21b3d81c5 Use Py_ssize_t rather then int, broke building on 64bt linux 2008-08-29 06:32:42 +00:00
Campbell Barton
f60992daae BGE Py API - GameKeys.EventToString() utility function, makes key configuration menu's easier to write. 
own error with blenderplayer, wasnt decreffing the GameLogic module, probably didnt matter since python was restarted anyway, but is incorrect.
 2008-08-29 03:15:17 +00:00
Benoit Bolsee
272132888f BGE patch: add X-Ray option to ray sensor. The option is effective only if a property is set: the sensor will ignore the objects that don't have the property. 2008-08-28 19:37:49 +00:00
Benoit Bolsee
9f89f4cf34 compilation problem with gcc, memset undeclared 2008-08-28 12:12:56 +00:00