zoriya/My3D
1
0
Fork 0
mirror of https://github.com/zoriya/My3D.git synced 2025-12-06 06:26:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
106 Commits 1 Branch 0 Tags
master
Commit Graph

106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
AnonymusRaccoon
9cec01cf28 Solving some warning 2020-03-12 21:05:46 +01:00
AnonymusRaccoon
bccfcab6c8 Cleaning up 2020-03-12 20:43:43 +01:00
Clément Le Bihan
a0cebcaa40 merge 2020-03-12 20:35:53 +01:00
AnonymusRaccoon
2f975d43fe Everything compile with the makefile 2020-03-12 19:51:38 +01:00
Clément Le Bihan
6f3db8c6f7 merge 2020-03-12 19:49:18 +01:00
Clément Le Bihan
62a8b2199e premerge 2020-03-12 19:46:23 +01:00
AnonymusRaccoon
5cfcf253e3 Cleaning up 2020-03-12 19:45:22 +01:00
Clément Le Bihan
0e4d9d82e0 refactoring / renaming functions 2020-03-12 19:33:27 +01:00
AnonymusRaccoon
b24cbec163 Cleaning up and merging 2020-03-12 18:57:14 +01:00
AnonymusRaccoon
9d4cfec973 Coding style 2020-03-12 18:31:36 +01:00
Clément Le Bihan
33edcc8ad0 merge 2020-03-12 16:55:16 +01:00
Clément Le Bihan
8506d561a4 fix the click with the offset of map 2020-03-12 16:53:13 +01:00
AnonymusRaccoon
d23aef0881 Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D 2020-03-12 16:49:41 +01:00
AnonymusRaccoon
b6298c95a0 Allowing the camera to move 2020-03-12 16:48:23 +01:00
Clément Le Bihan
3af0251724 merge 2020-03-12 15:30:51 +01:00
Clément Le Bihan
e8b8b3b121 functions for creating vertex array now respects norm and xml can store the texture for each tile of the map 2020-03-12 15:29:40 +01:00
AnonymusRaccoon
cbad8113d0 Cleaning up 2020-03-12 15:24:17 +01:00
Clément Le Bihan
1ec9846a7d merge 2020-03-12 10:39:17 +01:00
Clément Le Bihan
b4d37eabf1 adding texture loading from xml 2020-03-12 10:37:20 +01:00
AnonymusRaccoon
8e11a7168a Bug solving 2020-03-11 18:42:14 +01:00
AnonymusRaccoon
6049e5bf34 The quit button on the pause menu now returns to the main menu 2020-03-11 18:37:03 +01:00
AnonymusRaccoon
4f8a1474e9 Adding an option for framerate 2020-03-11 17:30:03 +01:00
AnonymusRaccoon
76435739ce Finishing the tile switcher 2020-03-11 16:14:44 +01:00
AnonymusRaccoon
30cc01b9ea Implementing a draw brush 2020-03-11 15:18:28 +01:00
AnonymusRaccoon
b9d780e90b Implementing the reset in the toolbar 2020-03-11 11:35:34 +01:00
AnonymusRaccoon
6d4de94e22 Finishing the toolbar 2020-03-11 11:33:00 +01:00
AnonymusRaccoon
46fd1d0b29 Solving a sefault in options 2020-03-11 11:08:29 +01:00
AnonymusRaccoon
2a64e1c0e9 Merg 2020-03-11 10:28:21 +01:00
AnonymusRaccoon
7066c755f3 Implementing a toolbar 2020-03-11 10:27:31 +01:00
Clément Le Bihan
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 2020-03-11 01:39:43 +01:00
Clément Le Bihan
fe4e593219 adding reset icon 2020-03-10 17:46:35 +01:00
Clément Le Bihan
7dd7272239 moving vertex files in ismotry folder 2020-03-10 17:42:46 +01:00
Clément Le Bihan
b95205b607 merge 2020-03-10 16:58:02 +01:00
Clément Le Bihan
38856b9b1d map supports rotation in both directions and supports new click handler 2020-03-10 16:55:40 +01:00
AnonymusRaccoon
ee4388bf2f Cleaning tooltips 2020-03-10 16:55:39 +01:00
AnonymusRaccoon
7f22750a04 Cleaning up 2020-03-10 15:24:18 +01:00
AnonymusRaccoon
abf8b6d02f Merge branch 'master' of https://github.com/AnonymusRaccoon/My3D 2020-03-10 14:45:15 +01:00
AnonymusRaccoon
8e7085a0bf Cleaning up the pause menu 2020-03-10 14:44:20 +01:00
Clément Le Bihan
7fe869c970 removing calls to map_mange_click (deprecated) 2020-03-10 14:38:20 +01:00
Clément Le Bihan
bcbba0943f adding rotation, vertex selection and tile selection 2020-03-10 14:31:33 +01:00
AnonymusRaccoon
b8d46f208c Finishing tooltips 2020-03-10 14:14:11 +01:00
Clément Le Bihan
8b1a3b2ab0 merge 2020-03-09 18:13:01 +01:00
Clément Le Bihan
c9cbfc2c39 adding event manager 2020-03-09 18:11:51 +01:00
AnonymusRaccoon
b58aa28444 Cleaning up the pause component a bit 2020-03-09 17:27:42 +01:00
AnonymusRaccoon
e567dd7ac9 Adding game overs 2020-03-09 15:37:42 +01:00
AnonymusRaccoon
7b0c4f7f9a Finishing the absent component and adding the forgot component 2020-03-09 14:50:36 +01:00
AnonymusRaccoon
32597ce440 Finishing the absent pm 2020-03-09 14:20:57 +01:00
AnonymusRaccoon
045ce2301d Allowing teams'PM to be deleted 2020-03-09 12:04:32 +01:00
Clément Le Bihan
2439c35cec collisions working 2020-03-09 00:37:15 +01:00
Clément Le Bihan
91bbc6146e collisions working 2020-03-09 00:32:40 +01:00