townforge/Urho3D
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,869 Commits 3 Branches 3 Tags 168 MiB
cc-2
Commit Graph

9869 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aster2013
460da659ee Add JSON support in Urho3D. 2014-04-19 22:21:05 +08:00
Lasse Öörni
9b833e371a Always hide the status bar independent of window flags. 2014-04-19 17:01:10 +03:00
urho3d-travis-ci
32b691d70d Travis CI: API documentation update at 2014-04-18 20:53:24 UTC. 
[ci package]
 2014-04-18 20:53:24 +00:00
Lasse Öörni
955a8bb34e Joystick refactoring after merging the joystick pull request from thebluefish. 
- Fixed "ghost" buttons due to setting button down state both by joystick button and controller button mapping.
- Fixed missing name in joystick state.
- Allow getting joystick state both by joystick ID (Input::GetJoystick()) and a zero-based index (Input::GetJoystickByIndex()).
- Fixed ambiguity in Input class parameter names whether functions take a joystick ID, or an index. Most take joystick ID by now.
- Controller events removed. Controller joysticks will receive ordinary joystick events, but with controller axis & button mappings.
- Joystick identifying parameter in joystick events changed to JoystickID to denote that it's an ID and not a zero-based index.
- Code convention edits to Input code.
 2014-04-18 23:33:25 +03:00
Lasse Öörni
5209e6e6a6 Merge remote-tracking branch 'remotes/thebluefish/master' 2014-04-18 15:00:59 +03:00
Yao Wei Tjong 姚伟忠
dbeb244fb5 Minor clean up on sample code. Move Console & HUD to settings joystick. 2014-04-18 18:06:41 +08:00
thebluefish
51c4060135 Bugfix 
- Updated Angelscript bindings
- Updated NinjaSnowWar
 2014-04-18 00:52:59 -07:00
thebluefish
907c6a15f5 Bugfixes 2014-04-18 00:03:55 -07:00
thebluefish
1ba75f5222 Resolved virtual joystick support 
- Added function to set virtual joystick visibility.
- Updated samples.iml to reflect changess.
 2014-04-17 23:50:06 -07:00
thebluefish
33240a260a Fixed lua bindings 
- Fixed lua script bindings
- Reverted previous changes to GetJoystickName
- Tested default lua scripts with Urho3DPlayer to ensure scripts run
properly
 2014-04-17 22:54:33 -07:00
Yao Wei Tjong 姚伟忠
1397ad593b Warn when autoload folder does not exist. 2014-04-18 11:42:31 +08:00
urho3d-travis-ci
35ec1ba7fd Travis CI: API documentation update at 2014-04-18 00:55:45 UTC. 
[ci package]
 2014-04-18 00:55:45 +00:00
thebluefish
2c4fd8192e Fixed joystick support 
- Added support for events SDL_JOYDEVICEADDED and SDL_JOYDEVICEREMOVED.
- Added Urho3D events E_JOYSTICKCONNECTEDand E_E_JOYSTICKDISCONNECTED.
- Added SDL_JoystickID as a JoystickState variable.
- All joysticks are open by default. All joystick events will receive
the InstanceID of the joystick for application-level control.
- SDL_JoystickID is now used instead of the Joystick index. This way,
the order that joysticks connect does not matter. If a joystick or
controller gets disconnected, and then later reconnects during the same
game session, it will retain the same SDL_JoystickID.

Note: Virtual (on-screen) joysticks should still work, but has not been
tested.
 2014-04-17 17:40:21 -07:00
thebluefish
80515db1e2 Merge pull request #1 from urho3d/master 
Updating before submitting new changes.
 2014-04-17 16:08:12 -07:00
Lasse Öörni
5b5020abbf Hide the settings screen joystick in NinjaSnowWar when the game is unpaused. Do not show the settings joystick if not already showing the controls joystick. 2014-04-18 01:32:30 +03:00
Lasse Öörni
c6890f7942 Fixed script compilation warnings. 2014-04-18 01:32:30 +03:00
Lasse Öörni
1f91a44818 Removed the deprecated GetClassName() AngelScript Variant bindings. Fixed the Ragdolls example to not use them. 2014-04-18 01:32:30 +03:00
urho3d-travis-ci
aad0edde64 Travis CI: API documentation update at 2014-04-17 22:22:12 UTC. 
[ci package]
 2014-04-17 22:22:12 +00:00
