Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 9cec01cf28 Solving some warning master AnonymusRaccoon 2020-03-12 21:05:46 +01:00
• bccfcab6c8 Cleaning up AnonymusRaccoon 2020-03-12 20:43:43 +01:00
• a0cebcaa40 merge Clément Le Bihan 2020-03-12 20:35:53 +01:00
• 2f975d43fe Everything compile with the makefile AnonymusRaccoon 2020-03-12 19:51:38 +01:00
• 6f3db8c6f7 merge Clément Le Bihan 2020-03-12 19:49:18 +01:00
• 62a8b2199e premerge Clément Le Bihan 2020-03-12 19:46:23 +01:00
• 5cfcf253e3 Cleaning up AnonymusRaccoon 2020-03-12 19:45:22 +01:00
• 0e4d9d82e0 refactoring / renaming functions Clément Le Bihan 2020-03-12 19:33:27 +01:00
• b24cbec163 Cleaning up and merging AnonymusRaccoon 2020-03-12 18:57:14 +01:00
• 9d4cfec973 Coding style AnonymusRaccoon 2020-03-12 18:31:36 +01:00
• 33edcc8ad0 merge Clément Le Bihan 2020-03-12 16:55:16 +01:00
• 8506d561a4 fix the click with the offset of map Clément Le Bihan 2020-03-12 16:53:13 +01:00
• d23aef0881 Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D AnonymusRaccoon 2020-03-12 16:49:41 +01:00
• b6298c95a0 Allowing the camera to move AnonymusRaccoon 2020-03-12 16:48:23 +01:00
• 3af0251724 merge Clément Le Bihan 2020-03-12 15:30:51 +01:00
• e8b8b3b121 functions for creating vertex array now respects norm and xml can store the texture for each tile of the map Clément Le Bihan 2020-03-12 15:29:40 +01:00
• cbad8113d0 Cleaning up AnonymusRaccoon 2020-03-12 15:24:17 +01:00
• 1ec9846a7d merge Clément Le Bihan 2020-03-12 10:39:17 +01:00
• b4d37eabf1 adding texture loading from xml Clément Le Bihan 2020-03-12 10:37:20 +01:00
• 8e11a7168a Bug solving AnonymusRaccoon 2020-03-11 18:42:14 +01:00
• 6049e5bf34 The quit button on the pause menu now returns to the main menu AnonymusRaccoon 2020-03-11 18:37:03 +01:00
• 4f8a1474e9 Adding an option for framerate AnonymusRaccoon 2020-03-11 17:30:03 +01:00
• 76435739ce Finishing the tile switcher AnonymusRaccoon 2020-03-11 16:14:44 +01:00
• 30cc01b9ea Implementing a draw brush AnonymusRaccoon 2020-03-11 15:18:28 +01:00
• b9d780e90b Implementing the reset in the toolbar AnonymusRaccoon 2020-03-11 11:35:34 +01:00
• 6d4de94e22 Finishing the toolbar AnonymusRaccoon 2020-03-11 11:33:00 +01:00
• 46fd1d0b29 Solving a sefault in options AnonymusRaccoon 2020-03-11 11:08:29 +01:00
• 2a64e1c0e9 Merg AnonymusRaccoon 2020-03-11 10:28:21 +01:00
• 7066c755f3 Implementing a toolbar AnonymusRaccoon 2020-03-11 10:27:31 +01:00
• 5b52690043 map is now segfault free and support non rectangular shapes and fix a bug when clicking off the maps some shadow tiles could be moved Clément Le Bihan 2020-03-11 01:39:43 +01:00
• fe4e593219 adding reset icon Clément Le Bihan 2020-03-10 17:46:35 +01:00
• 7dd7272239 moving vertex files in ismotry folder Clément Le Bihan 2020-03-10 17:42:46 +01:00
• b95205b607 merge Clément Le Bihan 2020-03-10 16:58:02 +01:00
• 38856b9b1d map supports rotation in both directions and supports new click handler Clément Le Bihan 2020-03-10 16:55:40 +01:00
• ee4388bf2f Cleaning tooltips AnonymusRaccoon 2020-03-10 16:55:39 +01:00
• 7f22750a04 Cleaning up AnonymusRaccoon 2020-03-10 15:24:18 +01:00
• abf8b6d02f Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D AnonymusRaccoon 2020-03-10 14:45:15 +01:00
• 8e7085a0bf Cleaning up the pause menu AnonymusRaccoon 2020-03-10 14:44:20 +01:00
• 7fe869c970 removing calls to map_mange_click (deprecated) Clément Le Bihan 2020-03-10 14:38:20 +01:00
• bcbba0943f adding rotation, vertex selection and tile selection Clément Le Bihan 2020-03-10 14:31:33 +01:00
• b8d46f208c Finishing tooltips AnonymusRaccoon 2020-03-10 14:14:11 +01:00
• 8b1a3b2ab0 merge Clément Le Bihan 2020-03-09 18:13:01 +01:00
• c9cbfc2c39 adding event manager Clément Le Bihan 2020-03-09 18:11:51 +01:00
• b58aa28444 Cleaning up the pause component a bit AnonymusRaccoon 2020-03-09 17:27:42 +01:00
• e567dd7ac9 Adding game overs AnonymusRaccoon 2020-03-09 15:37:42 +01:00
• 7b0c4f7f9a Finishing the absent component and adding the forgot component AnonymusRaccoon 2020-03-09 14:50:36 +01:00
• 32597ce440 Finishing the absent pm AnonymusRaccoon 2020-03-09 14:20:57 +01:00
• 045ce2301d Allowing teams'PM to be deleted AnonymusRaccoon 2020-03-09 12:04:32 +01:00
• 2439c35cec collisions working Clément Le Bihan 2020-03-09 00:37:15 +01:00
• 91bbc6146e collisions working Clément Le Bihan 2020-03-09 00:32:40 +01:00
• 1156affb2c Teams PM take down happiness AnonymusRaccoon 2020-03-06 17:35:21 +01:00
• ac1b41df02 Making teams messages disapear AnonymusRaccoon 2020-03-06 17:28:30 +01:00
• 27950654f0 Starting to make the team's ui scroll AnonymusRaccoon 2020-03-03 18:22:13 +01:00
• 075d01b9ff Making teams pm at the right size AnonymusRaccoon 2020-03-03 17:35:22 +01:00
• bbbf859973 Adding a teams system AnonymusRaccoon 2020-03-03 17:32:10 +01:00
• eb77c60820 merge Clément Le Bihan 2020-03-02 17:26:48 +01:00
• 01df46b6a9 added clickable map Clément Le Bihan 2020-03-02 17:25:07 +01:00
• 1bbd73c6c6 Adding resolutions options AnonymusRaccoon 2020-03-02 16:43:18 +01:00
• 17b47accfa Starting to add a resolution option AnonymusRaccoon 2020-03-02 15:38:07 +01:00
• 967264f6fc Finishing the fullscreen AnonymusRaccoon 2020-03-02 14:56:42 +01:00
• fb709de30b Starting to add options AnonymusRaccoon 2020-03-02 14:18:04 +01:00
• 80177f23b6 Making the check-boxes size well AnonymusRaccoon 2020-02-28 10:50:16 +01:00
• d7848f7f54 Adding templates for teams's PM AnonymusRaccoon 2020-02-27 18:44:47 +01:00
• a30d2034fd Adding good texts for the PMs AnonymusRaccoon 2020-02-27 17:27:11 +01:00
• a47e84eca4 Merging AnonymusRaccoon 2020-02-27 16:30:02 +01:00
• f85ad25ab8 Starting to add a teams's PM AnonymusRaccoon 2020-02-27 16:28:37 +01:00
• 4ec15d2234 merge Clément Le Bihan 2020-02-27 15:40:38 +01:00
• 41b9beafd3 merge Clément Le Bihan 2020-02-27 15:32:42 +01:00
• be83409d59 merge Clément Le Bihan 2020-02-27 15:31:35 +01:00
• 1c5e1ef0e2 Fixing the panel's title position AnonymusRaccoon 2020-02-27 15:07:33 +01:00
• b2f26d744b Adding a teams panel to the left AnonymusRaccoon 2020-02-27 15:01:35 +01:00
• ce9c78e00f added a specefic file for sfml initialisations Clément Le Bihan 2020-02-27 14:59:39 +01:00
• 070f454300 Adding a quit button AnonymusRaccoon 2020-02-27 14:33:52 +01:00
• 3294b6a386 Making a good main menu that resize AnonymusRaccoon 2020-02-27 13:49:06 +01:00
• 77f3e481b1 Adding a panel to the main menu AnonymusRaccoon 2020-02-27 13:32:51 +01:00
• ac195e22ce Adding text colors AnonymusRaccoon 2020-02-27 11:19:37 +01:00
• 4fa5699f07 Starting to add textures to buttons AnonymusRaccoon 2020-02-27 11:05:41 +01:00
• d8518b25a1 Moving the main to the sources folder AnonymusRaccoon 2020-02-27 10:04:42 +01:00
• 55e819359b Oups AnonymusRaccoon 2020-02-27 10:03:54 +01:00
• 7fdc232df4 Reusing the good makefile AnonymusRaccoon 2020-02-27 10:03:38 +01:00
• 1d1fa2c0c9 Making a main menu and resolving clement's things AnonymusRaccoon 2020-02-27 10:02:59 +01:00
• 46bd283917 Merging AnonymusRaccoon 2020-02-27 09:46:31 +01:00
• d110d96298 Starting the main menu AnonymusRaccoon 2020-02-27 09:45:36 +01:00
• dbb78120cf added some textures and now the rendering show all the tiles but valgrind have some context (i don't think it's related to me) Clément Le Bihan 2020-02-27 00:48:34 +01:00
• 53e1f539d8 Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D Clément Le Bihan 2020-02-27 00:32:52 +01:00
• 831b25b5f6 now using ecs builtin texture management Clément Le Bihan 2020-02-27 00:32:48 +01:00
• 1cff97b89b Adding panels to the engine AnonymusRaccoon 2020-02-26 19:05:40 +01:00
• 555d5d9fe6 Adding panels to the engine AnonymusRaccoon 2020-02-26 19:04:41 +01:00
• 1e0050d21a merge Clément Le Bihan 2020-02-26 11:54:28 +01:00
• d19b4f04b3 map is now showed Clément Le Bihan 2020-02-26 11:51:41 +01:00
• b53c402626 Making buttons AnonymusRaccoon 2020-02-25 18:09:11 +01:00
• e809d5bbd0 Starting the ui lib AnonymusRaccoon 2020-02-21 17:55:22 +01:00
• 4483ff5e28 Adding texts with % AnonymusRaccoon 2020-02-20 17:59:00 +01:00
• b1ac44b7b2 Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D AnonymusRaccoon 2020-02-20 14:40:33 +01:00
• b7216a1c19 Makefile AnonymusRaccoon 2020-02-20 14:40:27 +01:00
• 620f02969c mdified xml Clément Le Bihan 2020-02-19 18:26:07 +01:00
• 0b8517f169 Cleaning up the header AnonymusRaccoon 2020-02-19 15:35:57 +01:00
• 20d1af6d4f header modified Clément Le Bihan 2020-02-19 15:34:24 +01:00
• 47a1a25d0f Adding prefabs AnonymusRaccoon 2020-02-19 15:29:00 +01:00
• 8016da78bc Creating a cmake AnonymusRaccoon 2020-02-18 19:10:05 +01:00