griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
48,826 Commits 1 Branch 0 Tags
103ef7cacb5dd10aa2dfd5bb973c0dfd772885eb
Commit Graph

2764 Commits

Author SHA1 Message Date
Mitchell Stokes
103ef7cacb Merged changes from trunk r58324-58419. 2013-07-19 22:10:11 +00:00
Antony Riakiotakis
dda61cc82f Fix some definitions for MinGW64 2013-07-19 19:19:15 +00:00
Mitchell Stokes
eb21bdd249 Merging changes from trunk r58091-58323. 2013-07-17 01:40:26 +00:00
Mitchell Stokes
5ba2f4367d BGE: adding a fix so 2D filters work properly with side-by-side stereoscopic rendering. 2013-07-15 22:44:48 +00:00
Mitchell Stokes
efc4b08094 BGE: Fix for [#36023] "Objects of added scene are lit by lights of current scene" reported by Raf Colson (raco). 
The material caching now keeps a cache per scene. Before materials from different scenes were sharing the same cache.
 2013-07-15 22:35:09 +00:00
Campbell Barton
02ba328ca8 clang/cmake - quiet warnings for external libs and reference moto as a system include. 2013-07-15 08:26:16 +00:00
Mitchell Stokes
19dee5e413 BGE: Adding animation culling. Armature objects will only have their poses updated if their children meshes have not already been culled. Regular object animations will always be updated since they are cheap. 2013-07-09 20:50:15 +00:00
Mitchell Stokes
83e9f32382 BGE: Committing patch #32422 "Debug properties for added objects" by HG1. 
This patch allows debug properties from objects added to the scene at runtime to be displayed under the Debug Properties in the overhead display.
 2013-07-09 20:06:36 +00:00
Mitchell Stokes
f6502a67f2 BGE cleanup: Getting rid of an unused variable warning in GPG_Canvas::Init(). 2013-07-09 01:42:13 +00:00
Mitchell Stokes
b73793f636 BGE cleanup: removing some unused code from GPC_Canvas. 2013-07-09 01:34:23 +00:00
Mitchell Stokes
60812e0260 BGE cleanup: Removing the GamePlayer/xembed folder and associated build options. This code was very old and not used. For example web player code, look at Burster. 2013-07-09 01:24:51 +00:00
Mitchell Stokes
a6d26cb665 BGE cleanup: GPC_System was an empty class, so I'm dropping it and having GPG_System inherit directly from KX_ISystem. 2013-07-09 01:18:48 +00:00
Mitchell Stokes
7b8453b164 BGE cleanup: removing various unused code and files from GamePlayer/common. 2013-07-09 01:14:52 +00:00
Mitchell Stokes
5b3106b89d BGE cleanup: removing unused banner code from GPC_Canvas. 2013-07-09 01:04:49 +00:00
Mitchell Stokes
abdb983a46 BGE cleanup: actually remove KX_PhysicsPropertiesobsolete.h from the CMakeLists.txt instead of just commenting it out. 2013-07-09 01:01:25 +00:00
Mitchell Stokes
5bcc621fbf BGE cleanup: removing an unused KX_PhysicsPropertiesobsolute.h file. 2013-07-09 00:59:57 +00:00
Campbell Barton
418011907c remove nan copyrights from code added since blender become opensource (copy paste errors), also remove BKE_script.h 2013-07-02 10:14:59 +00:00
Campbell Barton
1f091fd234 add missing gpl headers 2013-07-02 09:47:22 +00:00
Campbell Barton
d665c46a64 fix [#35884] evil bge.types.BL_Shader.setUniformMatrix3() 2013-06-27 07:49:20 +00:00
Campbell Barton
fad1da062d correct typos in comments. 2013-06-25 22:58:23 +00:00
Mitchell Stokes
64007a94c0 BGE: Fix for [#30450] "F-Curve on bone not working" reported by HG1. 
Run IPOs for all objects and not just non-armature objects.
 2013-06-24 09:37:37 +00:00
Mitchell Stokes
c3d70a9baf BGE: Fix for [#34185] "billboard scale problem in groups" reported by Tobias Lijsen (blenderhilfe). 
Use world scaling instead of local scaling when billboarding so we get all inherited scaling.
 2013-06-24 08:26:05 +00:00
Mitchell Stokes
dbec3af994 BGE: Fix for [#35737] "Action actuator in property mode don't work with values lower then 1" reported by HG1. 
IPOs were only set as "initialized" if the current time was greater than 0.0, which is why negative values weren't working.
 2013-06-24 04:24:01 +00:00
Daniel Stokes
23c0e0d996 BGE: fix [#35811] Blenderplayer crash on closing if file saved with an actual version. 
Making sure free_nodesystem() is called before BLO_blendfiledata_free() fixes the problem. free_nodesystem() relies on blendfiledata.
 2013-06-24 04:21:17 +00:00
Inês Almeida
5d28a6bb58 Minor code cleanup in 'source/gameengine/GamePlayer/ghost/GPG_Application.cpp'. 
Removed a function call with no effect and merged two other lines for legibility.
This commit was reviewed by Moguri.
 2013-06-22 09:04:33 +00:00
Dalai Felinto
c72653cca0 BGE bugfix/patch "[#26075] game anaglyph colors are inverted" by Juha Maki-Kanto (kanttori) 
Later I will try to find when this bug was introduced. But it's definitively broken in trunk.
 2013-06-22 08:04:02 +00:00
Mitchell Stokes
92aca19eda BGE: Fix for [#35815] "makeScreenshot() relative path not working in Blenderplayer" reported by HG1. 
Someone forgot to add relative path expansion (BLI_path_abs) to the Blenderplayer...
 2013-06-22 05:27:28 +00:00
Brecht Van Lommel
2df82a2a2b Code cleanup: fix some vs2012 compiler warnings 2013-06-21 12:33:19 +00:00
Daniel Stokes
d6f38e4e01 BGE: fix [#32775] LibFree crashing 
Used the engine's RemoveScene (which ultimately calls the converter's RemoveScene) instead of the converter's RemoveScene when the converter free a blend file. This handles the scene removal in a safer fashion and solves the crash described in part 2 of the bug report. Part 1 no longer appears to cause a crash.
 2013-06-21 06:56:43 +00:00
Mitchell Stokes
d3fc2bd95b BGE: Fix for [#33163] "Text Font Bug" reported and fixed by HG1. 
The embedded player was calling glPolygonMode(GL_FRONT_AND_BACK, GL_FILL) before rendering font objects, but someone forgot to add this to the Blenderplayer.
 2013-06-20 22:37:55 +00:00
Daniel Stokes
62c6ee2c55 BGE: fix [#35447] LibLoad Meshes and Scenes causes crash of blender 
KX_BlenderSceneConverter's destructor freed the contents of several std::vectors without removing those contents from the vectors. Later these vectors are iterated through. Making sure the vectors get cleared solves this problem.
 2013-06-20 06:17:28 +00:00
Mitchell Stokes
1e64732d52 BGE: Fix for [#34781] "bge.texture.ImageRender does not show Font object" reported by Monster. 
This fix is mostly based off of HG1's patch from the bug report, which had ImageRender::Render() call KX_KetsjiEngine::RenderFonts(). However, I have moved RenderFonts() from KX_KetsjiEngine to KX_Scene where all of the other font and rendering functions are. The real fix for this mess would be to not have ImageRender::Render() have so much duplicate code from KX_KetsjiEngine::Render(), but that's a code cleanup problem for another day.
 2013-06-20 03:50:02 +00:00
Mitchell Stokes
4eded6dbdc BGE: Fix for [#35479] "OSKEY (Command Key on Mac) not working" reported by Mike Pan (mpan3). 
The OSKEY was never added to the game engine, so it didn't recognize it.
 2013-06-20 03:22:55 +00:00
Mitchell Stokes
1f785cc196 BGE: Fix for [#32218] "logic.addScene() Not Adding Scenes in Order" reported by Josiah Lane (solarlune). 
Adding scenes now uses a vector instead of a set to maintain order. This fix is partly based off of patch #32297 by Pavel Sadikov (sigmat).
 2013-06-18 04:15:27 +00:00
Mitchell Stokes
2a1d58c14d BGE: Fixing the python profiling information so that bge.logic.getProfileInfo() returns information even if Show Framerate and Profile is not enabled. 2013-06-17 06:40:39 +00:00
Mitchell Stokes
53e4911ec8 BGE: Fixing a bug that caused KX_GameObject.localTransform to give incorrect results. 2013-06-13 22:15:44 +00:00
Campbell Barton
9fb3d3e032 remove redundant includes from cmake and scons. 2013-05-30 02:16:22 +00:00
Campbell Barton
9cf6e305a9 split bge includes for scons onto their own lines (for easier merging) 2013-05-29 21:56:55 +00:00
Bastien Montagne
e9f0b1ad0a Grr, forgot this in r57127... 
BF_PYTHON_INC can contain more than one path (in the mono-string format), don't know how this could not be found earlier, completely broke build of GE on any recent Debian/Ubuntu distro???
 2013-05-29 18:59:59 +00:00
Campbell Barton
225c5fee6b move BLO_sys_types.h -> BLI_sys_types.h (it had nothing todo with loading) 
remove MEM_sys_types.h which was a duplicate.
 2013-05-28 19:35:26 +00:00
Campbell Barton
c77179a3c2 code cleanup: comment/remove unused defines 2013-05-28 01:15:59 +00:00
Sergey Sharybin
880c132b11 Fix #35480: object without material crash blender when starting game engine 
Was a missing NULL-pointer check. No idea why it took so long to figure
issue out -- apparently there was no crash in linux for me and msvc
didn't show any backtrace :S

Also corrected weirdo way of bit flag check which was:
  !ma->mode & MA_FACETEXTURE
better do !(ma->mode & MA_FACETEXTURE) since ! is a logic NOT.
 2013-05-27 15:13:14 +00:00
Campbell Barton
ec8d277c64 BLI_math rename functions: 
- mult_m4_m4m4 -> mul_m4_m4m4
- mult_m3_m3m4 -> mul_m3_m3m4

these temporary names were used to avoid problems when argument order was switched.
 2013-05-26 18:36:25 +00:00
Campbell Barton
6de829cb7a code cleanup: split scons includes onto multiple lines, reduce chance of include conflicts later on. 2013-05-20 18:42:28 +00:00
Mitchell Stokes
76ee6d3fc5 BGE: Applying patch [#35416] "Missing python properties on ActionActuator: layer, layerWeight" from Florian Bantner (scheintodx). 2013-05-19 03:15:50 +00:00
Mitchell Stokes
bb7b04bd94 BGE: A little bit of cleanup: 
* Removing KX_Scene::RemoveAnimatedObject() since KX_Scene::NewRemoveObject() is already handling this.
  * Don't create a new BL_ActionManager when replicating an object. Just set m_actionManager to NULL and let KX_GameObject::GetActionManager() allocate a new BL_ActionManager when one is needed.
  * Use KX_GameObject::GetScene() instead of KX_GetActiveScene() in KX_GameObject::GetActionManager() to make sure we're using the object's scene instead of one where Python might currently be running from. This could avoid potential issues with playing actions for objects in other scenes.
 2013-05-14 22:52:10 +00:00
Jürgen Herrmann
3d3a4e8eec Patch [#35234]: 
Fix GetWindowsLon and SetWindowsLong issues with VS2012 and Windows 8.
Remove unneeded #ifdef block for GWL_WNDPROC and GWL_USERDATA
 2013-05-13 20:27:05 +00:00
Brecht Van Lommel
21955ac8aa Fix #35329: action actuator crash with replacemesh, pointers got outdated. 
No need to cache this, creating it is quick.
 2013-05-13 10:54:57 +00:00
Brecht Van Lommel
70eaf2fe44 Image paint: 2D painting now supports texture masks and does masking more 
consistent with projection painting.

Also did some refactoring of this code, moving the brush image creation code
out of brush.c and making it consistent with image updating code.
 2013-05-12 09:14:13 +00:00
Mitchell Stokes
18fda6d84c BGE: Fix for [#34044] "Objects with no material don't have their "face image" always working on bge" reported by Dalai Felinto (dfelinto). 
NULL materials are no longer cached.
 2013-05-11 03:20:19 +00:00