Commit Graph

383 Commits

Author SHA1 Message Date
ff27ed7cda Merge branch 'develop-java' into develop 2013-07-20 16:30:18 +02:00
51461f87b2 build jar packages 2013-07-20 16:29:05 +02:00
6371f12c7e Merge branch 'develop' into develop-mimis 2013-07-20 16:28:36 +02:00
cb7fce3536 fixed merge conflicts 2013-07-20 16:27:28 +02:00
e42f5ff3e0 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop
Conflicts:
	.gitignore
	cpp/mimis/wiiuse.dll
2013-07-20 16:26:45 +02:00
625275e5c9 modified project settings 2013-07-20 16:22:54 +02:00
164a8354cc Merge branch 'develop-mimis' into develop 2013-07-20 16:19:32 +02:00
b24cf725bf modified project settings 2013-07-20 16:18:53 +02:00
ebb9a9098f modified project settings 2013-07-20 16:16:00 +02:00
3de0693b1c Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop 2013-07-20 16:14:52 +02:00
858c67aab2 Merge branch 'develop-wiiuse' into develop 2013-07-20 16:14:38 +02:00
7c34f87185 recompiled wiiuse 2013-07-20 16:13:58 +02:00
7bb42d70d9 Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop
Conflicts:
	.gitignore
2013-07-20 16:12:43 +02:00
3b98295c75 Merge branch 'develop-wiipair' into develop
Conflicts:
	.gitignore
2013-07-20 16:11:33 +02:00
0ea32724c3 removed .settings directory from repository 2013-07-20 16:08:15 +02:00
4e677fe757 Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/develop into develop 2013-07-20 15:54:11 +02:00
61d279d878 Merge branch 'develop-wiiuse' into develop
Conflicts:
	cpp/wiiusej/lib/wiiuse.lib
2013-07-20 15:52:28 +02:00
e8f53cbce0 edit project files 2013-07-20 15:51:29 +02:00
b12c4cff70 Merge branch 'develop-java' into develop 2013-05-22 21:16:24 +02:00
ff4938a323 use java.util.ServiceLoader to load applications and devices more or
less dynamically.
2013-05-22 21:15:21 +02:00
9d3eabb91c Merge branch 'develop' into develop-java 2013-05-22 14:46:56 +02:00
eeda858f97 Merge branch 'vendor' into develop 2013-05-22 14:42:26 +02:00
9e396d2988 added Apache Commons Collections library. 2013-05-22 14:35:57 +02:00
3d06b0731d Merge branch 'develop-wiiuse' into develop
Conflicts:
	.gitignore
2013-05-11 21:18:00 +02:00
28f1e2d994 Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop 2013-05-11 21:17:33 +02:00
40983d480a edited .gitignore 2013-05-11 21:17:18 +02:00
2503233ced Merge branch 'develop' of C:\Users\Rik\Git\project\mimis\develop into develop
Conflicts:
	.gitignore
2013-05-11 21:14:40 +02:00
c9d82ef8e8 Merge branch 'develop-java' into develop 2013-05-11 21:10:14 +02:00
1e8c362f01 Merge branch 'develop-wiipair' into develop 2013-05-11 21:07:02 +02:00
0c6aa57c9a Merge branch 'develop-wiiuse' into develop
Conflicts:
	cpp/wiiscan/lib/wiiuse.lib
	cpp/wiiusej/lib/wiiuse.lib
2013-05-11 21:04:02 +02:00
d4b198f29a added java bin directory to .gitignore 2013-05-11 19:50:12 +02:00
2115eb9c86 compiled wiiusej 2013-05-11 19:49:13 +02:00
ea003a818c compiled release binary 2013-05-11 19:47:14 +02:00
4c4b71df84 compiled jar executables 2013-05-11 19:45:03 +02:00
b4f01111ab renamed package Pipes to Pipe 2013-03-22 19:51:49 +01:00
4b0cfbca8b Merge branch 'develop-pipe' into develop 2013-03-22 19:47:22 +01:00
7ec5710650 added copy.bat files 2013-03-22 19:46:53 +01:00
c5fdf90974 split in java and c++ parts 2013-03-22 19:33:05 +01:00
817fcc796d initial commit 2013-03-22 19:19:12 +01:00
4897fa7024 Merge branch 'develop-wiipair' into develop
Conflicts:
	cpp/wiipair/.settings/org.eclipse.cdt.managedbuilder.core.prefs
2013-03-22 18:00:33 +01:00
9ae97d0822 change case of project directory 2013-03-22 17:59:55 +01:00
70ca62b195 change case of project directory 2013-03-22 17:58:44 +01:00
9c0dc8e3f0 change case of project directory 2013-03-22 17:57:36 +01:00
eef466bfc2 Merge branch 'develop-wiipair' into develop 2013-03-22 17:06:09 +01:00
b0bc785fa0 removed .settings directory 2013-03-22 17:03:08 +01:00
58c24d13b6 cleaned project directory 2013-03-22 17:02:21 +01:00
b7556aaf72 added wiipair, allowing for permanent pairing of wiimotes. Modified WiimoteDevice to stop using old WiimoteDiscovery method with wiiscan. 2013-03-22 16:55:38 +01:00
993888ac41 added new native mimis library and build project jars 2013-03-22 16:53:31 +01:00
4bd439e615 modification to worker to allow integration in other project 2013-03-22 16:51:32 +01:00
5edc60df02 linked wiiusej against new wiiuse.lib 2013-03-22 16:49:54 +01:00