townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,192 Commits 3 Branches 3 Tags 168 MiB
wtest
Commit Graph

508 Commits

Author SHA1 Message Date
Lasse Öörni
5344d386b0 Merge remote-tracking branch 'monkeyfirst/hsv-color-wheel' 2015-07-31 21:23:54 +03:00
MonkeyFirst
b42cb1ed2a simplify menu localization 2015-07-31 02:46:23 +06:00
Lasse Öörni
9977ee909b Fix line height in the included .sdf font files. Force reevaluation of material when font changed from ttf to sdf or vice versa. Added .sdf to attribute editor font picker. Closes #801. 2015-07-30 23:27:31 +03:00
MonkeyFirst
c3b52a9e47 hsv-color-wheel 2015-07-30 01:57:16 +06:00
Lasse Öörni
d85cbd21db Spaces back to tabs in EditorStrings.json. 2015-07-29 17:13:31 +03:00
Christian Clavet
6ee3237d47 Fixed some typos 
Fixed some comma missing for the JSON file.
 2015-07-28 17:10:16 -04:00
Christian Clavet
899a9bb7fa Added missing strings (french) 
For some reasons, some strings were missing at the beginning of the
file. Double checked and all the strings are completed.
English-Russian-French
 2015-07-28 17:03:03 -04:00
Christian Clavet
7f4073be60 French strings addon 
Added french strings
 2015-07-28 16:33:01 -04:00
Lasse Öörni
61a7d65393 Explicitly set alpha blend mode for toolbar icons. See #799. 2015-07-27 17:52:07 +03:00
Lasse Öörni
b74c2360f8 Restored original controls in standard hotkeys mode. The MMB pan option (standard hotkeys mode only) now changes the behavior of shift in relation to pan & orbit only. Editor code cleanup & code convention edits. 2015-07-27 17:35:10 +03:00
Lasse Öörni
50013c85d4 Merge remote-tracking branch 'monkeyfirst/hotkeys-smg-instances' 
Conflicts:
	bin/Data/EditorStrings.json
 2015-07-27 16:26:42 +03:00
Ivan K
e91ddb3e58 Localization: fix string IDs conflict 2015-07-27 14:50:26 +04:00
Ivan K
15001acdb8 Russification: Particle Editor 2015-07-27 13:55:15 +04:00
Ivan K
6308da0c63 Russification: Material Editor 2015-07-27 13:28:10 +04:00
Ivan K
d0424bdf87 Russification: Attribute Inspector, resource picker buttons 2015-07-27 12:37:24 +04:00
Ivan K
77be3c88c4 Russification: FileSelector 2015-07-27 11:36:03 +04:00
MonkeyFirst
f1625c6fc7 WeakHandle for last... some polishing for B.mode delete 2015-07-26 22:04:27 +06:00
MonkeyFirst
7807e88e30 default pan for 2d, viewCloser for 2d , alt+scroll-zoom 2015-07-26 04:24:01 +06:00
Lasse Öörni
148bd67938 Do not attempt to localize MRU scene list in editor. 2015-07-25 22:27:17 +03:00
MonkeyFirst
7cf954d4fd delete unused variables 2015-07-25 22:53:54 +06:00
MonkeyFirst
8fc2ae9436 some fixes for smart duplicate 2015-07-25 22:47:02 +06:00
MonkeyFirst
c35ddfedcf fix ViewCloser camera placement 2015-07-25 01:31:09 +06:00
MonkeyFirst
ea02dcf9d1 delete unused action 2015-07-24 23:55:48 +06:00
MonkeyFirst
74f416b92c fixed with StaticModels and renamed into smart duplicate 2015-07-24 23:35:39 +06:00
MonkeyFirst
892a353c2f add B.mode view closer on kp_period 2015-07-24 16:54:55 +06:00
MonkeyFirst
df91bae159 add force to selecting node instead component in view port 2015-07-24 03:59:56 +06:00
MonkeyFirst
7de2a25206 auto instance 2015-07-24 02:45:05 +06:00
Lasse Öörni
d388ee7769 Lift the editor hotkeys dropdown higher in the settings window, grouped with rest of camera behavior controls. 2015-07-23 15:48:42 +03:00
Lasse Öörni
9e978e767c Merge remote-tracking branch 'monkeyfirst/material-editor-few-model-preview' 
Conflicts:
	bin/Data/Scripts/Editor/EditorView.as
 2015-07-23 15:40:41 +03:00
