List of commits:
Subject Hash Author Date (UTC)
Add /fps console command 207ef051937c91f78dae3928ef004ee7aa7f2a7a mse 2021-11-16 21:33:32
Move userdata to game root directory f9bff9bb941b714e7c0987327804175d852b470b mse 2021-11-16 02:55:04
Add --savehere flag and bump version to v0.6.3 a59633113908903af57e4e1c62008fe154d4cbb7 mse 2021-11-16 02:12:25
Disable networking and remove dead code aaa8bd8300f89099bace4ee1de374d05dff2c089 mse 2021-11-15 05:17:06
Update gamecontrollerdb 828ce88dd2107d69b6332b9768f7c556473b8a24 mse 2021-11-14 00:29:26
Bump version to 0.6.2 baa2215230b5deed37b69f4075bd3b3385dbb913 mse 2021-11-14 00:08:13
Fix controller menu selection 3a1567ae279289d72058d6aa23d0c4eb147db2a8 mse 2021-11-13 23:00:12
Chinese translations for confec-select and name-your-confec 6c5c9d0fadb17066af82d459d1d46868af0e9faa mse 2021-11-13 20:58:26
Parse newlines in CSL notifications fc21ba1563a1c36ff20711c84b0dc3f3d7588646 mse 2021-11-13 05:12:11
Scriptable special items: GIVESPECIAL <id> <name> 256a2581e75dc3762b098f8cae3259899f8c4a94 mse 2021-11-13 03:24:02
Improved particles, darker nights, work on GIVESPECIAL e8e352e03fdffb8a8e57f94f99028bc1c6c03376 mse 2021-11-12 08:51:36
Fix caption padding bug a49cd2397d2e1b98679828303116db858d146a93 mse 2021-11-08 23:35:07
Disable is_regular_file for Boost support ebee78afad8b29f0332a4cf719c7c4d70e8c9ff8 mse 2021-11-08 22:41:42
Bump version to 0.6.1 9bdeecf9d39b75d12e44cb65bbb97a2e8277fcd4 mse 2021-11-08 21:34:25
Improve caption printing and start work on GIVESPECIAL ec51488e4fd5552ae6d22db1b6eedfef7c2541b7 mse 2021-11-08 20:29:59
Load current screen's images for CSL support 43ef06272048c164fc754a547a57859bdfb909db mse 2021-11-06 03:23:56
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
Commit 207ef051937c91f78dae3928ef004ee7aa7f2a7a - Add /fps console command
Author: mse
Author date (UTC): 2021-11-16 21:33
Committer name: mse
Committer date (UTC): 2021-11-16 21:33
Parent(s): f9bff9bb941b714e7c0987327804175d852b470b
Signing key:
Tree: 6710d28bd7da59e687129a657636c0b1a7b45de1
File Lines added Lines deleted
confec.cpp 15 10
File confec.cpp changed (mode: 100644) (index fe214e2..80cd6fa)
... ... std::string character_selected = "", character_next_screen = "",
489 489 fworld::Entity *trading_entity; fworld::Entity *trading_entity;
490 490
491 491 fgl::Texture tex_circle_grey, tex_circle_orange, tex_cursor, fgl::Texture tex_circle_grey, tex_circle_orange, tex_cursor,
492 tex_notification_net, tex_notification, tex_recipe_overlay,
493 tex_boxes, tex_box_select, tex_character_select;
492 tex_notification_box, tex_notification_net, tex_notification,
493 tex_recipe_overlay, tex_boxes, tex_box_select, tex_character_select;
494 494
495 495 fgl::Framebuffer framebuffer; fgl::Framebuffer framebuffer;
496 496
 
... ... bool paused = false;
631 631 // Enabled if the player character is sleeping. // Enabled if the player character is sleeping.
632 632 bool sleep_mode = false; bool sleep_mode = false;
633 633
634 // Enable to display frames per second.
635 bool show_fps = false;
636
634 637 // The name of the target entity to be displayed on the screen. // The name of the target entity to be displayed on the screen.
635 638 std::string target_name = ""; std::string target_name = "";
636 639
 
