godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
21,193 Commits 15 Branches 59 Tags 2.2 GiB
072e40368e
Commit Graph

68 Commits

Author SHA1 Message Date
Rémi Verschelde
7013607ef9
Merge pull request #28365 from fire/split_clip_blend_shapes 
Modify ResourceImporterScene to split animations with blendshapes.
 2019-05-06 16:58:29 +02:00
Rémi Verschelde
6ee5f7c881
Merge pull request #27453 from KoBeWi/glhf_scene_root 
Use filename for scene root of imported models
 2019-04-30 11:38:32 +02:00
homer666
106d1f3c3c Refresh import dock on change "animation/storage" 2019-04-29 11:38:45 +10:00
K. S. Ernest (iFire) Lee
342266d782 Modify ResourceImporterScene to split animations with blendshapes. 
# Conflicts:
#	editor/import/resource_importer_scene.cpp
 2019-04-23 17:25:44 -07:00
Juan Linietsky
5823b5d77d Bundled VHACD library for convex decomposition. 
Modified both MeshInstance tools as well as importer to use it instead of QuickHull.
 2019-04-10 17:47:28 -03:00
Tomasz Chabora
82fadde680 Use filename for scene root of imported models 2019-04-08 18:43:55 +02:00
Angeloss
40acc3ecdc Fix: Keep custom tracks option now keeps animation loop property and value track update mode. 
(cherry picked from commit 589c5698a0)
 2019-04-03 16:59:34 +02:00
Ilaria Cislaghi
b6fe7a794d Importer for scenes only overrides the base Node if differently specified by the user 2019-03-02 13:31:11 +01:00
Juan Linietsky
f669ebeeaf -Properly handle missing ETC support on export 
-Added ability for resource importers to save metadata
-Added ability for resource importers to validate depending on project settings
 2019-02-26 18:45:06 -03:00
marxin
8d51618949 Add -Wshadow=local to warnings and fix reported issues. 
Fixes #25316.
 2019-02-20 19:44:12 +01:00
Rémi Verschelde
c5dcbeb160 Scene: Ensure classes match their header filename 
Also drop some unused files.

Renamed:
- `scene/2d/navigation2d.h` -> `navigation_2d.h`
- `scene/2d/screen_button.h` -> `touch_screen_button.h`
- `scene/3d/scenario_fx.h` -> `world_environment.h`
- `scene/audio/audio_player.h` -> `audio_stream_player.h`
- `scene/resources/bit_mask.h` -> `bit_map.h`
- `scene/resources/color_ramp.h` -> `gradient.h`
- `scene/resources/shape_line_2d.h` -> `line_shape_2d.h`
- `scene/resources/scene_format_text.h` -> `resource_format_text.h`
- `scene/resources/sky_box.h` -> `sky.h`

Dropped:
- `scene/resources/bounds.h`
 2019-02-12 17:21:48 +01:00
Rémi Verschelde
b16c309f82 Update copyright statements to 2019 
Happy new year to the wonderful Godot community!
 2019-01-01 12:58:10 +01:00
Juan Linietsky
e0871b0f52 Baker fixes 2018-10-07 11:18:44 -03:00
Rémi Verschelde
277b24dfb7 Make core/ includes absolute, remove subfolders from include path 
This allows more consistency in the manner we include core headers,
where previously there would be a mix of absolute, relative and
include path-dependent includes.
 2018-09-12 09:52:22 +02:00
Rémi Verschelde
52466d57e9 Make some debug prints verbose-only, remove others 2018-08-24 14:59:01 +02:00
Hein-Pieter van Braam
0e29f7974b Reduce unnecessary COW on Vector by make writing explicit 
This commit makes operator[] on Vector const and adds a write proxy to it.  From
now on writes to Vectors need to happen through the .write proxy. So for
instance:

Vector<int> vec;
vec.push_back(10);
std::cout << vec[0] << std::endl;
vec.write[0] = 20;

Failing to use the .write proxy will cause a compilation error.

In addition COWable datatypes can now embed a CowData pointer to their data.
This means that String, CharString, and VMap no longer use or derive from
Vector.

_ALWAYS_INLINE_ and _FORCE_INLINE_ are now equivalent for debug and non-debug
builds. This is a lot faster for Vector in the editor and while running tests.
The reason why this difference used to exist is because force-inlined methods
used to give a bad debugging experience. After extensive testing with modern
compilers this is no longer the case.
 2018-07-26 00:54:16 +02:00