MonkeyFirst
85e34c5b20 add B. mode rotation when no selection & dox controls2 fix 2015-07-23 15:40:32 +06:00
Ivan K
345954d5aa Editor: automatic creating language list 2015-07-22 16:09:40 +04:00
Ivan K
d00438c224 Editor: select language in preferences 2015-07-22 15:40:35 +04:00
MonkeyFirst
8a1c80796c bledner mode mmb pan, flymode off by rmb or esc 2015-07-22 02:42:49 +06:00
MonkeyFirst
276937d054 blender mode add strafe in ortho w shift & ctrl 2015-07-22 01:44:46 +06:00
MonkeyFirst
3f8cb158d4 blender mode fixes: select w shift , strafe, pan 2015-07-22 01:30:18 +06:00
Ivan K
eb2457ce6a editor russification, add warnings to Localization::LoadJSON 2015-07-21 23:12:20 +04:00
MonkeyFirst
c3f6f1c423 fixed camera move on shift-d 2015-07-21 23:26:00 +06:00
MonkeyFirst
5907f6c22b Add mask selector, bits inversion, scroll types 2015-07-21 20:55:39 +06:00
Lasse Öörni
87c8a0874a Merge remote-tracking branch '1vanK/improvements' 2015-07-21 13:46:06 +03:00
Lasse Öörni
14fe2ad334 Remove unused variable that was moved & renamed elsewhere. 2015-07-20 18:14:22 +03:00
MonkeyFirst
43df9f2e7c fix include in editor.as 2015-07-20 04:00:17 +06:00
MonkeyFirst
f401a4992e dialog settings fix 2015-07-20 03:13:01 +06:00
MonkeyFirst
9c8ba2e2b0 Add EditLayerWindow for fastest mask view change (with children nodes) 2015-07-20 02:59:22 +06:00
Ivan K
d540f79eec Localization: fixes, adding comments, reworking samples, partial russification of editor 2015-07-19 16:07:24 +04:00
MonkeyFirst
64e7435eca fix "standard" word 2015-07-19 17:07:14 +06:00
MonkeyFirst
1f519959aa Add feature that allow to enable all hidden before nodes on one hotkey 2015-07-19 06:03:27 +06:00
MonkeyFirst
c9910c8c96 Add feature to parent selected nodes into last selected node 
Add feature to parent selected nodes into last selected node
Standart key mode - U-key
Blender key mode - P + Ctrl
 2015-07-19 04:44:11 +06:00
MonkeyFirst
b0c16c030a Add to editor settings UI option 2015-07-19 01:45:35 +06:00
MonkeyFirst
f5e1e10b6a Add hotkeys mode switching between standart & blender 2015-07-19 01:41:23 +06:00
Ivan K
1d845712c8 Internationalization: initial commit 
Localization
 2015-07-18 14:43:51 +04:00
MonkeyFirst
6b927e8533 add few models for preview 2015-07-18 03:05:20 +06:00
MonkeyFirst
721f121c91 init blender-keys-branch 2015-07-18 00:23:34 +06:00
Lasse Öörni
0fc4cdf12c Tabs to spaces. Moved MMB pan setting from Preferences dialog to Settings dialog to match the rest of the camera options. Added contributor credit. 2015-07-17 18:08:57 +03:00
julyfortoday
e10aef79cf Save/load mmbpan setting to/from xml, fixed naming 2015-07-17 09:07:25 -04:00
julyfortoday
6d8e057a7e Added togglable setting for changing the behavior of the MMB, allows panning by default instead of rotation/orbit 2015-07-16 22:26:51 -04:00
julyfortoday
0981492802 Center camera on selected object using the HOME key 2015-07-16 18:25:00 -04:00
Mike3D
a25f596e08 Added missing file formats to Editor's resource browser 2015-07-16 07:52:47 +02:00
Lasse Öörni
37f13c91d9 Remove double semicolon. 2015-07-15 00:59:12 +03:00
Lasse Öörni
9b629b2a36 Editor functionality to assign child nodes as a spline path. Contributed by MonkeyFirst. Closes #781. 2015-07-15 00:57:55 +03:00
Ivan K
f317df2961 Adding a button 'Reset Viewport' and checkbox 'Show Axes' for particle editor 2015-07-14 11:56:53 +04:00
Ivan K
8d37ae8e3d Fix scaling particle preview 2015-07-13 16:14:53 +04:00
Ivan K
0532ea5c6f Big particle preview and scaling preview with LMB + LShift 2015-07-13 15:50:58 +04:00
Lasse Öörni
ffa0b96e85 Fix typo. Ensure new node positioning uses world position in case the new node is parented. 2015-07-12 16:19:39 +03:00
Ivan K
8adcd0a965 Editor new node position 2015-07-12 13:48:24 +04:00
Lasse Öörni
986c4ca6fc If CollisionShape trimesh or convex shape assigned without a collision model, try to get it from the StaticModel in the same node. Closes #769. 2015-07-11 21:18:50 +03:00
Lasse Öörni
4219b7b157 Revert mistaken change to 20_HugeObjectCount.as. 2015-07-24 17:11:10 +03:00
Lasse Öörni
e8af02f453 Add double serialization support to Variant, Deserializer/Serializer, XMLElement & JSONValue. Use double to store a Lua object's number attributes. Add editing of double attributes to the editor. Closes #758. 2015-06-29 22:36:12 +03:00
Lasse Öörni
6b6447eb8c Detect presence of AssetImporter in either tool subdirectory or in the executable directory. 2015-06-09 21:23:04 +03:00
Yao Wei Tjong 姚伟忠
88d86548a4 Further minor clean up the CrowdAgent class. 
Revise the sample so Jack walk and turn more naturally.
 2015-05-28 17:52:12 +08:00
