Commit Graph

Select branches

Hide Pull Requests

develop

master

14.03.14

v13.11.28

v14.01.10

v14.02.11

v14.04.04

v14.05.15

v14.05.27

v14.06.26

v14.07.01

v14.07.16

Mono Color

• 4bd1ba84c3 Merge branch 'develop' master v14.07.16 unknown 2014-07-16 09:37:54 -04:30
• 019b42c738 Updated the version number. develop unknown 2014-07-16 09:37:33 -04:30
• 30648b6df1 Merge branch 'develop' v14.07.01 unknown 2014-07-01 10:18:04 -04:30
• d3c26c12b4 Updated version number. unknown 2014-07-01 10:17:48 -04:30
• 915187816f Merge branch 'develop' v14.06.26 unknown 2014-06-26 18:33:30 -04:30
• 70e9111474 Added help icon. unknown 2014-06-26 12:51:34 -04:30
• 7982e786e6 Updated the README file. Updated the application name. unknown 2014-06-26 11:54:37 -04:30
• 96014b329d Updated the version number. unknown 2014-06-26 10:57:04 -04:30
• 79fb40b8c9 Moved the heart sprite. unknown 2014-06-26 09:45:25 -04:30
• cc23a58866 Finally fixed the marker rotation problem. unknown 2014-06-25 16:58:20 -04:30
• 8542ea8de5 Added bomb game summary graphics. unknown 2014-06-25 16:10:42 -04:30
• 74b260a33e Fixed marker rotation bug. Added device orientation slider. unknown 2014-06-20 11:31:09 -04:30
• 0d7df37f74 Added OUYA icon. Changed OpenCV library. Added labels. Changed robot arm model. unknown 2014-06-19 18:30:08 -04:30
• 0eea7cc4d8 Added new assets. Updated version number. unknown 2014-06-18 18:28:10 -04:30
• 2ab103016e Added new shaders. Enabled accelerometer and compass support. unknown 2014-06-17 17:58:52 -04:30
• f8743b9d97 Added control mode graphics. unknown 2014-06-16 15:47:43 -04:30
• 97cdfa9838 Reduced robot arm size. unknown 2014-06-11 17:29:06 -04:30
• 2f2051273d Added monkey model. Changed robot arm model. unknown 2014-06-10 17:00:09 -04:30
• 257b470083 Added robot arm model. Miguel Angel Astor Romero 2014-06-06 19:10:57 -04:30
• e857052715 Fixed the collision model for the inclination bomb. unknown 2014-06-05 18:47:10 -04:30
• e2cba423e2 Added the combination bomb models. unknown 2014-06-05 18:16:12 -04:30
• 296aa65c9a Added the inclination bomb related models. unknown 2014-06-04 16:30:09 -04:30
• d67397c1d3 Added collision models. unknown 2014-06-03 18:50:36 -04:30
• 7d68f939e4 Shader now works on OUYA and Win7. Added some models. unknown 2014-06-03 16:23:04 -04:30
• 5ec478c8cd Merge branch 'develop' v14.05.27 unknown 2014-05-27 14:51:24 -04:30
• ccadb06314 Updated version number. unknown 2014-05-27 14:51:01 -04:30
• 5543b732e9 Added new model. unknown 2014-05-27 14:40:31 -04:30
• 044b3c1d2f Added support for gpu skinning. unknown 2014-05-27 13:46:45 -04:30
• c2afd241fc Finally fixed the shader. unknown 2014-05-26 16:43:59 -04:30
• 1bbe0db68d Added modified directional light shader. unknown 2014-05-23 17:00:57 -04:30
• 2f5b6668e6 Removed libs. unknown 2014-05-22 17:44:27 -04:30
• e2632e48f7 Updated libgdx to 1.0.1 unknown 2014-05-22 17:44:06 -04:30
• 08af2286be Added new models. unknown 2014-05-22 16:51:38 -04:30
• 8620cecd47 Updated version number. unknown 2014-05-21 16:19:38 -04:30
• 963b774c0a Added a test model. Miguel Angel Astor Romero 2014-05-20 20:16:31 -04:30
• 1a2017a65f Merge branch 'develop' v14.05.15 unknown 2014-05-15 12:14:03 -04:30
• 67c4c99cc5 Fixed rotation matrix. Added camera parameters getter methods. unknown 2014-05-15 12:13:43 -04:30
• 2e176aae47 Transposed the output rotation matrix. unknown 2014-05-14 16:57:36 -04:30
• b0151e85e9 Added marker pose estimation. Not tested yet. unknown 2014-05-13 18:30:32 -04:30
• ea33f1e725 Added specular color and geometric transformations. unknown 2014-05-12 11:36:55 -04:30
• 8d13493c2a Moved the diffuse color calculation to the vertex shader. unknown 2014-05-09 10:47:42 -04:30
• caa0631004 Single light textureless phong shading complete. unknown 2014-05-08 16:22:11 -04:30
• 51183a2cf1 Added vertex attributes. unknown 2014-05-07 16:42:14 -04:30
• e5b9bd681b Added more comments. unknown 2014-05-06 18:28:18 -04:30
• 31dd89f30e Assorted edits. Created new shaders. unknown 2014-05-06 16:36:46 -04:30
• f04c5806d1 Added intradocumentation. unknown 2014-05-05 12:32:50 -04:30
• a3431937d0 Camera calibration sucessfully ported. unknown 2014-05-02 13:59:58 -04:30
• 729b21400c Fixed some initialization bugs. unknown 2014-05-02 11:15:51 -04:30
• c29f36a997 Added c/c++ builder and finished calibration jni calls. unknown 2014-04-30 16:19:59 -04:30
• 784b14c9e9 Implemented the calibration interface. unknown 2014-04-30 13:05:36 -04:30
• b3d678f078 Ported camera calibration code. unknown 2014-04-28 10:42:38 -04:30
• 249e6e30a4 Started porting the camera calibration functions. unknown 2014-04-10 17:55:31 -04:30
• 453c3a36e5 Added the camera calibration pattern detection. Miguel Angel Astor Romero 2014-04-09 14:56:00 -04:30
• 5c92d603d2 Changed OpenCV to load statically. Miguel Angel Astor Romero 2014-04-05 15:03:53 -04:30
• daaace0d3f Merge branch 'develop' v14.04.04 unknown 2014-04-04 10:29:28 -04:30
• 00038f1622 Changed version number. unknown 2014-04-04 10:29:05 -04:30
• 72eb8d2731 Added a readme file. unknown 2014-03-31 11:03:20 -04:30
• 36e34d3b2f Source formatting. unknown 2014-03-18 18:04:38 -04:30
• 7ac89881a3 Merge branch 'develop' 14.03.14 unknown 2014-03-14 15:18:39 -04:30
• 51af69f623 Removed external storage permission. unknown 2014-03-14 15:18:11 -04:30
• 5773b11e15 OpenCV marker detection successfully ported. unknown 2014-03-12 16:34:52 -04:30
• 09dbc71b29 Started deploying the native OpenCV based code. unknown 2014-03-11 18:31:51 -04:30
• ed84d124d5 Merge branch 'develop' v14.02.11 unknown 2014-02-11 17:50:46 -04:30
• 2028c74904 Merge branch 'robot_control' into develop unknown 2014-02-11 17:50:01 -04:30
• e87c59db48 Added more sprites for the robot control gui. unknown 2014-02-11 17:49:36 -04:30
• c293306172 Commented out a needless toast. unknown 2014-02-10 15:25:36 -04:30
• db6befbee9 Added shaders and textures for the main menu. unknown 2014-02-07 14:11:41 -04:30
• 44690b2e11 Refactoring finished. unknown 2014-02-06 18:57:39 -04:30
• 4e0428dffa Merge branch 'robot_control' into develop unknown 2014-02-05 15:10:52 -04:30
• f41bbfc354 Changed project setup. unknown 2014-02-04 17:15:22 -04:30
• 61559bc104 Tested static initialization of OpenCV. Miguel Angel Astor Romero 2014-01-29 03:31:29 -04:30
• 9ed1a0bcc4 Added OpenCV references and initialization code. Miguel Astor 2014-01-24 12:24:51 -04:30
• 9fd3c7d9c7 Added wakelock use. Miguel Astor 2014-01-21 12:21:22 -04:30
• 1ebb330c84 Changed orientation for testing. Miguel Astor 2014-01-13 14:34:26 -04:30
• 33f3d7b7b9 Merge branch 'release-14.01.10' v14.01.10 Miguel Astor 2014-01-09 08:26:42 -04:30
• c900745618 Merge branch 'image_transfer' into develop Miguel Astor 2014-01-08 15:28:26 -04:30
• 4390f906b0 Simple modifications. Miguel Astor 2014-01-08 15:28:05 -04:30
• f981787753 Added licensing information. Miguel Astor 2013-12-16 14:47:33 -04:30
• 97538ed218 Changed app name. v13.11.28 Miguel Astor 2013-11-28 09:40:26 -04:30
• e066a1ca5a Merge branch 'milestone1' of github.com:sagge-miky/NxtAR-Android into milestone1 Miguel Astor 2013-11-28 09:18:32 -04:30
• 225560b863 Refactored the implementation of the Toaster interface. Miguel Astor 2013-11-28 09:01:45 -04:30
• 3b653654c8 Refactored the implementation of the Toaster interface. Miguel Astor 2013-11-28 09:01:45 -04:30
• 1388935bb7 Added some log statements. Miguel Astor 2013-11-27 08:11:37 -04:30
• a112aff5f8 Added interfaces for showing toasts and setting Multicast Locks. Miguel Astor 2013-11-26 17:58:26 -04:30
• 472faf8e4a Edited the gitignore file. Miguel Astor 2013-11-26 15:38:57 -04:30
• 2b3c9d1777 Added OUYA support lines to the manifest Miguel Astor 2013-11-22 11:31:20 -04:30
• 1265e6ed85 Initial commit. Miguel Astor 2013-11-21 08:10:12 -04:30