mse / ConfectionerEngine (public) (License: Confectioner Engine license) (since 2021-04-24) (hash sha1)
Farming RPG engine
Clone URLs: https://rocketgit.com/user/mse/ConfectionerEngine ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine git://git.rocketgit.com/user/mse/ConfectionerEngine
master
List of commits:
Subject Hash Author Date (UTC)
Fix Mac builds and bump version to v0.6.0 efcc6a0b4858af2abd027c8379d41ee1fe073620 mse 2021-11-04 23:40:55
Remove structured initializer for older compiler support 772a6b05b40cd5f7412a7736fe574319fe67289a mse 2021-11-04 17:54:41
Make C++ standard version configurable b100287447ddf4aa503ebac88710b0b92e25aa7f mse 2021-11-04 15:56:47
Fix zoom for particles 5c80a4a30c13672f00df8f3d74297908c132f45d mse 2021-11-04 14:54:34
Use 2 different speed curves for smart zoom 56f9cd38408e4cd3ed08b75b00b131a0bc236b56 mse 2021-10-22 01:51:47
Improve smart zoom math 87da264dca8c443c24a6340002a8cd8169a1446b mse 2021-10-17 10:11:14
Add smart zoom cc57dc0952db6c59d06ef7a9b5c5526f7801945f mse 2021-10-16 09:13:49
Housekeeping 76d7571c34241141c6e2a6315de5e5b513db5209 mse 2021-10-07 07:33:20
Fix font kerning support ab4cbabbed82f629d616f8878790e7d2666524eb mse 2021-10-02 21:10:14
Add default soundspec volume 82a658f2e2bd786618228346bc1848c1be894054 mse 2021-09-30 05:23:43
Fix Windows build and update SDL d8f30e756bc4d5a63e5b7524db2b69ae5af4f88f mse 2021-09-29 23:31:25
Update gamecontrollerdb 3da6ad2629e0b28cad34b3ff7a89c0fe0d96a2fd mse 2021-09-29 23:02:39
Parse newline escape sequences in caption ff33cfb3e88098ae24a6afa1cc7ac9049b6e4c1f mse 2021-09-27 23:45:58
Fix loadOBJ(...) 0b307ff98c2aa8f79d62770b3e2aff6fb7d8670a mse 2021-09-25 05:18:15
Add uploadModelTransforms(...) 53530b8cabe72cfa6c71148bd484a1b5a17df565 mse 2021-09-23 14:33:47
Readability a5885db68a6134c7c3930b6cf10650f0b340088d mse 2021-09-13 15:56:30
Pad HUD health with 0 267304751e17901c276108d8899d096e2094cb2a mse 2021-09-13 11:02:57
Housekeeping 6ff79e3a21829e267e866a8472777e180d337ff4 mse 2021-09-13 07:33:00
Add CSL comments 7a818e8b57cb38c9bfef922e66bd6f735b4962e4 mse 2021-09-12 09:26:07
Add Confectioner Scripting Language (CSL) & change array separator to ; 8d980bfac5d649574f749b7c04a19af766f71091 mse 2021-09-11 12:31:58
Commit efcc6a0b4858af2abd027c8379d41ee1fe073620 - Fix Mac builds and bump version to v0.6.0
Author: mse
Author date (UTC): 2021-11-04 23:40
Committer name: mse
Committer date (UTC): 2021-11-04 23:40
Parent(s): 772a6b05b40cd5f7412a7736fe574319fe67289a
Signing key:
Tree: ff7837288691435b8c39c9ea7437f8db29bbf4cf
File Lines added Lines deleted
Makefile 11 4
confec.cpp 12 4
File Makefile changed (mode: 100644) (index 81629dc..cbf1cb9)
... ... libSDL2.a: $(SDL2_DIR)
118 118 cp $(SDL2_DIR)/build/build/.libs/libSDL2.a $@ cp $(SDL2_DIR)/build/build/.libs/libSDL2.a $@
119 119 touch $@ touch $@
120 120
121 $(PROGRAM)-mac: libs-mac.o SDL2.framework $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) $(PROGRAM).cpp $(INCLUDES)
121 # Mac builds currently link boost::filesystem regardless of C++ standard version. The assumption on Mac is c++1z
122 $(PROGRAM)-mac: libs-mac.o SDL2.framework libboost_filesystem.a $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) $(PROGRAM).cpp $(INCLUDES)
122 123 # Building Steam version for Mac. # Building Steam version for Mac.
123 124 $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -D__STEAM__ -o $@ $(PROGRAM).cpp libs-mac.o $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) \ $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -D__STEAM__ -o $@ $(PROGRAM).cpp libs-mac.o $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) \
124 -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread -lsteam_api
125 -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread -lboost_filesystem -lsteam_api
125 126
126 $(PROGRAM_DRMFREE)-mac: libs-mac.o SDL2.framework $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) $(PROGRAM).cpp $(INCLUDES)
127 $(PROGRAM_DRMFREE)-mac: libs-mac.o SDL2.framework libboost_filesystem.a $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) $(PROGRAM).cpp $(INCLUDES)
127 128 # Building DRM-free version for Mac. # Building DRM-free version for Mac.
128 129 $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs-mac.o $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) \ $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs-mac.o $(MAC_OPENSSL_SSL) $(MAC_OPENSSL_CRYPTO) \
129 -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread
130 -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread -lboost_filesystem
130 131
131 132 libs-mac.o: libs.cpp micropather.cpp include/tm_json.h $(BOOST_DIR) libs-mac.o: libs.cpp micropather.cpp include/tm_json.h $(BOOST_DIR)
132 133 $(MACCXX) $(CXXFLAGS) -O3 -o $@ libs.cpp -c $(MACCXX) $(CXXFLAGS) -O3 -o $@ libs.cpp -c
 
