From 39f33cbd532a1e1fee5c786f2f8bd5c83370fe62 Mon Sep 17 00:00:00 2001 From: Aman Dhruva Thamminana <48414198+amantham20@users.noreply.github.com> Date: Tue, 28 Nov 2023 18:13:23 -0500 Subject: [PATCH] Revert "Merge branch 'development' into GPLoop-amanXSimon-CGPA" This reverts commit 68d05b3e92cba6ca691995eef4f7d9259d87dc3f, reversing changes made to 6ea5d5a6114905d72b137c8f913aad6075e4893c. --- assets/Ground_tiles/dirt.png | Bin 3842 -> 635 bytes assets/walls/gray_wall.png | Bin 7718 -> 0 bytes blogposts/Kanagaraj/Blog_Final.html | 1964 ------------------------- blogposts/Kanagaraj/DRAFT.html | 1 - blogposts/Kanagaraj/images/image1.png | Bin 96674 -> 0 bytes blogposts/Kanagaraj/images/image2.png | Bin 68235 -> 0 bytes blogposts/Kanagaraj/images/image3.png | Bin 92183 -> 0 bytes blogposts/Kanagaraj/images/image4.png | Bin 119311 -> 0 bytes blogposts/Kanagaraj/images/image5.png | Bin 38044 -> 0 bytes blogposts/Kanagaraj/images/image6.png | Bin 68794 -> 0 bytes blogposts/Kanagaraj/images/image7.png | Bin 48036 -> 0 bytes blogposts/Kanagaraj/images/image8.png | Bin 69470 -> 0 bytes blogposts/Kanagaraj/images/image9.png | Bin 123987 -> 0 bytes source/Interfaces/Button.cpp | 15 +- source/Interfaces/Button.hpp | 17 +- source/Interfaces/Inventory.cpp | 65 - source/Interfaces/Inventory.hpp | 43 - source/Interfaces/MainInterface.cpp | 331 ++--- source/Interfaces/MainInterface.hpp | 33 +- source/Interfaces/Menu.cpp | 79 +- source/Interfaces/Menu.hpp | 64 +- source/Interfaces/MessageBoard.cpp | 35 - source/Interfaces/MessageBoard.h | 42 - source/Interfaces/TextBox.cpp | 123 -- source/Interfaces/TextBox.hpp | 100 -- source/Interfaces/TextureHolder.cpp | 12 +- source/Worlds/MazeWorld.hpp | 2 +- source/group_3_main.cmake | 4 - source/group_3_main.cpp | 2 +- source/group_4_interface_main.cmake | 5 - source/group_4_main.cmake | 5 - 31 files changed, 176 insertions(+), 2766 deletions(-) delete mode 100644 assets/walls/gray_wall.png delete mode 100644 blogposts/Kanagaraj/Blog_Final.html delete mode 100644 blogposts/Kanagaraj/DRAFT.html delete mode 100644 blogposts/Kanagaraj/images/image1.png delete mode 100644 blogposts/Kanagaraj/images/image2.png delete mode 100644 blogposts/Kanagaraj/images/image3.png delete mode 100644 blogposts/Kanagaraj/images/image4.png delete mode 100644 blogposts/Kanagaraj/images/image5.png delete mode 100644 blogposts/Kanagaraj/images/image6.png delete mode 100644 blogposts/Kanagaraj/images/image7.png delete mode 100644 blogposts/Kanagaraj/images/image8.png delete mode 100644 blogposts/Kanagaraj/images/image9.png delete mode 100644 source/Interfaces/Inventory.cpp delete mode 100644 source/Interfaces/Inventory.hpp delete mode 100644 source/Interfaces/MessageBoard.cpp delete mode 100644 source/Interfaces/MessageBoard.h delete mode 100644 source/Interfaces/TextBox.cpp delete mode 100644 source/Interfaces/TextBox.hpp diff --git a/assets/Ground_tiles/dirt.png b/assets/Ground_tiles/dirt.png index e16990fd3231a3dbd99651430a1964fd644a8999..43d98f27d56fc571d9f447a5341ad04fac8662be 100644 GIT binary patch delta 611 zcmZpY`^_>zxt__%)5S5QV$R!JhTew_1&%#jw}^wav>-s>h@*geVOiPN-}RGD#dj<@ zUOnAfROrcf2Z1fRD*2C9ufMaKr^kQ0Vvm*W9{ZS@ziax=e17*$z35HBndq3^1@)p` zfA7BesefGWmD#q|>V0g}y+EIE7d51K+-w|GmmvVV#e{xBH*X}#AI51GF3Qe_Ggj4MhMf!<4L7l zw~v8Bcbi*|_L3_1m-qj!QoC7Y0uI1WD;BIil;`g^70f>=61V=W-7g34uY2C)&9?pj zwC7O3QM=1k-*@dRD?d9g=6_L+#Ld=qHENG)&pGi5{>pDkdELOZY?Jpd!|HzwM1p@a Y{f`v|rEOI+Z3gM^boFyt=akR{0PUe5yZ`_I literal 3842 zcmb^!c|25W``9HUA?r1kk5m|AsTs>yM#e5$OtQt8gc*&oW^J++A(P40SQBoD43|pX zt5UXzu{Cj(EJM1MYDSZ9hVJeDzWaUuedqknd7t-L-}iam=XuUacX6^26Ok7I06@$Z ziE!nN{@h1ckn;|mzJ81|@MA0-Edbzd*3PfK0-QO>59#U%05KW>ka!6ISR7R18~}ua z0bs!g0AM!&U~gzq+ffq^!3FJZ8{p^&?B~G3056Xuz{i1jI5&_Q2=H&g0Kn12x%f(W zeo#wz|DyVr@cn?fjHUq}y#at15_rs=;O^)E^TUPc`1<3{pmm}`Lb(ipNfe9&hM)<) zps0{wY#1!cRCS93#(}wLT~*K)3n9o<)!oqrWQD_{K}I@Y9k8mI2nYl+!TSfmToFgU zi*shCs%Hs=P?)Z6WMrgHq`nRgkI~hGLZP}~h%N-8&Ee1vi^dXsqqMPMYTHWw)Pq2W z`QZaY34u5)h^yE43@)5ts;bI0^w+h$PIOe@4@=mv@7v;RP?t;5)zbm%{x>l~V8H(n z<5IT8w)VAc&V;KB<`Ni%4n`pYL(teT&eF{Ez+jUtGykCcSm?H-6)qTucMJ9PL!0S+ z7x^3NKe@N;xc^T(f1~_OlDlr0Gd>W_aVghvTtolBedjmP<$CpRUfvGj7M2r3GZ7Qr zzs`f12=#$*7Xa*BwMAGQi{e=-cFa;dDV>7pLFCy=nX9Kc`aHfUkftQLc?sSP_fa^J zW=#^iY|bO~4ALjWCe3Pf#JxWezCKD%wf1}-*U=AMfB5<4#(?3{1pM2Fx63&3-(Phk z#I4p+Oxl?fWZkZt($uvJe=M|@_F$Gxe_<~5Cyds>#a2-@4@Q5HS!|&R<{$6#ei#*B z7>7+*ZThTfdGOfBW>MGr^HuSLJ!b4_W^ZbLe2J~wS4P%NM`B8kq|qm3v2!et{tT#A z5^qy#krY8KIxLVW`m68;#m{A-At5zB-2SP}atHZV@4Vqer#XsH)??Q7b@mEQBg