Commit graph

8102 commits

Author SHA1 Message Date
Sezz
99b02f6263 Minor string doc refactors 2023-09-09 14:29:25 +10:00
Sezz
9304e2e3d5 Also scale sprite size argument 2023-09-08 21:06:23 +10:00
Sezz
0010e06c0e
Remove useless default argument 2023-09-08 02:25:42 +10:00
Sezz
1bca7a4162 Update TargetHighlighter.h 2023-09-07 19:47:36 +10:00
Sezz
fe60722d3a Update PickupSummary.cpp 2023-09-07 19:31:25 +10:00
Sezz
ff3baf0781 Fix strings 2023-09-07 19:24:24 +10:00
Sezz
554306f4a3 Fix crosshair orientation reset 2023-09-07 19:04:55 +10:00
Sezz
1b526ea1fc Merge branch 'renderer' into sezz_target_highlighter 2023-09-07 18:25:31 +10:00
Sezz
79c3d26196 Update draw order 2023-09-07 18:23:23 +10:00
Sezz
09acc55ccc Stack file partial organisation 2023-09-07 17:05:23 +10:00
Sezz
ad6b1d7dd0 Pushable physics file partial cleanup 2023-09-07 16:50:22 +10:00
Sezz
6aedbc8a2c Merge branch 'develop' into Adngel-pushables-remake 2023-09-07 15:39:06 +10:00
Sezz
d25f81ab05 Revert anims shift for reserved anims 2023-09-07 15:37:50 +10:00
Sezz
d341b8eae1 Update names 2023-09-07 02:22:43 +10:00
Sezz
72e6cec942 Fix debug string 2023-09-07 02:12:40 +10:00
Sezz
8afe549806 Update crosshair appearance; update draw order 2023-09-07 02:09:05 +10:00
Sezz
d5fb3568f0 Merge branch 'renderer' into sezz_target_highlighter 2023-09-07 01:17:51 +10:00
Sezz
e259f3f286 Update Renderer11Draw2D.cpp 2023-09-07 01:06:00 +10:00
Sezz
bd1a87943b Optimise 2023-09-07 01:05:20 +10:00
Sezz
6579b67882 Update function calls; simplify names 2023-09-07 00:27:51 +10:00
Sezz
7720d2da09 Update TombEngine.vcxproj 2023-09-07 00:13:55 +10:00
Sezz
f2f63fa3fa Merge branch 'renderer' into sezz_target_highlighter 2023-09-07 00:13:30 +10:00
Sezz
f0e4dc3b4b Merge branch 'develop' into sezz_target_highlighter 2023-09-07 00:07:58 +10:00
Sezz
fdb2527518 Harmonise all parameter ordering 2023-09-06 23:04:57 +10:00
Sezz
ac8fb4021b Adjust parameter order for screen sprite script function 2023-09-06 22:56:30 +10:00
Sezz
f97b3b64c0 Adjust screen sprite code; remove old function 2023-09-06 22:48:44 +10:00
MontyTRC89
8d231981c9 Merge branch 'renderer' of https://github.com/MontyTRC89/TombEngine into renderer
# Conflicts:
#	TombEngine/Renderer/Renderer11.h
#	TombEngine/Renderer/Renderer11Draw.cpp
#	TombEngine/Renderer/Renderer11Draw2D.cpp
#	TombEngine/Renderer/Renderer11Frame.cpp
#	TombEngine/Renderer/RendererSprite2D.h
2023-09-06 13:45:15 +02:00
Kubsy
420eda464b add EnablePointFilter to gameflow.lua 2023-09-06 12:16:59 +01:00
MontyTRC89
abcd2dfaf6 Merge branch 'develop' into renderer 2023-09-06 11:20:42 +02:00
MontyTRC89
6f10ebe673 Added LUA for screen sprites;
Refactored screen sprites;
Added blend mode;
2023-09-06 11:19:34 +02:00
Stranger1992
db794cd23a Compiler error fix 2023-09-03 21:33:58 +01:00
Lwmte
f677a5071c
Split strings file (#1204)
* Initial Commit
* Rename
* Alphabetise system strings; minor formatting
* Fix missed rename
* Alphabetise user strings
* Newline
* Bug fix with default Strings.Lua file resulted in a crash.
* Rename in iterator

---------

Co-authored-by: Sezz <sezzary@outlook.com>
Co-authored-by: Stranger1992 <84292688+Stranger1992@users.noreply.github.com>
2023-08-31 23:14:17 +03:00
Sezz
3fd287d3f3 Partially implement Lua function for sprites in 2D space 2023-08-31 16:26:53 +10:00
Sezz
0342c559a8 Formatting 2023-08-31 15:54:12 +10:00
Sezz
f2873c637c Formatting 2023-08-31 15:16:10 +10:00
Adngel
0c96017d76 Pushable Loop restored 2023-08-30 13:42:14 +02:00
Adngel
ab0f555249 Added sounds to edge fall 2023-08-29 17:05:06 +02:00
Sezz
13d8c4fa06 Merge branch 'develop' into sezz_target_highlighter 2023-08-29 23:44:31 +10:00
Sezz
8739d1465b Update some comments; move sound map init to function 2023-08-29 19:41:17 +10:00
Jakub
586e7f17cc
Merge pull request #1203 from MontyTRC89/flipmap_fixes
Flipmap fixes
2023-08-29 10:37:44 +01:00
MontyTRC89
57fd3c420a Added priority and opacity to 2D screen sprites;
Fixed bug when no sprites are to be drawn;
2023-08-29 10:35:59 +02:00
MontyTRC89
90f8263a2b Merge branch 'develop' into renderer 2023-08-29 10:10:08 +02:00
MontyTRC89
cfe810c084 Merge branch 'renderer' of https://github.com/MontyTRC89/TombEngine into renderer 2023-08-29 10:07:23 +02:00
MontyTRC89
1e7178de0e Added 2D screen sprites;
Point filter off by default;
2023-08-29 10:07:18 +02:00
Adngel
d86db96cf0 Polishment
- Removed duplicated file.
- Bitwise operations replaced with mathematical operations.
- Removed deprecated comment lines.
2023-08-28 04:47:15 +02:00
Adngel
1b02efe8ff Merge branch 'develop' into Adngel-pushables-remake 2023-08-27 23:23:41 +02:00
Adngel
30124d08fa Polishment environment names.
Discarded Shallowater for lack of use.
DeepWater changed to water.
2023-08-27 22:40:30 +02:00
Adngel
9bf611a6de Fix Shallow Water error 2023-08-27 22:29:49 +02:00
Adngel
d0733933b5 Polishment update 2023-08-27 21:14:39 +02:00
Adngel
e919c46689 Fix leaning direction
Fixing an issue of a wrong leaning direction when the pushable that was being pushed by an edge, had a yaw different than 0.
2023-08-27 18:05:49 +02:00