Commit Graph

736 Commits

Author SHA1 Message Date
c816674c7c Unnecessary formatting 2024-03-26 19:42:57 +01:00
40be2ccf18 Factorize check 2024-03-26 19:41:37 +01:00
a89f7b8161 Update Credits 2024-03-25 15:22:06 +00:00
38d2494bc3 Fix conflicting properties (by Gouvernathor)
big work
what was reliable before is now not, in recent versions of renpy, which is why we added that new config (which I put in say.rpy, but it can be moved somewhere else)
Also fixes the game_menu's title position, incidentally

some changes are incompatible with my diary and achievement branches, respectively, they will need to be merged with a bit of manual care
2024-03-25 14:57:36 +00:00
b62b7bcc3a Achievements System Tweaks for Ren'py 8.2.X 2024-03-25 14:39:35 +00:00
019ca9e9a9 Allow several achievements to be displayed at the same time
like in steam
the change to popup_animation is not thoroughly tested

(cherry picked from commit f714e482f6)
2024-03-24 18:36:33 +00:00
f0c9aaa153 Rebase the achievements system on the builtin feature
a lot of work, but entirely backwards-compatible !
no visible change (no intended ones at least) except maybe performance
2024-03-24 18:36:29 +00:00
7071d30b82 Merge branch 'dev' of ssh://ssh.silverstudiogames.org:3022/SilverStudioGames/WTS into dev 2024-03-24 18:25:59 +00:00
fbbb7f5665 Luna Talk to me CG Posing PT 1
* Posed part of the event.
* Adjusted layer order.
2024-03-24 19:24:51 +01:00
0597621c54 Random Object Refactoring and a bug fix (by
Gouvernathor)
2024-03-24 18:18:34 +00:00
9a088d22e1 Fix 9ee1de9
(cherry picked from commit 5252c7eae2)
2024-03-24 18:08:53 +00:00
ef17df3698 Make the wardrobe variables dynamic
(cherry picked from commit 9ee1de9fd0)
2024-03-24 18:08:26 +00:00
ad2e009665 Change the spinner box character
(cherry picked from commit 902cf9b4d9)
2024-03-24 18:03:24 +00:00
f871b036dd Improve threading when predicting the wardrobe
don't use single-underscore names
if available, use the thread-safer invoke_in_main_thread (not required when setting the global variables)
set __lock to True outside of the thread, otherwise if the thread starts late, the while loop is skipped
call get_character_object in the main thread

(cherry picked from commit 7a25a13926)
2024-03-24 18:02:19 +00:00
9d8444241b Optimize choice screen constants and variables
(cherry picked from commit c77f2ca46e)
2024-03-24 17:58:37 +00:00
606c9c55e0 Merge fix 2024-03-24 17:57:18 +00:00
d4726d3be2 Fix and improve big_bang (by
Gouvernathor)

the "on show" wasn't working for some reason and wasn't necessary anyway
easeout was probaly mixed up with easein, in any case easein renders much better
using easein_cubic for a sharper explosion
2024-03-24 17:56:01 +00:00
26b1e7f051 Fix weather storm and create the weather image tag (by
Gouvernathor)
2024-03-24 17:54:06 +00:00
2ef20d57da Clarify and simplify weather (by
Gouvernathor)

remove two blank images (useless and slower than Null())
clarify in weather.rpy which are images directly shown on the screen and not just ingredients for the others
simplify the screen code
2024-03-24 17:53:07 +00:00
47da88a59e Merge fix 2024-03-24 17:43:00 +00:00
51e2f49606 Avoid using an actual image reference instead of direct null
(cherry picked from commit f8251f921b)
2024-03-24 17:42:32 +00:00
30747a50b0 Don't use mutables in signatures
(cherry picked from commit a88706142f)
2024-03-24 17:42:22 +00:00
726406e11b Simplify menu position
(cherry picked from commit 9479859edd)
2024-03-24 17:40:49 +00:00
c3c0969be8 Sort inplace and skip unused variable
(cherry picked from commit e84d5cbdf0)
2024-03-24 17:40:40 +00:00
d38d442688 Fix variable name and move defaults
(cherry picked from commit f6c0054be0)
2024-03-24 17:40:26 +00:00
c5fb9a630c Merge labels into menus
(cherry picked from commit a29b7ec28b)
2024-03-24 17:39:16 +00:00
0d8c4df1fd Remove mutable in signature and pop todo
(cherry picked from commit 15b15b9085)
2024-03-24 17:38:39 +00:00
1e96385c47 Remove dependency
(cherry picked from commit 3fef941366)
2024-03-24 17:35:59 +00:00
a516e76f9b Better pass kwargs
this is not py2 anymore

(cherry picked from commit 6b2766e668)
2024-03-24 17:34:17 +00:00
21c170e256 Don't use protected variable name
(cherry picked from commit 2f2a9b985b)
2024-03-24 17:33:33 +00:00
93526daa17 Use scene statement instead of equivalent
(cherry picked from commit d132436843)
2024-03-24 17:33:03 +00:00
7beb1e4c1d Simplify and quicken summon list iteration
(cherry picked from commit 110847e9e6)
2024-03-24 17:32:07 +00:00
d1345a051d Make variables dynamic
or constant, in one case

(cherry picked from commit 1918def870)
2024-03-24 17:31:21 +00:00
db26683c25 Internal tweaks
(cherry picked from commit d34a96284c)
2024-03-24 17:31:05 +00:00
03d1c9a2c4 Improve and fix last
(cherry picked from commit acfb09516c)
2024-03-24 17:29:54 +00:00
9665d565d8 Replace show screen with call screen
(cherry picked from commit 1672b2381a)
2024-03-24 17:29:12 +00:00
f2d2c045af Factorize pos
(cherry picked from commit e242c0e43a)
2024-03-24 17:28:39 +00:00
f99c81b14a Factorize pos
(cherry picked from commit d7c8e39b08)
2024-03-24 17:28:29 +00:00
7e3a078dce Avoid single-use function
(cherry picked from commit 313849696c)
2024-03-24 17:27:50 +00:00
3579e2a38b Add safe return
otherwise the implicit return is at the end of the file, which means if we add another label down the file, it will be executed after give_gift

(cherry picked from commit 38787bdc4c)
2024-03-24 17:27:12 +00:00
f78c269fc8 Add data privacy when computing house points
the dynamic variables are needed for the show screen call

(cherry picked from commit aefa88e4d2)
2024-03-24 17:26:57 +00:00
20c00bbc74 merge fix 2024-03-24 17:26:42 +00:00
19d81fa9b8 Bug Fixes 2024-03-24 17:17:19 +00:00
26ecf0e6f0 Use a grid for the inventory
(cherry picked from commit c1ab7f7b85)
2024-03-24 17:06:17 +00:00
6860614062 Use the correct operator(s) for None
(cherry picked from commit 837d6b378e)
2024-03-24 17:06:06 +00:00
d17b04e93d Better text interpolation in screens
(cherry picked from commit 14607f2eb1)
2024-03-24 17:04:58 +00:00
d063d7fc5f Simplify crop_image_zoom calls
(cherry picked from commit def10a09ac)
2024-03-24 17:04:05 +00:00
a5b47a41e7 Remove get_zoom and use builtin fit feature
using renpy.render, wtf

(cherry picked from commit 3278b1f4af)
2024-03-24 17:01:46 +00:00
dbfb22b566 Fix 070d14a
(cherry picked from commit ed2a817c84)
2024-03-24 17:01:18 +00:00
815c90109b Use inplace sort and generator expressions
(cherry picked from commit 87ce17df8b)
2024-03-24 17:01:11 +00:00