Yao Wei Tjong 姚伟忠
6b72c4412a Minor code clean up and bug fixes for DetourCrowd implementation. 
Avoid using multiple vectors to hold the same set of objects in the DetourCrowd sample.
 2015-05-27 21:51:10 +08:00
Mike3D
e166e7a84d Added moving obstacles and teleportation to sample 39. Also various behavior tweaks and ground texture modified to break monotony and discriminate with sample 15. If something doesn't appeal it can be reverted. 
Also set default mask and areaID at OffMeshConnection initialization.
 2015-05-23 09:27:39 +02:00
Mike3D
7f3a6ef86b Added off-mesh connections to sample 39 2015-05-20 10:56:32 +02:00
Yao Wei Tjong 姚伟忠
e7e2c262e5 Make button slider not focusable so it is easier to tab around. 2015-05-19 15:33:59 +08:00
Mike3D
3fbb34f406 Use node instead of GetNode() in lua samples 
Also simplified sample 15 for lua
 2015-05-17 17:30:37 +02:00
Lasse Öörni
f9f920964f Remove agents & obstacles on OnNodeSet(null), similar to Drawables. Do not allow adding an agent when node is already null. Added missing enum in AngelScript navigation API. Do not keep a persistent array of agent handles in the AngelScript crowd example, as that keeps the agents alive even past removal from scene. Closes #729. 2015-05-17 16:54:57 +03:00
Mike3D
cca861f6d3 Simplified sample 39 using the crowd manager 2015-05-17 10:15:41 +02:00
JSandusky
ca7a6af1f3 CrowdAgent state handling 
- CrowdAgentStateChanged event includes Node and Agent parameters
- CrowdAgentFailure event for target/agent-state failures
- GetAreaCost in NavigationMesh, script bindings updated
- Fixed error spawning Jack nodes on top of boxes in Angelscript sample
- DebugRendering for DynamicNavigationMesh layers
- Rename all references to AreaType as AreaID
- CrowdAgent angelscript enum bindings made consistent
- Include simple example handling of CrowdAgentFailure for faulty
initial state (sides of boxes) in all samples
- Consistent values in samples (box/mushroom counts)
- Completed "todo" for investigating rcFilterLedgeSpans in
DynamicNavigationMesh
 2015-05-12 02:29:32 -04:00
Mike3D
581d1b550b Do not hardcode obstacle radius 2015-05-07 17:20:05 +02:00
Yao Wei Tjong 姚伟忠
252206a207 Decouple Physics subsystem from DetourCrowd implementation. 
Also minor code clean up (dot the i's and cross the t's).
 2015-05-07 16:52:18 +08:00
Lasse Öörni
8f29e751b7 Fix memory leak in NavBuildData. Match capitalization of the CrowdNavigation help text in all versions. 2015-05-05 17:58:31 +03:00
JSandusky
567a29d74e Implementation of DetourCrowd and DetourTileCache 
Added Components:
- DynamicNavigationMesh (uses DetourTileCache)
- Obstacle (interacts with DynamicNavigationMesh)
- DetourCrowdManager (uses DetourCrowd for crowd control)
- CrowdAgent (interacts with DetourCrowdManager)
- NavArea (marks area types)

Changes:
- Refactor NavigationMesh build process
- Addition of cylinder debug rendering
- Exposed Area Type Costs in navigation

CrowdNavigation sample for Lua, Angelscript, and C++ using
DynamicNavigationMesh, Obstacle, CrowdAgent, and DetourCrowdManager
components.
 2015-05-04 22:14:00 -04:00