Max Hilbrunner
43a2e9e669
Merge pull request #15881 from dertom95/EditorScenePostImport 
EditorScenePostImport: added get_source_folder() and get_source_file(…
 2018-07-05 02:27:26 +02:00
Juan Linietsky
c02d8be59d further fixes to tag detection on importer 2018-07-02 05:54:58 -03:00
Juan Linietsky
beebd0b9de Add a condition to detect duplicates objects, so cases like object-col.323, common in blender, is still detected as collision. 2018-07-02 02:02:32 -03:00
Juan Linietsky
896e250f2b -Fix in animationplayback, sound would be cut on loop 
-Fix on scene importer, keeping changes to animation tracks was not working
 2018-07-01 17:45:19 -03:00
Thomas Trocha
48e3ff0c8a EditorScenePostImport: added get_source_folder() and get_source_file() methods 2018-05-31 03:23:42 +02:00
Hugo Locurcio
1c419531a0 Change ".." punctuation for "..." in editor strings (#16507) 2018-04-22 19:36:01 +02:00
Juan Linietsky
1322ca6fb2 Ability to import .escn files, which is just a .tscn but with forced import. 
This works together with the new Blender to Godot exporter.
 2018-01-30 11:04:22 -03:00
Rémi Verschelde
e4213e66b2 Add missing copyright headers and fix formatting 
Using `misc/scripts/fix_headers.py` on all Godot files.
Some missing header guards were added, and the header inclusion order
was fixed in the Bullet module.
 2018-01-05 01:22:23 +01:00
Rémi Verschelde
b50a9114b1 Update copyright statements to 2018 
Happy new year to the wonderful Godot community!
 2018-01-01 14:40:47 +01:00
Juan Linietsky
3de20641f5 Property install export templates when downloaded from http 
added a scale parameter for scene import
 2017-12-17 15:48:24 -03:00
Juan Linietsky
fa8a1fc420 Fixes how transform is applied to geometry in UV unwrap 2017-12-17 12:04:54 -03:00
Rémi Verschelde
8f25a2dc11 Cleanup some #if 0'd code 2017-12-17 15:40:24 +01:00
Juan Linietsky
f3ad14224e -Add lightmapper 
-Fixes to unwrapper (remove degenerates), makes Thekla not crash
-Added optional cancel button in EditorProgress
-Added function to force processing of events (needed for cancel button)
 2017-12-14 09:01:27 -03:00
Juan Linietsky
65fb961b8b -Ability to and unwrap lightmap coordinates on import 
-Added unwrap functionality to Mesh
-Ability to display and debug mesh UVs
-Added multiline draw, so it's easier and faster to draw UVs
-Many fixes to SurfaceTool
-Fixes to Thekla Unwrap, but it's a piece of ass and it keeps crashing. Will have to go away
 2017-12-09 14:18:14 -03:00
Juan Linietsky
209cb3830c Exposed EditorSceneImporter to script. Added APIs to use intermediate converters more easily. 2017-12-07 15:44:20 -03:00
Juan Linietsky
5614902611 ability to keep user tracks when importing animations, closes #12801 2017-12-07 10:19:35 -03:00
Juan Linietsky
9738ebcda0 -Fixed height fog (was broken) 
-Make sure materials are named in OBJ importer, so they can be saved outside as resources.
 2017-11-25 12:32:41 -03:00
Juan Linietsky
66a8a07c2c Add importer option to make meshes bakeable by default. 2017-11-25 01:29:35 -03:00
Rémi Verschelde
91349290dc
Merge pull request #12717 from NathanWarden/material_import_fix 
Fixed a bug where materials and/or meshes weren't assigned to scene on first import.
 2017-11-20 09:13:36 +01:00
Ferenc Arn
d28763a4c1 Rename Rect3 to AABB. 
Fixes #12973.
 2017-11-17 11:01:41 -05:00
Saracen
f8a95499bd Added 'convcol' flag for importing meshes as convex collision and completed code 
for parsing collision flags to mesh data.
 2017-11-16 13:06:30 +00:00
Nathan Warden
400db80d25 Fixed a bug where materials weren't assigned to scene on first import. 2017-11-07 00:06:11 -05:00
Saracen
ef90965883 Restores functionality of the use_compression flag in the Collada importer. 2017-11-01 00:01:24 +00:00
Leon Krause
0899b5029c Correct spelling SEPERATE -> SEPARATE to fix build 2017-09-21 03:29:26 +02:00
Juan Linietsky
423ca9bcaf Fix import order, so scenes are imported after textures. 
Also fix bugs when meshes are always generated.
 2017-09-20 21:04:20 -03:00
Indah Sylvia
13b630eb0c Fixed Typo: 'Seperate' to 'Separate' 2017-09-19 15:51:00 +07:00
Hein-Pieter van Braam
2648e50779 Merge pull request #11066 from SaracenOne/animation_external_resources 
Allow animations to be saved to external files during scene import.
 2017-09-12 14:28:48 +02:00
Rémi Verschelde
cf941fdc35 Merge pull request #11026 from hpvb/fix-assign-in-if 
Remove assignment and declarations in if statements
 2017-09-12 11:57:49 +02:00
SaracenOne
f95edd3be9 Allow animations to be saved to external files during scene import. 2017-09-11 06:59:03 +01:00
Hein-Pieter van Braam
8230bf0a2f Remove assignment and declarations in if statements 
After discussing with @reduz and @akien-mga it was decided that we do
not allow assignments or declarations in if statements. This PR removes
the instances of this I could find by automated means.
 2017-09-08 14:59:15 +02:00
Hein-Pieter van Braam
67a706fc1b Fix various assorted warnings 
Fix various warnings that don't have enough instances to merit
individual commits. Also fixes a potential bug in audio_server.cpp.
 2017-09-08 14:57:48 +02:00
Juan Linietsky
d39e79e7ec Fix issues regarding reload of resources in imported scenes. Closes #10017 2017-08-31 18:57:44 -03:00
Juan Linietsky
efcafab625 Changed defaults, as it seems to be obviousy better to keep materials outside by default.. 2017-08-29 21:54:26 -03:00
Rémi Verschelde
7ad14e7a3e Dead code tells no tales 2017-08-27 22:13:45 +02:00