OSDN Git Service

mikumikustudio/libgdx-mikumikustudio.git
11 years agobounds checking for controllers
Mario Zechner [Thu, 10 Jan 2013 12:24:01 +0000 (13:24 +0100)]
bounds checking for controllers

11 years agojavadoc fixes
Mario Zechner [Thu, 10 Jan 2013 02:45:21 +0000 (03:45 +0100)]
javadoc fixes

11 years agominor changes to Ouya mappings, you can query if you are running on a real Ouya device
Mario Zechner [Thu, 10 Jan 2013 02:15:54 +0000 (03:15 +0100)]
minor changes to Ouya mappings, you can query if you are running on a real Ouya device

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Thu, 10 Jan 2013 02:14:02 +0000 (03:14 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agoJavadocs for the Controllers API
Mario Zechner [Thu, 10 Jan 2013 02:13:40 +0000 (03:13 +0100)]
Javadocs for the Controllers API

11 years agoÓuya integration with gdx-invaders
Mario Zechner [Thu, 10 Jan 2013 01:39:26 +0000 (02:39 +0100)]
Óuya integration with gdx-invaders

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Thu, 10 Jan 2013 01:21:04 +0000 (02:21 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoLwjglCanvas, added support for using config.
NathanSweet [Thu, 10 Jan 2013 01:20:52 +0000 (02:20 +0100)]
LwjglCanvas, added support for using config.
LwjglFrame, changed when JFrame is made displayable to prevent window from being shown before GL display is ready.

11 years agoDialog, fixed focus issues.
NathanSweet [Thu, 10 Jan 2013 01:19:23 +0000 (02:19 +0100)]
Dialog, fixed focus issues.

11 years agofixed Ouya keycodes on Ouya compared to other Android devices via magic
Mario Zechner [Thu, 10 Jan 2013 01:14:37 +0000 (02:14 +0100)]
fixed Ouya keycodes on Ouya compared to other Android devices via magic

11 years agofixed android project classpaths, fixed Timer locking bug
Mario Zechner [Wed, 9 Jan 2013 20:38:18 +0000 (21:38 +0100)]
fixed android project classpaths, fixed Timer locking bug

11 years agoadded GamepadTest, fixed a few more tiny bits
Mario Zechner [Wed, 9 Jan 2013 20:02:06 +0000 (21:02 +0100)]
added GamepadTest, fixed a few more tiny bits

11 years agoadded mappings for Ouya buttons and axes
Mario Zechner [Wed, 9 Jan 2013 16:22:48 +0000 (17:22 +0100)]
added mappings for Ouya buttons and axes

11 years agoexcluding touchpad from controllers api, the returned values are rather strange
Mario Zechner [Wed, 9 Jan 2013 16:14:39 +0000 (17:14 +0100)]
excluding touchpad from controllers api, the returned values are rather strange

11 years agoproper axis indexing. seems like the left trigger on my ouya controller doesn't go...
Mario Zechner [Wed, 9 Jan 2013 15:53:03 +0000 (16:53 +0100)]
proper axis indexing. seems like the left trigger on my ouya controller doesn't go back to -1...

11 years agofixed android controllers backend, ready for primetime, need to create the constants
Mario Zechner [Wed, 9 Jan 2013 15:18:30 +0000 (16:18 +0100)]
fixed android controllers backend, ready for primetime, need to create the constants

11 years agowired up polling for AndroidController
Mario Zechner [Wed, 9 Jan 2013 01:11:35 +0000 (02:11 +0100)]
wired up polling for AndroidController

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Wed, 9 Jan 2013 01:05:45 +0000 (02:05 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agoalmost done with new 3.1+ compatible Android gamepad API implementation
Mario Zechner [Wed, 9 Jan 2013 01:05:16 +0000 (02:05 +0100)]
almost done with new 3.1+ compatible Android gamepad API implementation

11 years agoLwjglFrame, going back to how it was.
NathanSweet [Wed, 9 Jan 2013 00:27:11 +0000 (01:27 +0100)]
LwjglFrame, going back to how it was.

11 years agoadded rewrite of Android input stuff, needs API level 15 (4.1)
Mario Zechner [Tue, 8 Jan 2013 23:26:25 +0000 (00:26 +0100)]
added rewrite of Android input stuff, needs API level 15 (4.1)

11 years agoonce you fuck in git, you can't stop...
Mario Zechner [Tue, 8 Jan 2013 23:25:55 +0000 (00:25 +0100)]
once you fuck in git, you can't stop...

11 years agoJavadocs.
NathanSweet [Tue, 8 Jan 2013 23:15:12 +0000 (00:15 +0100)]
Javadocs.

11 years agoAdded IntIntMap and IntFloatMap.
NathanSweet [Tue, 8 Jan 2013 23:12:17 +0000 (00:12 +0100)]
Added IntIntMap and IntFloatMap.

11 years agoLWJGL updated to nightly: #1903 Dec 19, 2012 1:14:34 PM
NathanSweet [Tue, 8 Jan 2013 13:24:45 +0000 (14:24 +0100)]
LWJGL updated to nightly: #1903 Dec 19, 2012 1:14:34 PM

Fixes modifier keys not working correctly and probably a few other things.

11 years agoLwjglGraphics, removed unnecessary display create try.
NathanSweet [Tue, 8 Jan 2013 11:07:51 +0000 (12:07 +0100)]
LwjglGraphics, removed unnecessary display create try.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Tue, 8 Jan 2013 01:11:01 +0000 (02:11 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoJsonWriter, fixed JSON format to put quotes around numbers.
NathanSweet [Tue, 8 Jan 2013 01:10:51 +0000 (02:10 +0100)]
JsonWriter, fixed JSON format to put quotes around numbers.

11 years agoadded controllers to mac build
Mario Zechner [Mon, 7 Jan 2013 16:54:47 +0000 (17:54 +0100)]
added controllers to mac build

11 years agoupdated update script...
Mario Zechner [Mon, 7 Jan 2013 16:49:52 +0000 (17:49 +0100)]
updated update script...

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Mon, 7 Jan 2013 16:45:39 +0000 (17:45 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agofixed desktop joystick support on mac
badlogic [Mon, 7 Jan 2013 16:40:22 +0000 (17:40 +0100)]
fixed desktop joystick support on mac

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Mon, 7 Jan 2013 15:20:25 +0000 (16:20 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agominor changes to invader
Mario Zechner [Mon, 7 Jan 2013 15:20:09 +0000 (16:20 +0100)]
minor changes to invader

11 years agobuild, added jars ant target so I don't have to wait for javadocs, zipping, etc just...
NathanSweet [Mon, 7 Jan 2013 11:12:54 +0000 (12:12 +0100)]
build, added jars ant target so I don't have to wait for javadocs, zipping, etc just to get some JARs.

11 years agoDragAndDrop, disallow stage root as target.
NathanSweet [Mon, 7 Jan 2013 10:21:19 +0000 (11:21 +0100)]
DragAndDrop, disallow stage root as target.

11 years agoSlider, animation for value changes.
NathanSweet [Mon, 7 Jan 2013 10:21:08 +0000 (11:21 +0100)]
Slider, animation for value changes.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Mon, 7 Jan 2013 09:53:25 +0000 (10:53 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoJson, fixed creating instances of Array/ArrayList subclasses.
NathanSweet [Mon, 7 Jan 2013 09:53:16 +0000 (10:53 +0100)]
Json, fixed creating instances of Array/ArrayList subclasses.

11 years agoSlider, made knob optional (for use as progress bar).
NathanSweet [Mon, 7 Jan 2013 09:47:17 +0000 (10:47 +0100)]
Slider, made knob optional (for use as progress bar).

11 years agoinvaders uses gles 2.0 on Android, falls back to 1.0 if not available
Mario Zechner [Sun, 6 Jan 2013 16:36:45 +0000 (17:36 +0100)]
invaders uses gles 2.0 on Android, falls back to 1.0 if not available

11 years agofixed OuyaControllers
Mario Zechner [Sun, 6 Jan 2013 16:28:05 +0000 (17:28 +0100)]
fixed OuyaControllers

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Sun, 6 Jan 2013 16:26:30 +0000 (17:26 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agofixed Nate's fuck up, cause he's just a minion
Mario Zechner [Sun, 6 Jan 2013 16:24:33 +0000 (17:24 +0100)]
fixed Nate's fuck up, cause he's just a minion

11 years agoLabel, fixed wrapping text not respecting bg offsets.
NathanSweet [Sun, 6 Jan 2013 09:41:35 +0000 (10:41 +0100)]
Label, fixed wrapping text not respecting bg offsets.

11 years ago...
Mario Zechner [Sun, 6 Jan 2013 02:20:53 +0000 (03:20 +0100)]
...

11 years agoexcluding OIS mac build for now, need to sleep
Mario Zechner [Sun, 6 Jan 2013 01:13:10 +0000 (02:13 +0100)]
excluding OIS mac build for now, need to sleep

11 years agolast try, disabling carbon and 32-bit build
Mario Zechner [Sun, 6 Jan 2013 01:10:28 +0000 (02:10 +0100)]
last try, disabling carbon and 32-bit build

11 years agolast try to fix ois on mac...
Mario Zechner [Sun, 6 Jan 2013 00:55:58 +0000 (01:55 +0100)]
last try to fix ois on mac...

11 years agofixed ois cocoa build
Mario Zechner [Sun, 6 Jan 2013 00:54:02 +0000 (01:54 +0100)]
fixed ois cocoa build

11 years agopatched OIS mac backend
Mario Zechner [Sun, 6 Jan 2013 00:52:17 +0000 (01:52 +0100)]
patched OIS mac backend

11 years ago...2
Mario Zechner [Sun, 6 Jan 2013 00:24:02 +0000 (01:24 +0100)]
...2

11 years agohrm, doesn't compile due to strange error
Mario Zechner [Sun, 6 Jan 2013 00:21:31 +0000 (01:21 +0100)]
hrm, doesn't compile due to strange error

11 years agoand another fix
Mario Zechner [Sun, 6 Jan 2013 00:18:05 +0000 (01:18 +0100)]
and another fix

11 years agoand another fix for mac os x
Mario Zechner [Sun, 6 Jan 2013 00:16:23 +0000 (01:16 +0100)]
and another fix for mac os x

11 years agochanged order of mac os x build
Mario Zechner [Sun, 6 Jan 2013 00:14:49 +0000 (01:14 +0100)]
changed order of mac os x build

11 years agofixed mac build of ois
Mario Zechner [Sun, 6 Jan 2013 00:13:39 +0000 (01:13 +0100)]
fixed mac build of ois

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Sun, 6 Jan 2013 00:06:36 +0000 (01:06 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agointegrated gdx-controllers into build, let's hope for the best
Mario Zechner [Sun, 6 Jan 2013 00:04:23 +0000 (01:04 +0100)]
integrated gdx-controllers into build, let's hope for the best

11 years agoAdded newline for HeaderFixer.
NathanSweet [Sat, 5 Jan 2013 23:51:07 +0000 (00:51 +0100)]
Added newline for HeaderFixer.

11 years agoRan HeaderFixer.
NathanSweet [Sat, 5 Jan 2013 23:49:35 +0000 (00:49 +0100)]
Ran HeaderFixer.

11 years agoJavadoc.
NathanSweet [Sat, 5 Jan 2013 23:47:36 +0000 (00:47 +0100)]
Javadoc.

11 years agoDur importz
NathanSweet [Sat, 5 Jan 2013 23:45:27 +0000 (00:45 +0100)]
Dur importz

11 years agogdx-controllers, fixed desktop controllers with LwjglFrame/LwjglCanvas.
NathanSweet [Sat, 5 Jan 2013 23:45:06 +0000 (00:45 +0100)]
gdx-controllers, fixed desktop controllers with LwjglFrame/LwjglCanvas.

11 years agogdx-controllers, desktop works!
NathanSweet [Sat, 5 Jan 2013 23:38:44 +0000 (00:38 +0100)]
gdx-controllers, desktop works!

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 5 Jan 2013 22:38:25 +0000 (23:38 +0100)]
Merge remote-tracking branch 'origin/master'

Conflicts:
extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.Ois.h
extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.OisJoystick.h
extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/desktop/DesktopControllersBuild.java
extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/desktop/ois/OisTest.java

11 years agomoo
NathanSweet [Sat, 5 Jan 2013 22:38:01 +0000 (23:38 +0100)]
moo

11 years agomerged and fixed nate's changes
badlogic [Sat, 5 Jan 2013 22:27:52 +0000 (23:27 +0100)]
merged and fixed nate's changes

11 years agofixed linux builds
badlogic [Sat, 5 Jan 2013 22:23:19 +0000 (23:23 +0100)]
fixed linux builds

11 years agoNateificated
NathanSweet [Sat, 5 Jan 2013 22:07:16 +0000 (23:07 +0100)]
Nateificated

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 5 Jan 2013 21:52:04 +0000 (22:52 +0100)]
Merge remote-tracking branch 'origin/master'

Conflicts:
extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.OisJoystick.h
extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.Ois.cpp
extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.desktop.ois.OisJoystick.cpp
extensions/gdx-controllers/gdx-controllers-desktop/src/com/badlogic/gdx/controllers/DesktopControllers.java

11 years agogdx-controllers
NathanSweet [Sat, 5 Jan 2013 21:51:30 +0000 (22:51 +0100)]
gdx-controllers

11 years agomoved OIS wrapper to its own package, added simple test
Mario Zechner [Sat, 5 Jan 2013 21:50:56 +0000 (22:50 +0100)]
moved OIS wrapper to its own package, added simple test

11 years agoRefactor city
NathanSweet [Sat, 5 Jan 2013 21:37:40 +0000 (22:37 +0100)]
Refactor city

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 5 Jan 2013 21:13:19 +0000 (22:13 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agojavadoc
NathanSweet [Sat, 5 Jan 2013 21:13:11 +0000 (22:13 +0100)]
javadoc

11 years agofuuuuu
Mario Zechner [Sat, 5 Jan 2013 21:12:30 +0000 (22:12 +0100)]
fuuuuu

11 years agoMerge branch 'master' of github.com:libgdx/libgdx
Mario Zechner [Sat, 5 Jan 2013 21:09:56 +0000 (22:09 +0100)]
Merge branch 'master' of github.com:libgdx/libgdx

11 years agoois wrapper almost done
Mario Zechner [Sat, 5 Jan 2013 19:19:54 +0000 (20:19 +0100)]
ois wrapper almost done

11 years agogdx-controllers, Ouya works! :)
NathanSweet [Sat, 5 Jan 2013 18:51:56 +0000 (19:51 +0100)]
gdx-controllers, Ouya works! :)

11 years agofixed AntScriptGenerator to not copy memcopy_wrap.c if it's already there
Mario Zechner [Sat, 5 Jan 2013 16:38:46 +0000 (17:38 +0100)]
fixed AntScriptGenerator to not copy memcopy_wrap.c if it's already there

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 5 Jan 2013 16:27:12 +0000 (17:27 +0100)]
Merge remote-tracking branch 'origin/master'

Conflicts:
extensions/gdx-controllers/gdx-controllers-desktop/jni/com.badlogic.gdx.controllers.OisWrapper.cpp

11 years agogdx-controllers
NathanSweet [Sat, 5 Jan 2013 16:24:24 +0000 (17:24 +0100)]
gdx-controllers

11 years agomore changes to OisWrapper
Mario Zechner [Sat, 5 Jan 2013 15:08:49 +0000 (16:08 +0100)]
more changes to OisWrapper

11 years agofixed win32 LwjglFrame problem with OIS
Mario Zechner [Sat, 5 Jan 2013 15:01:00 +0000 (16:01 +0100)]
fixed win32 LwjglFrame problem with OIS

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Sat, 5 Jan 2013 13:06:29 +0000 (14:06 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agogdx-controllers, better names.
NathanSweet [Sat, 5 Jan 2013 13:06:22 +0000 (14:06 +0100)]
gdx-controllers, better names.

11 years agoTotally refucterered native loading.
NathanSweet [Sat, 5 Jan 2013 13:06:02 +0000 (14:06 +0100)]
Totally refucterered native loading.

11 years agoMerge pull request #189 from xoppa/g3d
Mario Zechner [Sat, 5 Jan 2013 11:45:30 +0000 (03:45 -0800)]
Merge pull request #189 from xoppa/g3d

Material, some small changes

11 years ago- Implement Iterable<MaterialAttribute> now the Array isn't accessible anymore.
Xoppa [Fri, 4 Jan 2013 20:14:03 +0000 (21:14 +0100)]
- Implement Iterable<MaterialAttribute> now the Array isn't accessible anymore.

- Add hasTexture (like needBlending) flag, useful i.e. for enabling/disabling TEXTURE2D on GLES1.
- Cleanup duplicate code.
- Allow adding and removing multiple attributes at once.
- Convenience methods for getting attributes by class type.
- Add #setShader(), not sure how its intended to set the shader without this, but can easily changed if needed.

11 years agoGdxNativesLoader, added length == 0, formatting.
NathanSweet [Fri, 4 Jan 2013 18:39:47 +0000 (19:39 +0100)]
GdxNativesLoader, added length == 0, formatting.

11 years agoMerge remote-tracking branch 'origin/master'
NathanSweet [Fri, 4 Jan 2013 18:36:19 +0000 (19:36 +0100)]
Merge remote-tracking branch 'origin/master'

11 years agoGdxNativesLoader, better message text.
NathanSweet [Fri, 4 Jan 2013 18:36:12 +0000 (19:36 +0100)]
GdxNativesLoader, better message text.

11 years agoMerge pull request #188 from baptr/master
Nathan Sweet [Fri, 4 Jan 2013 18:35:49 +0000 (10:35 -0800)]
Merge pull request #188 from baptr/master

Fix #1186: GdxNativesLoader.extractLibrary overwriting existing .so

11 years agogdx-controllers, dorking with OIS.
NathanSweet [Fri, 4 Jan 2013 18:26:15 +0000 (19:26 +0100)]
gdx-controllers, dorking with OIS.

11 years agogdx-jnigen, fixed hang when process outputs to err stream, fixed starting process...
NathanSweet [Fri, 4 Jan 2013 17:14:52 +0000 (18:14 +0100)]
gdx-jnigen, fixed hang when process outputs to err stream, fixed starting process (working dir was not being respected for me!).

11 years agofixed ant script template linker phase
Mario Zechner [Fri, 4 Jan 2013 14:35:56 +0000 (15:35 +0100)]
fixed ant script template linker phase

11 years agomerged stuff
Mario Zechner [Fri, 4 Jan 2013 13:51:57 +0000 (14:51 +0100)]
merged stuff

11 years agomerged stuff
Mario Zechner [Fri, 4 Jan 2013 13:51:22 +0000 (14:51 +0100)]
merged stuff

11 years agoAccidentally committed a target dir. I'm a noob. In my defense it should have been...
NathanSweet [Fri, 4 Jan 2013 13:15:45 +0000 (14:15 +0100)]
Accidentally committed a target dir. I'm a noob. In my defense it should have been gitignored! :D