ich777/CorsixTH
1
0
Fork 0
mirror of https://github.com/CorsixTH/CorsixTH.git synced 2025-07-23 04:13:01 +02:00
Code Issues Packages Projects Releases Wiki Activity
4,983 Commits 26 Branches 55 Tags
master
Commit Graph

4983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alberth
b15ae9b2c3 Explicitly set the machine mood marker 2025-05-03 08:40:24 +02:00
Alberth
8d283fce7d Add afterloads for the new mood marker variable. 2025-05-02 20:41:28 +02:00
Alberth
4749694a2e Document the humanoid position conversion function 2025-05-02 18:12:23 +02:00
Alberth
3fb446e29e Specify the marker to use for moods of an entity. 2025-05-02 18:01:04 +02:00
Artem Argus
e45ceb454e afterload minor fix in earthquake.lua (#2841) 2025-05-01 21:02:22 +01:00
Toby Lane
83848290ba Add fatal error for missing level files 2025-05-01 18:24:16 +01:00
Alberth
19193781f8 Introduce kf* variables for large collections of keyframe positions. 2025-04-30 20:18:07 +02:00
Alberth
8474f1788d A few less centers 2025-04-30 20:18:07 +02:00
Alberth
4bc01fe7e4 Remove TheApp 2025-04-30 20:18:07 +02:00
Alberth
12ba85c7dd Add fake animation manager to Lua test 2025-04-30 20:18:07 +02:00
Alberth
87c5d76220 Add TheApp global. 2025-04-30 20:18:07 +02:00
Alberth
10cfbd1632 Fix too general name for walk animations. 2025-04-30 20:18:07 +02:00
Alberth
93f84f97fa Improve and add animation marker positions 2025-04-30 20:18:07 +02:00
Alberth
163666ad7b Adapt humanoid file. 2025-04-30 20:18:07 +02:00
Alberth
e09fab8f7d Adjust most setMarker calls. (Humanoid done in the next commit) 2025-04-30 20:18:07 +02:00
Alberth
77a06eb6aa Replace setMarker by setPatientMarker and setStaffMarker 2025-04-30 20:18:07 +02:00
Alberth
ae909818a3 Use secondary marker for staff. 2025-04-30 20:18:07 +02:00
Alberth
85357f8ce1 Allow setting markers by listing all positions. 2025-04-30 20:18:07 +02:00
Alberth
6ac8bd31d2 Cleanup setMarkerRaw a bit 
- Eliminate the "anims = self.anims" shorthand.
- Move 'tp_arg1' assignment closer to its first use.
- Eliminate an unfinished case of specifying marker positions.
 2025-04-30 20:18:07 +02:00
Alberth
815370fee2 Move animation table unfolding to its own function. 2025-04-30 20:18:07 +02:00
Alberth
83035b0220 Rename the tile/pixel position function, and clean it up 2025-04-30 20:18:07 +02:00
Alberth289346
13ba112d8a Merge pull request #2812 from ARGAMX/prevent-pickup-surgeon-during-operation 
Operation Theatre. Prevent pickup surgeon during surgery operation
 2025-04-29 20:41:24 +02:00
Stephen E. Baker
777259614d Fix Some depersisted Objects/Animations are not fully rendered #2826 (#2835) 
A regression introduced in 5ff228ac21.

luaT_testuserdata only works correctly if it is passed the correct
metatable reference, and the implementation we had assumed that was the
current environment table, but in the case of map loading it wasn't.

I wrote a replacement method for determining the class of the
animation_base userdata that depends on the __class_info stored in the
metatable.

There was an additional problem with persistence breaking any new saves:
it was using the void* of link_list rather than the class itself.
link_list was not polymorphic so I added the virtual destructor to fix
that and give it a vtable, then dynamic_cast to ensure the proper
pointer type was persisted.
 2025-04-28 19:03:06 +03:00
Stephen E. Baker
7e8ec2dd05 Merge pull request #2833 from TheCycoONE/fetch_catch2 
Option for CMake to fetch Catch2
 2025-04-27 22:47:54 -04:00
Stephen E. Baker
e61231df95 Option for CMake to fetch Catch2 
Trying to build CorsixTH on Debian 12, Catch2 was one dependency I
couldn't satisfy. This option allows CMake to fetch the files it needs
for unit tests.
 2025-04-26 23:46:52 -04:00
lewri
04b5fd415d Merge pull request #2133 from mugmuggy/staff_work 
Change how staff find work
 2025-04-26 17:58:22 +01:00
Toby Lane
2c22b5f879 Add level file overlays 2025-04-26 17:17:12 +01:00
Artem Argus
4f04a25ddc Operation Theatre. Remove resume surgery operation (#2822) 
* remove continuation of surgery operation

* remove continuation of surgery operation
 2025-04-26 15:47:31 +01:00
Artem Argus
6eeafc7f58 boiler breakdown. prevent temp adjust during breakdown. (#2829) 2025-04-25 22:07:49 +01:00
Artem Argus
1763a88a59 [RDY] Money Bar non-CJK unicode fix (#2827) 
* Money Bar non-CJK unicode fix

Co-authored-by: Toby <mrtobylane@gmail.com>

---------

Co-authored-by: Toby <mrtobylane@gmail.com>
 2025-04-23 21:41:10 -04:00
Alberth289346
ecbb17a007 Merge pull request #2816 from ARGAMX/queue-minor-refactoring 
Queue minor refactoring
 2025-04-23 18:39:01 +02:00
Stephen E. Baker
3c5b742857 Merge pull request #2398 from tobylane/fontincluded 
Look for a bundled Noto CJK font
 2025-04-21 23:12:48 -04:00
Toby
782bbb4e05 Fix campaign restart 2 (#2823) 2025-04-21 08:50:45 +03:00
Toby Lane
1d7950b690 Add WITH_FONT build option, and search for bundled font, for if user doesn't choose a font file 2025-04-19 18:47:09 +01:00
Matroftt
f3a27fff75 Add machine menu (#2793) 
---------

Co-authored-by: lewri <lewri@users.noreply.github.com>
Co-authored-by: Artem Argus <ARGAMX@users.noreply.github.com>
 2025-04-19 00:13:04 -04:00
Artem Argus Gusakov
e5f7ff8ad8 queue minor refactoring. improvements by review. 2025-04-17 15:16:48 +03:00
Artem Argus Gusakov
3839eaf499 improvements by review 2025-04-16 13:40:16 +03:00
Artem Argus Gusakov
1581164ac4 improvements by review 2025-04-15 18:35:06 +03:00
Stephen E. Baker
5feac8d919 Merge pull request #2825 from Alberth289346/avoid-loss-of-data-warning 
Use lua_Integer instead of uint32_t to avoid a warning about possible loss of data
 2025-04-14 19:14:26 -04:00
Alberth
9b32020324 Use lua_Integer instead of uint32_t to avoid a warning about possible loss of data. 2025-04-14 17:44:20 +02:00
lewri
87d662e34d Amend for ward handling 
& localise useful checker into a functrion
 2025-04-13 15:20:08 +01:00
Stephen E. Baker
ed8382690c Merge pull request #2814 from ARGAMX/operation-theatre-patient-should-not-escape 
Operation Theatre. Surgeons should not stuck
 2025-04-09 20:39:10 -04:00
Stephen E. Baker
a3b79ca9ce Merge pull request #2820 from Alberth289346/remove-getMarker-setFrameMarker 
Remove obsolete getMarker/setFrameMarker
 2025-04-08 19:11:26 -04:00
Artem Argus Gusakov
bd33b572a7 improvements by review 2025-04-08 23:40:05 +03:00
Alberth
af91c343e8 Remove obsolete getMarker/setFrameMarker 2025-04-08 20:31:48 +02:00
Alberth289346
0cbc093290 Allow using the secondary marker (#2818) 
* Rename the first marker to 'primary_marker'.

- Also add lua member methods that use 'PrimaryMarker'

* Rename animation_kind::child to animation_kind::primary_child

* Allow using the secondary marker for a child animation.

* Increment API version due to new  and modified functions
 2025-04-07 21:23:29 -04:00
Stephen E. Baker
39ebc4a79d Merge pull request #2817 from lewri/fix_wait_mood_clear 
Fix stuck wait moods
 2025-04-07 21:16:17 -04:00
lewri
6313497a2d Create isRoomInDemand function 2025-04-07 22:15:45 +01:00
lewri
6943175c74 Fix stuck wait moods 2025-04-07 19:28:52 +01:00
Artem Argus Gusakov
b3d5b80431 queue minor refactoring 2025-04-07 14:40:18 +03:00