Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New filesystem #76

Open
wants to merge 63 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
f497335
new filesystem: Copy in initial filesystem files
Chomenor Apr 12, 2018
c462edc
new filesystem: Initial tremulous porting work
Chomenor Apr 12, 2018
85ba05a
new filesystem: Refactor source dir definitions to avoid hardcoded so…
Chomenor Apr 15, 2018
cfaf833
new filesystem: Support reading from mac app bundle path
Chomenor Apr 15, 2018
2334088
new filesystem: Fix FS_FOpenFile null handle ptr return values to be …
Chomenor Apr 15, 2018
83f9701
new filesystem: Build with new filesystem ifdefs by default
Chomenor Apr 15, 2018
e352456
new filesystem: Run clang-format on everything in filesystem directory
Chomenor Apr 16, 2018
61c7449
new filesystem: Initial base directory and hash precedence support
Chomenor May 17, 2018
9cd31b3
new filesystem: Try to fix compile errors
Chomenor May 17, 2018
843e850
new filesystem: Try again to fix the compile error
Chomenor May 17, 2018
5100805
new filesystem: Mod dir handling work
Chomenor May 18, 2018
7e34608
new filesystem: Improved download/pure list handling
Chomenor May 24, 2018
2a2b09a
new filesystem: Rename 'system paks' to 'default paks'
Chomenor May 26, 2018
57d4706
new filesystem: Prioritize pk3dirs over pk3s with same name
Chomenor May 26, 2018
4edf2bb
Merge branch 'master' of https://github.com/GrangerHub/tremulous
Chomenor Jan 3, 2020
2b02f2d
new filesystem: Add folder browse functions
Chomenor Jan 3, 2020
3058a7b
new filesystem: Merge filesystem updates
Chomenor Jan 5, 2020
5504900
new filesystem: FS_FOpenFile cleanup and improvements
Chomenor Jan 6, 2020
35e8dab
new filesystem: Allow vms to read any files on disk when pure
Chomenor Jan 12, 2020
50780ae
new filesystem: Improve tremulous base directory handling
Chomenor Jan 13, 2020
5e0d768
new filesystem: Update tremulous core pk3 precedence
Chomenor Jan 13, 2020
0fed5aa
new filesystem: Update default.cfg handling
Chomenor Jan 14, 2020
9423942
new filesystem: Remove arch string from game dll search filename
Chomenor Jan 16, 2020
4281c6d
new filesystem: Use original error handling behavior for non-pk3 curl…
Chomenor Jan 16, 2020
55c6592
new filesystem: Fix ordering of duplicate pure list entries
Chomenor Jan 17, 2020
8cef060
new filesystem: Don't redownload core pk3s to different base directories
Chomenor Jan 17, 2020
813d60f
new filesystem: Simplify pk3_list_lookup function
Chomenor Jan 18, 2020
024325e
new filesystem: Update precedence handling and move some functions to…
Chomenor Jan 18, 2020
4f89e73
new filesystem: Rearrange some Tremulous defines
Chomenor Jan 18, 2020
82821ff
new filesystem: Provisional core game dll support
Chomenor Jan 18, 2020
d0004db
new filesystem: Path generation tweaks
Chomenor Jan 23, 2020
f8a6bec
new filesystem: Fix browse folder function for directory names contai…
Chomenor Jan 23, 2020
f4f95da
Build system: Adjust the build system for the new file system.
dGr8LookinSparky Jan 21, 2020
224e98e
Merge pull request #1 from dGr8LookinSparky/filesystem
Chomenor Jan 23, 2020
091abc4
new filesystem: Use fs_basegame for engine writes regardless of curre…
Chomenor Jan 23, 2020
65fc4a8
new filesystem: Fix old UI remaining loaded after demo playback finishes
Chomenor Jan 25, 2020
272c80e
- change the naming of the core-cgame and core-ui dynamic libraries b…
dGr8LookinSparky Jan 25, 2020
27fa4c3
Merge pull request #2 from dGr8LookinSparky/filesystem
Chomenor Jan 25, 2020
81ee257
new filesystem: Allow browse folder commands to create missing direct…
Chomenor Jan 25, 2020
0a21f7b
build system: fix zip errors.
dGr8LookinSparky Jan 25, 2020
1d63b5f
Merge pull request #3 from dGr8LookinSparky/filesystem
Chomenor Jan 25, 2020
b2a0b56
build system:remove unnecessary files in the travis-ci release builds.
dGr8LookinSparky Jan 26, 2020
1d7a696
build system: fix zip error for travis release build of macos.
dGr8LookinSparky Jan 26, 2020
cbeddac
build system: rename core-game to core_game.
dGr8LookinSparky Jan 26, 2020
280a9aa
game module: set the default of vm_game to 0.
dGr8LookinSparky Jan 26, 2020
87761ff
main menu: Add basemod/ as an option in the Browse Folders menu.
dGr8LookinSparky Jan 28, 2020
cc3ddbf
new filesystem: Allow parse functions to read files on disk when conn…
Chomenor Feb 4, 2020
9da72c9
Revert "new filesystem: Allow parse functions to read files on disk w…
Chomenor Feb 5, 2020
54917f8
new filesystem: Allow FS_FOpenFile to read files with specific extens…
Chomenor Feb 5, 2020
9cd1b2d
Correct the directory paths in the vms pk3 files.
dGr8LookinSparky Feb 16, 2020
db111bf
Merge branch 'master' of https://github.com/GrangerHub/tremulous
Chomenor Feb 28, 2020
539b722
git: change .gitattributes
dGr8LookinSparky Feb 28, 2020
cda5508
Merge branch 'master' into filesystem
dGr8LookinSparky Feb 28, 2020
4a18039
assets: update the assets to v1.3.0-alpha.0.14.10
dGr8LookinSparky Feb 28, 2020
81668c2
new filesystem: Support UI pk3 download progress stats
Chomenor Feb 28, 2020
6e107c0
new filesystem: Fix UI pk3 download progress stats
Chomenor Feb 29, 2020
706ee83
new filesystem: Merge pk3 manifest processing updates
Chomenor Mar 6, 2020
9ae3c6d
Merge branch 'master' of https://github.com/GrangerHub/tremulous
Chomenor Mar 26, 2020
62ba61a
new filesystem: Initial support for multi-version pk3 manifests
Chomenor Mar 26, 2020
7b39045
renderer: make lightmap not cheat protected.
dGr8LookinSparky Mar 30, 2020
eeeb57f
default assets: Update the Trem 1.3 default assets to v1.3.0-alpha.0.…
dGr8LookinSparky Mar 30, 2020
89ea9ea
Merge branch 'master' of https://github.com/GrangerHub/tremulous
Chomenor Mar 30, 2020
798ad46
tremulous: fix the bucket system for QVMs.
dGr8LookinSparky Mar 31, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/client/cl_main.cpp
Original file line number Diff line number Diff line change
@@ -2403,6 +2403,8 @@ void CL_InitDownloads(void)