... ... libboost_system.a: $(BOOST_DIR)
220 221 cp $(BOOST_DIR)/stage/lib/$@ . cp $(BOOST_DIR)/stage/lib/$@ .
221 222 touch $@ touch $@
222 223
224 libboost_filesystem.a: $(BOOST_DIR)
225 # POSIX target
226 cd $(BOOST_DIR) && ./b2 --with-filesystem cxxflags="-std=$(CXXSTD)" release
227 cp $(BOOST_DIR)/stage/lib/$@ .
228 touch $@
229
223 230 libboost_system-win.a: $(BOOST_DIR) libboost_system-win.a: $(BOOST_DIR)
224 231 # Windows target # Windows target
225 232 # https://stackoverflow.com/questions/5411282#11907834 # https://stackoverflow.com/questions/5411282#11907834
File confec.cpp changed (mode: 100644) (index 44006b9..40bd058)
... ... FILE *FileOpen( const char* filename, const char* modes );
116 116
117 117 #include <algorithm> #include <algorithm>
118 118 #include <exception> #include <exception>
119 #include <filesystem>
120 119 #include <limits> #include <limits>
121 120 #include <map> #include <map>
122 121 #include <random> #include <random>
123 122 #include <string> #include <string>
124 123 #include <vector> #include <vector>
125 124
125 // Use C++17 std::filesystem where available, or fall back to boost::filesystem.
126 #if __cplusplus >= 201703L
127 #include <filesystem>
128 namespace filesystem = std::filesystem;
129 #else
130 #include <boost/filesystem.hpp>
131 namespace filesystem = boost::filesystem;
132 #endif
133
126 134 #define DBL_INF std::numeric_limits<double>::infinity() #define DBL_INF std::numeric_limits<double>::infinity()
127 135
128 136 double lerp( double a, double b, double f ){ double lerp( double a, double b, double f ){
 
... ... struct SpecialItem {
455 463 int32_t special_item_result = 0; int32_t special_item_result = 0;
456 464
457 465 // App variable definitions. // App variable definitions.
458 std::string app_version = "v0.5.0";
466 std::string app_version = "v0.6.0";
459 467 #ifdef __DEMO__ #ifdef __DEMO__
460 468 app_version += " demo"; app_version += " demo";
461 469 std::string app_name = "Confectioner Engine Demo"; std::string app_name = "Confectioner Engine Demo";
 
... ... int main( int argc, char* argv[] ){
1238 1246 for( std::string &path : search_paths ){ for( std::string &path : search_paths ){
1239 1247 std::string dir_check = std::string dir_check =
1240 1248 path + ( is_foreground ? "/fg/" : "/bg/" ) + dir_name; path + ( is_foreground ? "/fg/" : "/bg/" ) + dir_name;
1241 std::filesystem::path fspath{ dir_check };
1249 filesystem::path fspath{ dir_check };
1242 1250 try{ try{
1243 for( const auto &entry : std::filesystem::directory_iterator{ fspath } ){
1251 for( const auto &entry : filesystem::directory_iterator{ fspath } ){
1244 1252 if( entry.is_regular_file() ){ if( entry.is_regular_file() ){
1245 1253 auto ext = entry.path().extension(); auto ext = entry.path().extension();
1246 1254 if( ext == ".png" || ext == ".PNG" if( ext == ".png" || ext == ".PNG"
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/mse/ConfectionerEngine

Clone this repository using git:
git clone git://git.rocketgit.com/user/mse/ConfectionerEngine

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main