... ... int main( int argc, char* argv[] ){
1445 1448 tex_circle_grey = loadImage( data_path + "/circle-grey.png", false, false ); tex_circle_grey = loadImage( data_path + "/circle-grey.png", false, false );
1446 1449 tex_circle_orange = loadImage( data_path + "/circle-orange.png", false, false ); tex_circle_orange = loadImage( data_path + "/circle-orange.png", false, false );
1447 1450 tex_cursor = loadImage( data_path + "/ui/cursor.bmp", false, false ); tex_cursor = loadImage( data_path + "/ui/cursor.bmp", false, false );
1451 tex_notification_box = loadImage( data_path + "/ui/notification_box.png", true, false );
1448 1452 tex_notification_net = loadImage( data_path + "/ui/notification_net.png", true, false ); tex_notification_net = loadImage( data_path + "/ui/notification_net.png", true, false );
1449 1453 tex_notification = loadImage( data_path + "/ui/notification.png", true, false ); tex_notification = loadImage( data_path + "/ui/notification.png", true, false );
1450 1454 tex_recipe_overlay = loadImage( data_path + "/ui/recipe_overlay.png", false, false ); tex_recipe_overlay = loadImage( data_path + "/ui/recipe_overlay.png", false, false );
 
... ... void vnDraw( double sw, double sh ){
2166 2170 // HUD. // HUD.
2167 2171 fgl::setFog( statColor ); fgl::setFog( statColor );
2168 2172 fgl::drawText( fgl::drawText(
2169 //dungeon.ready ? stats + "\n" + std::to_string( showFrames ) : stats,
2170 stats,
2173 show_fps ? stats + "\n" + std::to_string( showFrames ) : stats,
2171 2174 font_mono, font_mono,
2172 2175 hudOffX, hudOffX,
2173 2176 0.0, 0.0,
 
... ... void Render(){
4784 4787 convo.getVariable( "CALLBACK " + str.substr( 6 ) ); convo.getVariable( "CALLBACK " + str.substr( 6 ) );
4785 4788 if( result ){ if( result ){
4786 4789 Notify( Notify(
4787 &tex_notification,
4790 &tex_notification_box,
4788 4791 "Callback returned:", "Callback returned:",
4789 4792 convo.stringifyNumber( result ) convo.stringifyNumber( result )
4790 4793 ); );
 
... ... void Render(){
4820 4823 result = convo.stringifyNumber( convo.getVariable( key ) ); result = convo.stringifyNumber( convo.getVariable( key ) );
4821 4824 } }
4822 4825 Notify( Notify(
4823 &tex_notification,
4826 &tex_notification_box,
4824 4827 result, result,
4825 4828 "" ""
4826 4829 ); );
 
... ... void Render(){
4831 4834 if( space_at == std::string::npos if( space_at == std::string::npos
4832 4835 || space_at + 1 == param.length() ){ || space_at + 1 == param.length() ){
4833 4836 Notify( Notify(
4834 &tex_notification,
4837 &tex_notification_box,
4835 4838 "Key value pair required", "Key value pair required",
4836 4839 "" ""
4837 4840 ); );
 
... ... void Render(){
4851 4854 o.valueKey = val_str; o.valueKey = val_str;
4852 4855 convo.operate( o ); convo.operate( o );
4853 4856 } }
4857 }else if( str == "/fps" ){
4858 show_fps = !show_fps;
4854 4859 }else if( str.length() >= 5 }else if( str.length() >= 5
4855 4860 && str.substr( 0, 5 ) == "/help" ){ && str.substr( 0, 5 ) == "/help" ){
4856 4861 Notify( Notify(
4857 &tex_notification,
4862 &tex_notification_box,
4858 4863 "Available commands:", "Available commands:",
4859 "/me /call /get /set /help"
4864 "/me /call /get /set /fps /help"
4860 4865 ); );
4861 4866 }else{ }else{
4862 Notify( &tex_notification, "Syntax error:", str );
4867 Notify( &tex_notification_box, "Syntax error:", str );
4863 4868 } }
4864 4869 vnDataDownload( data_path ); vnDataDownload( data_path );
4865 4870 }else{ }else{
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