CL_NextDownload();
#else
char *s;

if (FS_ComparePaks(clc.downloadList, sizeof(clc.downloadList), true))
{
Com_Printf("Need paks: %s\n", clc.downloadList);
13 changes: 12 additions & 1 deletion src/renderergl1/tr_model.cpp
Original file line number Diff line number Diff line change
@@ -65,6 +65,17 @@ qhandle_t R_RegisterMD3(const char *name, model_t *mod)
fext++;
}

if(strcmp(fext, "md3") == 0)
{
char name3000[MAX_QPATH];
qhandle_t md3000;

strcpy(name3000, filename);
strncat(name3000, ".md3000", MAX_QPATH);
if(md3000 = R_RegisterMD3(name3000, mod))
return md3000;
}

#ifdef NEW_FILESYSTEM
for(lod=0; lod<MD3_MAX_LODS; ++lod)
{
@@ -108,7 +119,7 @@ qhandle_t R_RegisterMD3(const char *name, model_t *mod)
if(!buf.u)
continue;
#endif

ident = LittleLong(* (unsigned *) buf.u);
if (ident == MD3_IDENT)
loaded = R_LoadMD3(mod, lod, buf.u, name);
13 changes: 12 additions & 1 deletion src/renderergl2/tr_model.cpp
Original file line number Diff line number Diff line change
@@ -66,6 +66,17 @@ qhandle_t R_RegisterMD3(const char *name, model_t *mod)
fext++;
}

if(strcmp(fext, "md3") == 0)
{
char name3000[MAX_QPATH];
qhandle_t md3000;

strcpy(name3000, filename);
strncat(name3000, ".md3000", MAX_QPATH);
if(md3000 = R_RegisterMD3(name3000, mod))
return md3000;
}

#ifdef NEW_FILESYSTEM
for(lod=0; lod<MD3_MAX_LODS; ++lod)
{
@@ -109,7 +120,7 @@ qhandle_t R_RegisterMD3(const char *name, model_t *mod)
if(!buf.u)
continue;
#endif

ident = LittleLong(* (unsigned *) buf.u);
if (ident == MD3_IDENT)
loaded = R_LoadMD3(mod, lod, buf.u, size, name);