0

Author: t

CMakeLists.txt

@@ -51,6 +51,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if(MSVC)
 	add_definitions(-DWINDOWS_ENABLED "/wd4244")
+	add_compile_options("/Zc:__cplusplus")
 endif()
 
 option(build_editor "" true)
@@ -95,7 +96,7 @@ include_directories(${CMAKE_SOURCE_DIR}/gen)
 include_directories(${CMAKE_SOURCE_DIR}/platform/${CMAKE_HOST_SYSTEM_NAME})
 
 set(third_dir CACHE PATH FORCE)
-if(EXISTS third_dir)
+if(EXISTS ${third_dir})
 	set(third_inc ${third_dir}/include)
 	set(third_lib ${third_dir}/lib)
 endif()

core/CMakeLists.txt

@@ -20,5 +20,6 @@ target_compile_definitions(${target_name} PUBLIC NOMINMAX)
 target_include_directories(${target_name} PUBLIC ${thirdin_dir})
 target_include_directories(${target_name} PUBLIC ${thirdin_dir}/zlib)
 target_include_directories(${target_name} PRIVATE ${thirdin_dir}/mbedtls/include)
+target_include_directories(${target_name} PRIVATE ${thirdin_dir}/clipper2/include)
 
 target_link_directories(${target_name} PRIVATE ${third_lib})

drivers/CMakeLists.txt

@@ -43,13 +43,17 @@ if(with_gles3)
 endif()
 
 if(with_volk)
-	target_compile_definitions(${target_name} PRIVATE USE_VOLK)
+	target_compile_definitions(${target_name} PUBLIC USE_VOLK)
 endif()
 
 target_include_directories(${target_name} PRIVATE ${thirdin_dir}/glad)
-target_include_directories(${target_name} PRIVATE ${thirdin_dir}/libpng)
 target_include_directories(${target_name} PRIVATE ${thirdin_dir}/vulkan)
+target_include_directories(${target_name} PUBLIC ${thirdin_dir}/volk)
+target_include_directories(${target_name} PUBLIC ${thirdin_dir}/vulkan/include)
 
-target_link_libraries(${target_name} PRIVATE freetype vulkan)
+#target_include_directories(${target_name} PRIVATE ${thirdin_dir}/libpng)
+target_include_directories(${target_name} PRIVATE ${third_inc})
+
+target_link_libraries(${target_name} PRIVATE freetype vulkan libpng16)
 
 target_link_libraries(${target_name} PRIVATE Shlwapi.lib Ws2_32.lib Iphlpapi.lib opengl32.lib ntdll.lib)

editor/CMakeLists.txt

@@ -16,3 +16,4 @@ add_library(${target_name} ${target_source} ${target_gen_source})
 target_include_directories(${target_name} PRIVATE ${target_dir})
 
 target_include_directories(${target_name} PRIVATE ${thirdin_dir}/zlib)
+target_include_directories(${target_name} PRIVATE ${thirdin_dir}/clipper2/include)

gen/core/authors.gen.h

