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)
Add cave-confec-gl2 targets (WIP) c89db928efc4b68d42d9b66079e444decedc49e2 mse 2022-08-16 04:24:50
Simplify debug target d55157f6ff96ec2103b2d703b96925b767c08ce2 mse 2022-08-16 03:45:00
Bump version to 0.8.0 6f5adaa7a93dff9a24ba03aef36f620d153816f4 mse 2022-08-08 12:16:23
Default saves to ./userdata and replace optional --savehere arg with --saveinos d0cb1ab86c2110cdc0f2aba19fc3843902d6a5ea mse 2022-08-08 11:42:21
Enable Chinese image buttons 3129899ee20ee1821b13db063dcd83477e37c505 mse 2022-08-06 04:44:38
Expand Chinese translations 2baa34f7247c32af12480feb801cb41787022115 mse 2022-08-04 18:34:02
Add VNHACK command 4539d3931617e58e73b295d6ca3679150acdcf78 mse 2022-08-04 06:59:04
Refactor FG3 to allow separate compilation eb1bb8bbc8c60169c2bbd789b38c608b4bb9cbab mse 2022-08-03 22:30:45
Fix menu bugs and bump to v0.7.11 ae193263f4b8461c299f6db66f130beae94724cc mse 2022-07-07 04:52:30
Bump version to 0.7.10 5f70f1aba48d3df67d5e4a70d9595e92aeac4afb mse 2022-05-11 10:54:09
ADV-style text advance 5fbb734d07a2dcf0162245b5afc6b5b4b9021b6f mse 2022-04-12 12:25:24
Switch interaction to mouse-up 345ce8d1ea9755f51365a2676cce0415f9cf68c2 mse 2022-04-10 21:07:15
Use gradient for text backdrop 6ad98cdaf4df37e8b24d9c1e8e2f9b0e904da9aa mse 2022-04-10 13:04:29
Improve vn button highlight 51b2c6c07b0cfb0efdb8cdf5cbeba49ef54d9ccb mse 2022-04-09 06:54:39
Darken the screen when drawing a menu with non-VN text 8f3bcee6d57817ea8c1dd999c68cb129dea1550c mse 2022-04-08 16:01:52
Upgrade the UI 45561487af001c5a790343690a792faeb14945d4 mse 2022-04-06 23:45:31
Progress on getting Emscripten builds working again (almost) e4276b7823027c7ac3a3afe30c3c30241f1c6642 mse 2022-04-01 11:16:56
Bump to version 0.7.9 1c93b011603bd953df0628fa39c586c11eeb7138 mse 2022-03-30 08:31:00
Some progress on Android support dd2d0eb6d4ee42149b605526ce304e67243d90b4 mse 2022-03-20 00:28:35
Android support (work in progress) a8f26dd2d83d66fb8e3b634991084fbdc9faa640 mse 2022-03-19 20:08:09
Commit c89db928efc4b68d42d9b66079e444decedc49e2 - Add cave-confec-gl2 targets (WIP)
Author: mse
Author date (UTC): 2022-08-16 04:24
Committer name: mse
Committer date (UTC): 2022-08-16 04:24
Parent(s): d55157f6ff96ec2103b2d703b96925b767c08ce2
Signer:
Signing key:
Signing status: N
Tree: 6b0dafa91731b14efca2103cc85c18214fd70384
File Lines added Lines deleted
Makefile 15 2
confec.cpp 1 1
include/fg2/fg2.h 1 1
File Makefile changed (mode: 100644) (index def16cb..649b7f0)
1 1 PROGRAM=confec PROGRAM=confec
2 2 PROGRAM_DRMFREE=cave-confec PROGRAM_DRMFREE=cave-confec
3 PROGRAM_GL2=cave-confec-gl2
3 4 INCLUDES=include/fworld.h include/civilian.h INCLUDES=include/fworld.h include/civilian.h
4 5 # Change the value of CXXSTD depending on what is supported by your compiler. Older compilers may require c++1z # Change the value of CXXSTD depending on what is supported by your compiler. Older compilers may require c++1z
5 6 CXXSTD=c++17 CXXSTD=c++17
 
