Commit Graph

Select branches

Hide Pull Requests

develop

master

v13.11.28

v14.01.10

v14.02.11

v14.03.14

v14.04.04

v14.05.15

v14.05.27

v14.06.26

v14.07.01

v14.07.16

Mono Color

• f4e5ebabb2 Fixed the controls again. develop unknown 2014-07-22 08:25:15 -04:30
• 8b9be1e2f4 Merge branch 'develop' master v14.07.16 unknown 2014-07-16 09:36:15 -04:30
• 1b2ea706d3 Fixed a buy with OUYA controls. unknown 2014-07-16 09:31:57 -04:30
• 1f03b2439b Merge branch 'develop' v14.07.01 unknown 2014-07-01 10:16:23 -04:30
• 15c41d1229 Changed the Bomb Game automatic action behaviour. unknown 2014-07-01 10:13:15 -04:30
• 238f62d4d3 Added robot arm movement ray rendering. unknown 2014-06-30 12:42:43 -04:30
• b2cac2f40d Merge branch 'develop' v14.06.26 unknown 2014-06-26 18:35:00 -04:30
• 53ae001e59 Assorted fixes for OUYA. unknown 2014-06-26 18:25:28 -04:30
• a9285a684f Fixed a bug with the orientation calculation. unknown 2014-06-26 13:01:39 -04:30
• 81d8a81b7e Added instructions screen support. unknown 2014-06-26 12:51:01 -04:30
• 5a8391aa28 Updated the README file. unknown 2014-06-26 11:53:55 -04:30
• 94c2bd6850 Finished implementing bomb game. unknown 2014-06-26 09:44:33 -04:30
• 3288e3cb6b Added some TODO's. unknown 2014-06-25 16:43:01 -04:30
• 83e327545c Added enabling/disabling the collision detection system. unknown 2014-06-25 16:28:27 -04:30
• 77aec83dbb Bomb game automatic action and summary ready. unknown 2014-06-25 16:09:59 -04:30
• 4d006a3461 Added automatic actions. Not tested yet. unknown 2014-06-23 16:07:06 -04:30
• 6e30e6b56b Added the player entity and it's logic to the world. unknown 2014-06-20 12:03:17 -04:30
• 99236420d1 Fixed device orientation calculation. Other assorted fixes. unknown 2014-06-20 11:32:02 -04:30
• 6a392856ee Fixes for OUYA. Added labels. Started modelling player. unknown 2014-06-19 18:29:06 -04:30
• 83199df36d Cleaned the code a bit. unknown 2014-06-18 18:27:30 -04:30
• a247d24770 Debug overlay always rendered regardless of debug status. unknown 2014-06-18 12:04:18 -04:30
• 8bd799f146 All bombs sucessfully implemented. unknown 2014-06-17 17:57:57 -04:30
• 29c4bea104 Added processing for the remaining bombs. unknown 2014-06-16 16:57:47 -04:30
• fd197211b5 Touch controls ready. unknown 2014-06-16 15:47:07 -04:30
• 7f20a09eb9 Scrapped robot arm movement. unknown 2014-06-13 16:47:23 -04:30
• 6c63ebf907 Finally fixed restart problem. Basic inclination bombs. unknown 2014-06-11 17:28:26 -04:30
• 95bb97536c Started modelling object interaction. unknown 2014-06-11 15:21:59 -04:30
• 3f522da485 Collision detection works for real now. unknown 2014-06-11 14:28:43 -04:30
• 36eea36c15 Added freeInstance to network. Modelling game logic. unknown 2014-06-11 11:18:12 -04:30
• 8abf594c8a Added collision detection. unknown 2014-06-10 16:59:21 -04:30
• aa5871b49a Started modelling user input. Miguel Angel Astor Romero 2014-06-06 19:10:11 -04:30
• d4edcf4909 Fixed interface details. Removed pause state. unknown 2014-06-06 12:43:45 -04:30
• 4cba697f57 Bomb game assets loaded with asset manager. Camera calibration is automagic. unknown 2014-06-06 11:41:58 -04:30
• be5ae2955e Added code to debug the collision models. unknown 2014-06-05 18:46:39 -04:30
• 2b14a080b4 All bomb types successfully loaded and rendered. unknown 2014-06-05 18:15:17 -04:30
• fbb03f884e Simplified some functions. unknown 2014-06-04 16:53:35 -04:30
• a798cce715 Added rendering of the inclination bomb. unknown 2014-06-04 16:29:31 -04:30
• 6ecb373b11 Added visibility testing for marker objects. unknown 2014-06-03 18:49:52 -04:30
• e65da3234b Added some model loading and removed an useless file. unknown 2014-06-03 16:22:15 -04:30
• a614841664 Added more systems and components. unknown 2014-06-02 16:46:06 -04:30
• eb8206668f Removed needless source files. Added game settings. unknown 2014-05-28 14:22:46 -04:30
• fa6950d5c9 Merge branch 'develop' v14.05.27 unknown 2014-05-27 14:42:38 -04:30
• 5e66273396 Added animation support. unknown 2014-05-27 14:41:06 -04:30
• 686f263b0d Added support for gpu skinning. Added animation system. unknown 2014-05-27 13:45:58 -04:30
• 5ef7928706 Refactored rendering to use modelbatch everywhere. unknown 2014-05-26 16:42:57 -04:30
• 169d0e7c43 Started using custom shaders with model batch. unknown 2014-05-23 17:00:14 -04:30
• 9a67df8f8a Removed old code. unknown 2014-05-22 18:03:48 -04:30
• 76a6d8485b Removed libs. unknown 2014-05-22 17:42:35 -04:30
• 653adc91a7 Updated libgdx to 1.0.1 unknown 2014-05-22 17:41:58 -04:30
• a1891f53d2 Changed model rendering to model batch. unknown 2014-05-22 16:50:24 -04:30
• a942b0ebd1 Changed references to GL10. unknown 2014-05-21 16:18:49 -04:30
• e6085e7a79 Testing model loading. Miguel Angel Astor Romero 2014-05-20 20:15:34 -04:30
• 3c65f52e9e Added some more test cases. Fixed a bug when rendering markers. unknown 2014-05-15 16:58:23 -04:30
• 0df8b37ddd Merge branch 'develop' v14.05.15 unknown 2014-05-15 12:10:47 -04:30
• 87295031dc Rendering of objects on top of markers is complete. unknown 2014-05-15 12:10:14 -04:30
• a9fa76cb68 Markers rendered almost sucessfully. unknown 2014-05-14 16:56:31 -04:30
• fbb25ead08 Added marker positioning and rendering. Not tested yet. unknown 2014-05-13 18:29:25 -04:30
• 82e95ed0f7 Added aditional geometric transformation info to rendering. Added entity creator. unknown 2014-05-12 14:30:24 -04:30
• b7367427f6 Successfully incorporated Artemis. unknown 2014-05-12 11:37:58 -04:30
• e6ea6ab4a1 Added comments. unknown 2014-05-09 17:00:21 -04:30
• 167b5d644b Some refactorings and touch ups. unknown 2014-05-09 11:30:45 -04:30
• e82d49f1f1 Testing the shader. unknown 2014-05-09 10:46:47 -04:30
• 6b54b1364f Fixed test rendering problems. unknown 2014-05-08 16:21:30 -04:30
• de64cd972b Successfully rendered a 3D sphere. unknown 2014-05-07 16:41:25 -04:30
• 90427419e0 Frame buffer object correctly created and positioned. unknown 2014-05-06 16:35:19 -04:30
• 271b7d003a Started sketching the 3D rendering. unknown 2014-05-05 15:25:01 -04:30
• 1146a260b6 Added intradocumentation. unknown 2014-05-05 12:32:06 -04:30
• d8922182e0 Camera calibration successfully ported. unknown 2014-05-02 13:59:15 -04:30
• e976a17de0 Added menu transition to calibration state. unknown 2014-05-02 11:16:40 -04:30
• 11ebf2b96e Continued implementation of the calibration state and interface. unknown 2014-04-30 16:21:03 -04:30
• 139bb62067 Started programming the calibration state. unknown 2014-04-28 10:14:01 -04:30
• e93d227b62 Updated the interfaces and renamed some methods. unknown 2014-04-10 17:57:31 -04:30
• 06d74a6474 Added some logging. Miguel Angel Astor Romero 2014-04-05 15:05:20 -04:30
• d481df0f96 Merge branch 'develop' v14.04.04 unknown 2014-04-04 10:27:33 -04:30
• 1e2de5ee55 Added recenter button and corresponding event handling. unknown 2014-04-04 10:26:56 -04:30
• a37ff0fba5 Added a sensor data receiving thread. unknown 2014-04-03 11:28:30 -04:30
• ebb943925f Renamed the project. unknown 2014-03-31 11:02:20 -04:30
• ae93dca1b9 Merge branch 'develop' v14.03.14 unknown 2014-03-14 15:16:50 -04:30
• ddbadba3ea Added OUYA gamepad support. unknown 2014-03-14 15:16:21 -04:30
• 28be9c8a81 Flipped motor buttons on tablet iface. Added NO_DELAY to robot control. unknown 2014-03-13 16:12:53 -04:30
• 8ed8be0a29 OpenCV marker detection successfully ported. unknown 2014-03-12 16:35:52 -04:30
• c7ee0e0af6 Added CVProcessor interface. unknown 2014-03-11 18:32:46 -04:30
• 0fdef7c01c Merge branch 'develop' v14.02.11 unknown 2014-02-11 17:46:28 -04:30
• 6690d7b3fc Merge branch 'robot_control' into develop unknown 2014-02-11 17:45:37 -04:30
• 97b27f736a Fixed robot control logic. Added gamepad support (not tested). unknown 2014-02-11 17:44:54 -04:30
• 5816e77e36 RobotControlThread sends data. unknown 2014-02-10 15:27:27 -04:30
• 5d80d5f866 Added state transitions with Universal Tween Library. unknown 2014-02-07 17:02:53 -04:30
• be1a392c4a Basic main menu finished. unknown 2014-02-07 14:10:10 -04:30
• 39426cd2a6 Fixed OuyaMainMenuState. Miguel Angel Astor Romero 2014-02-06 22:34:37 -04:30
• e88305f0ff Refactoring finished. unknown 2014-02-06 18:56:20 -04:30
• 40d390baec Started refactoring the app to use State Pattern. unknown 2014-02-05 17:06:29 -04:30
• 5bd79f0d58 Deleted useless Artemis classes. unknown 2014-02-05 15:10:02 -04:30
• 4893313116 Merge branch 'robot_control' into develop unknown 2014-02-05 15:07:38 -04:30
• c5fe36116f Minor refactorings. unknown 2014-02-04 17:14:35 -04:30
• 5c795ce8e3 Got this thing to render on Ouya. Miguel Angel Astor Romero 2014-01-29 03:30:40 -04:30
• e5b43beaea VideoStreamingThread now reports the number of lost frames per second. Miguel Angel Astor Romero 2014-01-28 19:14:35 -04:30
• bfea25e95e Added gui buttons. Removed tcp connection for video code. Miguel Astor 2014-01-24 12:25:58 -04:30
• 0b790bce8f Removed the TCP video streaming code. Miguel Astor 2014-01-21 12:20:38 -04:30
• b937b93767 Minor cosmetic touches. Miguel Astor 2014-01-20 13:00:29 -04:30
• da044c5b1c Changed the streaming to use UDP. Miguel Astor 2014-01-15 14:50:54 -04:30