@@ -16,24 +16,34 @@ const char *const AUTHORS_PROJECT_MANAGERS[] = {
 };
 const char *const AUTHORS_DEVELOPERS[] = {
 	"Aaron Franke (aaronfranke)",
+	"Aaron Pagano (aaronp64)",
 	"Aaron Record (LightningAA)",
 	"Adam Scott (adamscott)",
+	"Alexander Hartmann (Alex2782)",
 	"Alexander Holland (AlexHolly)",
+	"Alex Drozd (brno32)",
 	"Alexey Khoroshavin (allkhor)",
 	"Alfred Reinold Baudisch (alfredbaudisch)",
+	"Alistair Leslie-Hughes (alesliehughes)",
 	"Alket Rexhepi (alketii)",
+	"Alvin Wong (alvinhochun)",
 	"Andrea Catania (AndreaCatania)",
+	"Andreia Gaita (shana)",
 	"Andrii Doroshenko (Xrayez)",
 	"Andy Maloney (asmaloney)",
 	"Andy Moss (MillionOstrich)",
 	"Angad Kambli (angad-k)",
 	"Anilforextra (AnilBK)",
 	"Anish Bhobe (KidRigger)",
+	"Anni Ryyn\303\244nen (anniryynanen)",
 	"Anton Yabchinskiy (a12n)",
 	"Anutrix",
 	"Aren Villanueva (kurikaesu)",
 	"Ariel Manzur (punto-)",
+	"Arman Elgudzhyan (puchik)",
+	"Arseny Kapoulkine (zeux)",
 	"AThousandShips",
+	"aXu-AP",
 	"Bart\305\202omiej T. Listwon (Listwon)",
 	"Bastiaan Olij (BastiaanOlij)",
 	"Ben Brookshire (sheepandshepherd)",
@@ -42,6 +52,7 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Bhuvan Vemula (Bhu1-V)",
 	"bitsawer",
 	"B\305\202a\305\274ej Szczygie\305\202 (zaps166)",
+	"BlueCube3310",
 	"Bojidar Marinov (bojidar-bg)",
 	"Brian Semrau (briansemrau)",
 	"Bruno Louren\303\247o (MadEqua)",
@@ -50,25 +61,33 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Caner Demirer (cdemirer)",
 	"Carl Olsson (not-surt)",
 	"Carter Anderson (cart)",
+	"ChibiDenDen",
 	"Chris Bradfield (cbscribe)",
+	"Chris Cranford (Naros)",
+	"Christian Kaiser (ckaiser)",
 	"Clay John (clayjohn)",
 	"ConteZero",
+	"CookieBadger",
 	"Dana Olson (adolson)",
 	"Daniel J. Ramirez (djrm)",
 	"Daniel Rakos (aqnuep)",
 	"Daniel Zilberleyb (dzil123)",
 	"Danil Alexeev (dalexeev)",
 	"dankan1890",
+	"Dar\303\255o Banini (DarioSamo)",
 	"David Cambr\303\251 (Gallilus)",
 	"David Sichma (DavidSichma)",
 	"David Snopek (dsnopek)",
+	"derammo",
 	"Dharkael (lupoDharkael)",
+	"Dirk Steinmetz (rsjtdrjgfuzkfg)",
 	"Dmitry Koteroff (Krakean)",
 	"Dmitry Maganov (vonagam)",
 	"Dominik Jasi\305\204ski (dreamsComeTrue)",
 	"Douglas Le\303\243o (DeeJayLSP)",
 	"DualMatrix",
 	"Ellen Poe (ellenhp)",
+	"Emilio Coppola (coppolaemilio)",
 	"Emmanuel Barroga (codecustard)",
 	"Emmanuel Leblond (touilleMan)",
 	"Eoin O'Neill (Eoin-ONeill-Yokai)",
@@ -83,6 +102,7 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Fabrice Cipolla (fabriceci)",
 	"Ferenc Arn (tagcup)",
 	"FireForge (fire-forge)",
+	"Florian Kothmeier (Dragoncraft89)",
 	"follower",
 	"foxydevloper",
 	"Fran\303\247ois Belair (Razoric480)",
@@ -91,6 +111,7 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Geequlim",
 	"George Marques (vnen)",
 	"Gerrit Gro\303\237kopf (Grosskopf)",
+	"Giganzo",
 	"Gilles Roudiere (groud)",
 	"Gordon MacPherson (RevoluPowered)",
 	"Guilherme Felipe de C. G. da Silva (guilhermefelipecgs)",
@@ -99,27 +120,32 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Haoyu Qiu (timothyqiu)",
 	"Hein-Pieter van Braam-Stewart (hpvb)",
 	"Hendrik Brucker (Geometror)",
-	"hilfazer",
+	"Hilderin",
 	"Hiroshi Ogawa (hi-ogawa)",
+	"HolonProduction",
 	"homer666",
 	"hoontee",
 	"Hugo Locurcio (Calinou)",
 	"Ian Bishop (ianb96)",
 	"Ibrahn Sahir (ibrahn)",
-	"Ignacio Etcheverry (neikeq)",
+	"Ignacio Rold\303\241n Etcheverry (neikeq)",
 	"Igor Kordiukiewicz (IgorKordiukiewicz)",
 	"Ilaria Cislaghi (QbieShay)",
 	"Indah Sylvia (ISylvox)",
+	"Ivan \305\240achov (van800)",
 	"J08nY",
 	"Jake Young (Duroxxigar)",
 	"Jakub Grzesik (kubecz3k)",
+	"Jakub Marcowski (Chubercik)",
 	"James Buck (jbuck3)",
 	"Jan Haller (Bromeon)",
 	"Jason Knight (jasonwinterpixel)",
 	"Jean-Michel Bernard (jmb462)",
 	"J\303\251r\303\264me Gully (Nutriz)",
 	"Jia Jun Chai (SkyLucilfer)",
+	"jitspoe",
 	"Joan Fons Sanchez (JFonS)",
+	"Johan Aires Rast\303\251n (JohanAR)",
 	"Johan Manuel (29jm)",
 	"Johannes Witt (HaSa1002)",
 	"Jonathan Nicholl (jtnicholl)",
@@ -132,17 +158,22 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Jummit",
 	"Justo Delgado (mrcdk)",
 	"karroffel",
+	"Kassandra Pucher (PucklaJ)",
 	"Kelly Thomas (KellyThomas)",
 	"kleonc",
 	"Kongfa Waroros (gongpha)",
 	"Kostadin Damyanov (Max-Might)",
 	"K. S. Ernest (iFire) Lee (fire)",
+	"Kyle Eichlin (likeich)",
 	"lawnjelly",
 	"Leon Krause (leonkrause)",
 	"Liz Haas (27thLiz)",
 	"Lucien Menassol (Kanabenki)",
 	"Lyuma",
 	"Maganty Rushyendra (mrushyendra)",
+	"Magian (magian1127)",
+	"Mai Lavelle (maiself)",
+	"Malcolm Nixon (Malcolmnixon)",
 	"Manuele Finocchiaro (m4nu3lf)",
 	"Marcel Admiraal (madmiraal)",
 	"Marcelo Fernandez (marcelofg55)",
@@ -151,9 +182,11 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Marcus Brummer (mbrlabs)",
 	"Marcus Elg (MCrafterzz)",
 	"Mariano Javier Suligoy (MarianoGnu)",
+	"Mario Liebisch (MarioLiebisch)",
 	"Mario Schlack (hurikhan)",
 	"Marios Staikopoulos (marstaik)",
 	"Marius Hanl (Maran23)",
+	"Mark DiBarry (markdibarry)",
 	"Mark Riedesel (klowner)",
 	"Markus Sauermann (Sauermann)",
 	"Martin Capitanio (capnm)",
@@ -162,6 +195,8 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"marynate",
 	"Masoud BH (masoudbh3)",
 	"Mateo Kuruk Miccino (kuruk-mm)",
+	"Matias N. Goldberg (darksylinc)",
+	"Matthew Murphy (mashumafi)",
 	"Matthew (skyace65)",
 	"Matthias H\303\266lzl (hoelzl)",
 	"Max Hilbrunner (mhilbrunner)",
@@ -173,11 +208,15 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"MichiRecRoom (LikeLakers2)",
 	"Micky (Mickeon)",
 	"Mikael Hermansson (mihe)",
+	"Mika Viskari (miv391)",
 	"MinusKube",
-	"Morris \042Tabor\042 Arroad (mortarroad)",
+	"MJacred",
+	"Mounir Tohami (WhalesState)",
 	"mrezai",
 	"Muhammad Huri (CakHuri)",
 	"muiroc",
+	"myaaaaaaaaa",
+	"Nathalie Galla (MurderVeggie)",
 	"Nathan Franke (nathanfranke)",
 	"Nathan Lovato (NathanLovato)",
 	"Nathan Warden (NathanWarden)",
@@ -191,7 +230,11 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Omar El Sheikh (The-O-King)",
 	"Ovnuniarchos",
 	"Pascal Richter (ShyRed)",
+	"passivestar",
+	"Patrick Dawson (pkdawson)",
+	"Patrick Exner (FlameLizard)",
 	"Patrick (firefly2442)",
+	"patwork",
 	"Paul Batty (Paulb23)",
 	"Paul Joannon (paulloz)",
 	"Paul Trojahn (ptrojahn)",
@@ -203,8 +246,10 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Pieter-Jan Briers (PJB3005)",
 	"Poommetee Ketson (Noshyaar)",
 	"Przemys\305\202aw Go\305\202\304\205b (n-pigeon)",
+	"Radiant (RadiantUwU)",
 	"Rafael M. G. (rafallus)",
 	"Rafa\305\202 Mikrut (qarmin)",
+	"Raffaele Picca (RPicster)",
 	"Ralf H\303\266lzemer (rollenrolm)",
 	"Ramesh Ravone (RameshRavone)",
 	"Raphael2048",
@@ -218,6 +263,7 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Ricardo Subtil (Ev1lbl0w)",
 	"Riteo Siuga (Riteo)",
 	"Roberto F. Arroyo (robfram)",
+	"Robert Yevdokimov (ryevdokimov)",
 	"Robin H\303\274bner (profan)",
 	"romulox-x",
 	"Rune Smith (rune-scape)",
@@ -226,20 +272,27 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Saniko (sanikoyes)",
 	"santouits",
 	"SaracenOne",
+	"Septian Ganendra S. K. (sepTN)",
 	"Sergey Minakov (naithar)",
 	"sersoong",
 	"Shiqing (kawa-yoiko)",
 	"Silc 'Tokage' Renew (TokageItLab)",
 	"Simon Wenner (swenner)",
 	"smix8",
 	"snailrhymer",
+	"Sofox (TheSofox)",
+	"Stanislav Labzyuk (DarkMessiah)",
 	"Stijn Hinlopen (hinlopen)",
+	"stmSi",
+	"Stuart Carnie (stuartcarnie)",
 	"Swarnim Arun (minraws)",
 	"TC (floppyhammer)",
 	"TechnoPorg",
+	"Thaddeus Crews (Repiteo)",
 	"Thakee Nathees (ThakeeNathees)",
 	"thebestnom",
 	"Theo Hallenius (TheoXD)",
+	"Thomas ten Cate (ttencate)",
 	"Timo Schwarzer (timoschwarzer)",
 	"Timoth\303\251 Bonhoure (ajreckof)",
 	"Timo (toger5)",
@@ -256,13 +309,19 @@ const char *const AUTHORS_DEVELOPERS[] = {
 	"Will Nations (willnationsdev)",
 	"Wilson E. Alvarez (Rubonnek)",
 	"Xavier Cho (mysticfall)",
+	"Yaohua Xiong (xiongyaohua)",
 	"yg2f (SuperUserNameMan)",
+	"Yordan Dolchinkov (Jordyfel)",
 	"Yuri Rubinsky (Chaosus)",
 	"Yuri Sizov (YuriSizov)",
 	"Zae Chao (zaevi)",
 	"Zak Stam (zaksnet)",
 	"Zher Huei Lee (leezh)",
+	"Zi Ye (MajorMcDoom)",
 	"ZuBsPaCe",
+	"\320\224\320\274\320\270\321\202\321\200\320\270\320\271 \320\241\320\260\320\273\321\214\320\275\320\270\320\272\320\276\320\262 (DmitriySalnikov)",
+	"\345\277\230\345\277\247\343\201\256 (Daylily-Zeleen)",
+	"\350\260\242\345\244\251 (jsjtxietian)",
 	"\351\243\216\351\235\222\345\261\261 (Rindbee)",
 	0
 };

gen/core/disabled_classes.gen.h

@@ -1,6 +1,38 @@
-/* THIS FILE IS GENERATED DO NOT EDIT */
+/**************************************************************************/
+/*  disabled_classes.gen.h                                                */
+/**************************************************************************/
+/*                         This file is part of:                          */
+/*                             GODOT ENGINE                               */
+/*                        https://godotengine.org                         */
+/**************************************************************************/
+/* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */
+/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur.                  */
+/*                                                                        */
+/* Permission is hereby granted, free of charge, to any person obtaining  */
+/* a copy of this software and associated documentation files (the        */
+/* "Software"), to deal in the Software without restriction, including    */
+/* without limitation the rights to use, copy, modify, merge, publish,    */
+/* distribute, sublicense, and/or sell copies of the Software, and to     */
+/* permit persons to whom the Software is furnished to do so, subject to  */
+/* the following conditions:                                              */
+/*                                                                        */
+/* The above copyright notice and this permission notice shall be         */
+/* included in all copies or substantial portions of the Software.        */
+/*                                                                        */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,        */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF     */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. */
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY   */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,   */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE      */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                 */
+/**************************************************************************/
+
+/* THIS FILE IS GENERATED. EDITS WILL BE LOST. */
+
 #ifndef DISABLED_CLASSES_GEN_H
 #define DISABLED_CLASSES_GEN_H
 
+/* NO CONTENT */
 
-#endif
+#endif // DISABLED_CLASSES_GEN_H