... ... $(PROGRAM_DRMFREE): libs.o libSDL2.a $(PROGRAM).cpp $(INCLUDES)
67 68 # Building DRM-free version for GNU/Linux. # Building DRM-free version for GNU/Linux.
68 69 $(LINCXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs.o libSDL2.a -Wl,-rpath,. -L. -ldl -pthread $(LINCXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs.o libSDL2.a -Wl,-rpath,. -L. -ldl -pthread
69 70
71 $(PROGRAM_GL2): libs.o libSDL2.a $(PROGRAM).cpp $(INCLUDES)
72 # Building DRM-free GL2 version for GNU/Linux.
73 $(LINCXX) $(CXXFLAGS) -static-libgcc -static-libstdc++ -O3 -D__LIGHT__ -D__GL2__ -o $@ $(PROGRAM).cpp libs.o libSDL2.a -Wl,-rpath,. -L. -ldl -pthread
74
70 75 #$(PROGRAM)-dynamic: libs.o libboost_system.a $(PROGRAM).cpp $(INCLUDES) #$(PROGRAM)-dynamic: libs.o libboost_system.a $(PROGRAM).cpp $(INCLUDES)
71 76 $(PROGRAM)-dynamic: libs.o $(PROGRAM).cpp $(INCLUDES) $(PROGRAM)-dynamic: libs.o $(PROGRAM).cpp $(INCLUDES)
72 77 $(CXXDYNAMIC) $(CXXDYNAMIC)
 
... ... $(PROGRAM_DRMFREE)-mac: libs-mac.o SDL2.framework libboost_filesystem.a $(PROGRA
134 139 # Building DRM-free version for Mac. # Building DRM-free version for Mac.
135 140 $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs-mac.o -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread -lboost_filesystem $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs-mac.o -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread -lboost_filesystem
136 141
142 $(PROGRAM_GL2)-mac: libs-mac.o SDL2.framework libboost_filesystem.a $(PROGRAM).cpp $(INCLUDES)
143 # Building DRM-free GL2 version for Mac.
144 $(MACCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -D__GL2__ -o $@ $(PROGRAM).cpp libs-mac.o -F. -L. -Wl,-rpath,"." -framework SDL2 -ldl -pthread -lboost_filesystem
145
137 146 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)
138 147 $(MACCXX) $(CXXFLAGS) -O3 -o $@ libs.cpp -c $(MACCXX) $(CXXFLAGS) -O3 -o $@ libs.cpp -c
139 148
 
... ... $(PROGRAM_DRMFREE).exe: libs-win.o $(PROGRAM).cpp $(INCLUDES)
153 162 # Building DRM-free version for Windows. # Building DRM-free version for Windows.
154 163 $(WINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs-win.o -L. -lmingw32 -l:SDL2.dll -l:libSDL2main.a -static -lpthread $(WINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -o $@ $(PROGRAM).cpp libs-win.o -L. -lmingw32 -l:SDL2.dll -l:libSDL2main.a -static -lpthread
155 164
165 $(PROGRAM_GL2).exe: libs-win.o $(PROGRAM).cpp $(INCLUDES)
166 # Building DRM-free GL2 version for Windows.
167 $(WINCXX) $(CXXFLAGS) -O3 -D__LIGHT__ -D__GL2__ -o $@ $(PROGRAM).cpp libs-win.o -L. -lmingw32 -l:SDL2.dll -l:libSDL2main.a -static -lpthread
168
156 169 # You get the picture. # You get the picture.
157 170 #libs-win.o: include/SDL2 libSDL2main.a SDL2.dll libs.cpp micropather.cpp include/tm_json.h $(BOOST_DIR) $(OPENSSL_DIR) #libs-win.o: include/SDL2 libSDL2main.a SDL2.dll libs.cpp micropather.cpp include/tm_json.h $(BOOST_DIR) $(OPENSSL_DIR)
158 171 #$(WINCXX) $(CXXFLAGS) -I$(OPENSSL_DIR)/include -O3 -o $@ libs.cpp -c #$(WINCXX) $(CXXFLAGS) -I$(OPENSSL_DIR)/include -O3 -o $@ libs.cpp -c
 
... ... $(OPENSSL_TAR):
270 283 wget https://www.openssl.org/source/$(OPENSSL_TAR) wget https://www.openssl.org/source/$(OPENSSL_TAR)
271 284
272 285 clean: clean:
273 $(RM) debug $(PROGRAM)-static $(PROGRAM)-dynamic $(PROGRAM_DRMFREE) $(PROGRAM)-demo-static libs.o \
274 $(PROGRAM).exe $(PROGRAM_DRMFREE).exe $(PROGRAM)-demo.exe libs-win.o libs-web.o ccserver
286 $(RM) debug $(PROGRAM)-static $(PROGRAM)-dynamic $(PROGRAM_DRMFREE) $(PROGRAM_GL2) $(PROGRAM)-demo-static libs.o \
287 $(PROGRAM).exe $(PROGRAM_DRMFREE).exe $(PROGRAM_GL2).exe $(PROGRAM)-demo.exe libs-win.o libs-web.o ccserver
File confec.cpp changed (mode: 100644) (index 9c03d6a..d8a348b)
... ... FILE *FileOpen( const char* filename, const char* modes );
45 45 #endif #endif
46 46
47 47 // OpenGL wrapper. // OpenGL wrapper.
48 #if defined(__EMSCRIPTEN__) and 0
48 #if defined(__EMSCRIPTEN__) or defined(__GL2__)
49 49 #include <fg2/fg2.h> #include <fg2/fg2.h>
50 50 #include <fg2/linalg.h> #include <fg2/linalg.h>
51 51 #define fgl fg2 #define fgl fg2
File include/fg2/fg2.h changed (mode: 100755) (index 3cc8ef4..278bc4a)
... ... Mesh loadOBJ( std::string filepath ){
723 723
724 724 #ifndef __EMSCRIPTEN__ #ifndef __EMSCRIPTEN__
725 725 }catch( const std::exception &e ){ }catch( const std::exception &e ){
726 fprintf( stderr, "Caught exception at line %lu of %s: %s\n\n", line, filepath.c_str(), e.what().c_str() );
726 fprintf( stderr, "Caught exception at line %lu of %s: %s\n\n", line, filepath.c_str(), e.what() );
727 727 } }
728 728 #endif #endif
729 729
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