Christoph Oelckers
7ba152e588
Merge branch 'master' into whaven
...
# Conflicts:
# source/core/gameinput.h
# source/core/version.h
# source/games/exhumed/src/enginesubs.cpp
# source/games/sw/src/game.cpp
2021-11-12 11:19:23 +01:00
Christoph Oelckers
6e0fbb2043
- removed templates.h includes.
2021-10-30 10:51:03 +02:00
Mitch Richters
b02a6a3ec9
- Replace MIN()
from templates.h
with version provided in STL.
2021-10-30 10:36:15 +02:00
Mitch Richters
4030a18245
Merge branch 'master' into whaven
2021-10-28 09:45:52 +11:00
Christoph Oelckers
39319a9582
- fixed warnings in common code.
2021-10-08 19:07:56 +02:00
Mitchell Richters
1d0924e45a
- Fix invocation name in FileSystem::GetLongName()
error output.
...
* Thanks to @Gaerzi for spotting this.
2021-08-23 18:55:42 +10:00
Mitchell Richters
1ee6fd76c4
Merge branch 'blood-qavrework'
...
# Conflicts:
# source/core/gamecvars.cpp
# source/core/gamecvars.h
# source/games/blood/src/weapon.cpp
2021-08-23 11:02:09 +10:00
Mitchell Richters
907e0974e9
- Add GetLongName()
method to FileSystem
class.
2021-08-22 15:03:28 +10:00
Christoph Oelckers
bad2c2e55f
- backend update from GZDoom
...
* replacement of 'long' in string code.
* palette removal in V_GetColor.
* fixes to DShape2D buffer management.
2021-08-14 10:04:45 +02:00
Christoph Oelckers
23b8707fc2
- added means to define resource IDs in all container formats allowing long file names.
...
To define these, construct a file name like "basename.{resourceid}.extension", e.g. blaster.{65}.qav will define 'blaster.qav' with a resource ID of 65.
2021-08-11 12:04:53 +02:00
Christoph Oelckers
8106d788f6
- backend update from GZDoom.
...
Fixes:
* do not strip 'filter' as a directory prefix.
* proper spacing for scaled sheet fonts.
* fix of transparent color in BMF fonts.
* fix restart button on error pane in Windows.
* do not skip over empty 'if's with a condition that would error out.
2021-08-11 10:28:21 +02:00
Christoph Oelckers
c51c6fa524
- adapted the Zip root folder eliminator to deal with archives that do not add proper folder records to their central directory.
2021-07-25 12:18:53 +02:00
Christoph Oelckers
198fbf9297
Merge branch 'master' into whaven
...
# Conflicts:
# source/core/screenjob.cpp
# source/core/searchpaths.cpp
2021-06-03 08:52:19 +02:00
Christoph Oelckers
e10bcf6294
- split the screen job code into a generic and a Raze specific part.
...
Preparations for porting this to GZDoom.
2021-05-22 01:35:50 +02:00
Christoph Oelckers
5784e45f41
Merge commit 'aa6bd8ffcc11c0ae3de1dae1ab530a999dd510c9' into whaven
...
# Conflicts:
# source/core/gameinput.h
2021-04-25 12:18:39 +02:00
Christoph Oelckers
dca964444b
- backend fixes from GZDoom.
2021-04-25 11:32:50 +02:00
Christoph Oelckers
588fa5ffe2
- fixed: FileSystem.CreatePathlessCopy must set the copy to not have a full path.
...
Otherwise it may evade special lookup rules for music and not be found
2021-04-20 20:00:47 +02:00
Christoph Oelckers
e82f17f9c6
Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven
...
# Conflicts:
# source/core/d_protocol.h
# source/core/gameinput.h
2021-04-17 14:59:12 +02:00
Christoph Oelckers
f6c4c19b02
- added a filter to the directory loader to remove EDuke32's texture cache files.
...
These cause problems with the texture manager.
2021-04-14 22:12:15 +02:00
Christoph Oelckers
2a7f2f4381
Merge commit '798cf2f9733c1415eef335a45f4d69962fae0695' into whaven
2021-04-12 20:41:39 +02:00
Christoph Oelckers
a15ac43722
- enable embedding of blood.rff and sounds.rff in mod archives when playing Blood
...
Some mods provide pregenerated resources, this allows loading them without picking them apart first.
2021-04-12 00:31:36 +02:00
Christoph Oelckers
aedb17e539
Merge commit 'a5ed7ba8a3eb26d3e3aa46bc87044608eacba57f' into whaven
2021-04-10 17:00:43 +02:00
Christoph Oelckers
f20acca498
- always default the resource ID to -1, even for dummy entries.
...
Better be safe than sorry, this should never happen in Blood but we never know what people may load...
2021-04-08 22:03:25 +02:00
Christoph Oelckers
fc314b6616
- allow loading Zips where all content is in a subdirectory.
...
The same logic as in GZDoom applies: The root must not have any other content and the subdirectory must contain identifiable game content.
Some handling was also added to strip out macOS resource fork folders because they can contain data that can confuse file detection.
2021-04-06 01:06:03 +02:00
Christoph Oelckers
5aacb2370d
- fixed game resource lookup.
...
The algorithm was a bit too complicated and missed the smallest defined game resource.
GrpInfo was renamed because there were two of them which created a debugger conflict.
2021-02-13 10:07:18 +01:00
Mitchell Richters
a515426c68
Merge branch 'master' into witchaven2
2021-01-01 17:32:32 +11:00
Christoph Oelckers
b73b59cf66
- fixed badly inherited exception subclass.
2020-12-30 09:55:57 +01:00
Christoph Oelckers
94d3d643d7
- fixed: the file system's entry count was not updated before rehashing.
...
This broke Blood's RFS parser.
2020-12-09 18:56:17 +01:00
Christoph Oelckers
2bebe0fa6a
- the WH intro movies are playing now.
2020-10-31 14:05:01 +01:00
Christoph Oelckers
bc0a55de41
- backend update.
2020-10-17 16:01:31 +02:00
Christoph Oelckers
25d79285a3
- added the resource file name to the listmaps printout.
2020-10-14 01:13:36 +02:00
Christoph Oelckers
4ca5bfdd46
- sanity check added for MoveLumpsInFolder
2020-09-27 16:12:51 +02:00
Christoph Oelckers
a27211dc34
- added support for SSI containers to the file system.
2020-09-19 10:07:53 +02:00
Christoph Oelckers
218a9c84fd
- removed the last remaining Blood helpers from the file system, also deleted a few short files whose contents could be moved.
2020-07-27 19:38:41 +02:00
Christoph Oelckers
b2f794bde5
- cache QAVs outside the file system as well.
...
- delete some voxel code that's software rendering only.
- apply Big Endian byte swapping for SFXs, as well, now that this no longer involves hacking the file system cache.
2020-07-27 19:37:02 +02:00
Christoph Oelckers
be9094cb97
Silenced lots of warnings pointed out by XCode.
2020-07-23 17:02:59 +02:00
Christoph Oelckers
a9141af545
- backend update.
2020-06-11 09:15:44 +02:00
Christoph Oelckers
d7225c1965
- backend update from GZDoom
2020-06-07 15:02:54 +02:00
Christoph Oelckers
724c8d4251
- fixed: The full dotted lump filter string was never used.
...
The code added all partial matches to the file system but not the full match.
2020-06-07 11:55:51 +02:00
Christoph Oelckers
c4017de12f
- updated to GZDoom's new texture management system.
2020-05-25 23:59:07 +02:00
Christoph Oelckers
5584c726ba
- file system update and adjustment.
2020-04-12 08:30:40 +02:00
Christoph Oelckers
e2f5e8fe34
- renamed 'common' to 'core'.
...
We'll need 'common' for something else.
2020-04-12 08:30:36 +02:00
Christoph Oelckers
a09e195954
- started transitioning the savegame writer to the newly added serializer.
...
Writing info.json done.
2020-02-23 09:41:12 +01:00
Christoph Oelckers
a90185bea9
- cleaned up the remaining dependencies on windows.h
...
This file now only gets included by code that really needs it.
2020-02-03 21:30:57 +01:00
Christoph Oelckers
5de7fbca37
- consolidation of music lookup code for user maps.
2020-01-27 20:53:41 +01:00
Christoph Oelckers
bbc145cbee
- enabled the Blood RFS parser.
...
Seems to work but there's not that much material to use it on so the mileage may vary.
2020-01-22 21:09:45 +01:00
Christoph Oelckers
b57d683938
- added default for nosubdir parameter.
2020-01-12 08:53:11 +01:00
Christoph Oelckers
6305714493
- fixed some issues with RR's Route66 add-on.
...
The new movies weren't played because the names did not match.
Transition from the last level of Ep1 to the first one of Ep2 did not work.
Selection with command line switch wasn't reliable.
2020-01-10 21:36:46 +01:00
Christoph Oelckers
fb985d2503
- more macOS compilation fixes
...
Still not complete…
2020-01-07 01:11:19 +01:00
Christoph Oelckers
134122335b
- first attempt to compile on a Mac
...
This could have gone better, there's far too many warnings here
2020-01-06 02:41:47 +01:00