Lasse Öörni
0c219cfb35 Document the AutoloadPaths engine startup parameter. Copy also the Extra directory in the Android CopyData batch file. 2014-04-18 00:52:43 +03:00
Lasse Öörni
7eb8210eac Merge remote-tracking branch 'remotes/friesencr/packagefile-getentrynames' 2014-04-18 00:35:03 +03:00
Lasse Öörni
848ecce091 Merge remote-tracking branch 'remotes/friesencr/auto-load-folders' 2014-04-18 00:34:36 +03:00
Lasse Öörni
5b4da41b10 Code cleanup, renamed command line option. Updated AssetImporter documentation. 2014-04-17 15:07:35 +03:00
hualin
b946be1ff5 add an option for exporting the scene meshes even if they are identical with the others 2014-04-17 15:07:23 +03:00
aster
f3ca194c24 Fixed bug of set target call order. 2014-04-17 19:48:21 +08:00
aster
19b008d44b Fix bug in ConstrainMouse2D. 2014-04-17 19:34:03 +08:00
urho3d-travis-ci
ed803ba21c Travis CI: API documentation update at 2014-04-17 10:35:33 UTC. 
[ci package]
 2014-04-17 10:35:33 +00:00
aster
728ef72062 Add degree math function, fix scale time when speed < 0. 2014-04-17 15:49:00 +08:00
aster
55e576bc11 Only receive contact event when physics stepping. 2014-04-17 15:35:48 +08:00
aster
cb0211e586 Delay send contact event. 2014-04-17 12:58:42 +08:00
Chris Friesen
873cef9840 Folders that autoload subfolders/paks on load 2014-04-16 22:27:31 -05:00
Chris Friesen
bf138fb567 Added middle editor mouse button to documentation 2014-04-16 22:19:40 -05:00
Chris Friesen
0171669690 Adds package entry filenames to PackageFile 2014-04-16 19:50:45 -05:00
Yao Wei Tjong 姚伟忠
ec25e56046 Refactor Samples to support yaw and pitch by touch on mobile platform. 2014-04-17 01:56:59 +08:00
Yao Wei Tjong 姚伟忠
ac81ae1c7f Fix static key binding map population for screen joystick. 2014-04-17 01:32:50 +08:00
Lasse Öörni
7289f4be7a NinjaSnowWar: when the console is visible, do not react to any controls. When OS mouse cursor changes from visible to hidden, center it to avoid erratic mouse move on the next frame. 2014-04-16 16:29:45 +03:00
urho3d-travis-ci
6454c2831d Travis CI: API documentation update at 2014-04-16 12:55:43 UTC. 
[ci package]
 2014-04-16 12:55:43 +00:00
Yao Wei Tjong 姚伟忠
4a449869eb Add a close button for Console to ensure it can be closed on iOS. 
Fix Console being overlapped by other UI elements in Editor.
 2014-04-16 20:29:00 +08:00
Yao Wei Tjong 姚伟忠
a38433b0aa Clean up hats' key binding code for screen joystick. 2014-04-16 20:04:52 +08:00
aster
c2c4808d2a Fix TranslateRelative in TestScene.lua.[ci skip] 2014-04-16 17:09:42 +08:00
aster
2a4c4c9eca SpriteSheet add load texture in current directory. 2014-04-16 17:08:47 +08:00
Yao Wei Tjong 姚伟忠
79cdbabb55 Add abilility to use key mapping also for hats on screen joystick. 
This should make it possible to bind the hats to something like "UP DOWN LEFT RIGHT".
This commit breaks earlier commits slightly. The default hats binding is now "WSAD" instead of "WASD".
 2014-04-16 16:49:11 +08:00
Lasse Öörni
00f08ad608 Break Deserializer::ReadString() on EOF to allow reading a whole text file at once without getting stuck. Closes #312. 2014-04-16 11:15:08 +03:00
Lasse Öörni
67e46f1d71 Improve Input documentation. Reorder InputEvents.h to match the order in documentation. 2014-04-16 10:45:12 +03:00
urho3d-travis-ci
d6c5aa05bc Travis CI: API documentation update at 2014-04-16 06:02:35 UTC. 
[ci package]
 2014-04-16 06:02:35 +00:00
aster
e0737e6c46 Replace Char event with TextInput event for CJK IME support. 2014-04-16 13:47:14 +08:00
Chris Friesen
c346c3db23 Take screenshots in the editor w/ F11 2014-04-15 23:01:33 -05:00
aster
fff89efdd8 Make 2D camera auto aspect ratio. 2014-04-16 10:59:01 +08:00
urho3d-travis-ci
742abf7866 Travis CI: API documentation update at 2014-04-15 21:59:46 UTC. 
[ci package]
 2014-04-15 21:59:46 +00:00
Lasse Öörni
b2b4d4f7da Correct touch gesture term in documentation. 2014-04-15 23:58:04 +03:00
Lasse Öörni
9906e7ed25 Gesture recording/load/save support and gesture events. SDL fixes to gesture events. Closes #304. 2014-04-15 23:48:04 +03:00