Lasse Öörni
aa65cedefd Add NOUV define to LitParticle, LitSolid & Unlit HLSL shaders when used as untextured, to prevent vertex layout creation problem on D3D11 when model has no UVs. Remove texcoords from the editor grid as they're no longer necessary. Closes #712. 2015-04-29 20:09:18 +03:00
Lasse Öörni
ba777f0d17 Fix omissions in Lua VertexBuffer / IndexBuffer / Model bindings. Add 34_DynamicGeometry.lua example. Closes #704. 2015-04-27 13:32:39 +03:00
Lasse Öörni
0235c02653 Expose Geometry, IndexBuffer & VertexBuffer to script, with VB & IB content access using VectorBuffer. AngelScript 34_DynamicGeometry example. Lua version to follow. 2015-04-27 10:29:38 +03:00
Lasse Öörni
97fb2638db Add fill mode to materials. 2015-04-04 02:40:38 +03:00
Lasse Öörni
d06ffe1445 Merge pull request #680 from urho3d/render-refactor 
Render refactor
 2015-03-24 23:34:39 +02:00
Lasse Öörni
2858755334 Log missing vertex element(s) when vertex layout fails to create. Add texcoords to the editor grid to keep D3D11 happy. 2015-03-15 00:23:49 +02:00
Lasse Öörni
dffab8cff1 Add item to Edit menu ("Add children to SM-group") to add all children of the StaticModelGroup node as instances. Closes #676. 2015-03-09 21:14:04 +02:00
Lasse Öörni
988f1fdc33 Merge branch 'master' into render-refactor 2015-03-07 17:59:37 +02:00
Lasse Öörni
1c549bceee Import also empty child nodes in AssetImporter scene mode, unless disabled with the -ne option. Refactor handling of the root scene node to prevent unnecessary creation of a duplicate root node. Do not attempt to parse .json files as XML in the editor resource browser. Closes #673. 2015-03-07 13:36:27 +02:00
Lasse Öörni
6fd6efc4c3 Update PugiXml to 1.5. Do not attempt to parse .txt & .icns files as xml in the editor resource browser, to prevent log spam. 2015-03-04 16:10:21 +02:00
Lasse Öörni
0c48c9df87 Fix Assimp to not give negative light direction. Fix FOV handling for spot lights in AssetImporter. Added error prints to Editor if fails to execute AssetImporter. Closes #669. 2015-02-24 12:19:25 +02:00
Lasse Öörni
9f129ecd51 Merge branch 'master' into render-refactor 2015-02-23 01:43:02 +02:00
Lasse Öörni
4fd2fe20b8 Fix Editor to not use the sm3Support variable any more. 2015-02-22 02:19:23 +02:00
Chris Friesen
28b511df32 Added copy cam transform to editor for easy cam alignment 2015-02-17 00:06:01 -06:00
aster2013
c8ed3759d8 Fix bug.[ci skip] 2015-02-03 19:36:28 +08:00
Lasse Öörni
5198313a93 Fix null exception in multiple nodes duplication. Closes #632. 2015-01-26 01:12:05 +02:00
Lasse Öörni
dc39d9e17c Fix wrong matrix math in gizmo scaling. Take zoom into account. 2015-01-21 12:12:47 +02:00
Lasse Öörni
895dfcdb3a Fix gizmo scale in orthographic mode (ortho size not taken into account). Cleaned up gizmo scaling code to use camera view matrix. Closes #626. 2015-01-20 18:03:28 +02:00
Chris Friesen
7376e24400 Editor - numpad camera modes focus selection 2015-01-20 00:33:00 -06:00
Chris Friesen
262bb942e4 Editor deselect all 2015-01-19 23:18:43 -06:00
Mike3D
6f7ff7f5f9 Simplify sample 18 for lua 2015-01-19 16:49:45 +01:00
Yao Wei Tjong 姚伟忠
05dd995b85 Refactor all the codes and scripts to use the renamed 'bin' subdir. 2015-01-18 21:40:54 +08:00
Yao Wei Tjong 姚伟忠
05a8b79fd2 Rename "Bin" subdir to "bin". 2015-01-18 21:31:13 +08:00
Yao Wei Tjong 姚伟忠
f1e564fe00 Fix the directory name. [ci skip] 2014-03-05 12:33:30 +08:00
aster2013
058347b555 Don't export LuaScript to Lua API, make SetExecuteConsoleCommands GetExecuteConsoleCommands as global functions. 2014-03-05 12:17:07 +08:00
Lasse Öörni
8990f7129b Fixed comment. 2014-03-04 22:16:52 +02:00
Lasse Öörni
554e19628e Added Lua version of ConsoleInput sample. 2014-03-04 22:08:52 +02:00