Compare commits

...
Author SHA1 Message Date
cambragol a98b8b4845 dat loading switch
Added switch for loading falloutce.dat, before or after master, depending on presence of original master.dat

Added master_override setting in fallout2.cfg, to declare a master.dat to be original
2025-06-22 16:05:48 +09:00
cambragol d43b26d98b Merge branch 'main' into fallout2ce-dat-and-ini 2025-06-22 11:54:14 +09:00
cambragol f23e44d5f3 Merge branch 'fallout2.cfg-enhancement' into fallout2ce-dat-and-ini 2025-06-21 21:29:24 +09:00
cambragol 568cc4267a Merge branch 'main' into fallout2ce-dat 2025-06-21 12:00:32 +09:00
cambragol afd99fa01b Merge branch 'main' into fallout2.cfg-enhancement 2025-06-19 16:26:26 +09:00
cambragol 3e469ea8e8 Update svga.cc
Removed commented out lines
2025-06-17 19:35:05 +09:00
cambragol 6e8faa823a Merge branch 'main' into fallout2ce-dat 2025-06-17 14:45:47 +09:00
cambragol ddefda32e7 Update ddraw.ini
Added missing features to ddraw.

-iface stuff
-worldmaptravelmarkers
-gapless music
2025-06-17 14:28:57 +09:00
cambragol 0334b8de05 Update README.md
small fix to readme to clarify.
2025-06-17 14:24:55 +09:00
cambragol 1cab275037 Update .gitignore
removed accidentally updated .gitignore entries.
2025-06-17 14:23:06 +09:00
github-actions[bot] 7eb269bab8 chore: auto-format with clang-format 2025-06-17 05:21:51 +00:00
cambragol c18d7ab25e hires_stencil
Moved hires_stencil from ddraw to fallout2.cfg
2025-06-17 09:06:18 +09:00
cambragol 59bf337583 Update README.md
Updated to reflect changes to fallout2.cfg and removal of f2_res.ini
2025-06-17 08:34:44 +09:00
cambragol 88179574e8 Making 'graphics' settings category
moved all new f2_res settings into seperate 'graphics' category - was dumped in 'system' before
2025-06-17 07:43:47 +09:00
cambragol 0733acfad7 Iface to ddraw
removed f2_res.ini res in game.cc for splash screens - replaced with settings.system.splash_size;
added game config for all f2_res setting, except iface/sidebars
Moved iface/sidebars setting to sfall -ddraw.ini
2025-06-17 07:23:26 +09:00
cambragol 1388ca1f83 First Draft
Moving f2_res.ini setting into fallout2.cfg, where appropriate

Added some setting for stretching/aspect/highquality

renamed screen_width/height to game_width/height (to later make clear that this will be the 'in game (map) size' - *not* the menu etc. Will make sense with stretching.

Added config for falloutce.dat loading.
2025-06-16 15:44:38 +09:00
cambragol 1a8d6a4973 Update readme
Updating readme with file info
2025-05-28 18:01:38 +09:00
cambragol a2b47104a3 Create fallout2ce.dat
Adding .dat file for contents of fallout2cedat
2025-05-28 15:44:46 +09:00
cambragol d265d3a69a Renamed Dat folder
Renamed dat folder to allow upload of actual .dat
2025-05-28 15:44:08 +09:00
cambragol c2feba8f22 Add files via upload
Added my own customized interface files, (will make a list later) and some of the current contents of the f2_res.ini file (iface borders)
2025-05-28 15:08:27 +09:00
cambragol d137b3d95b Create readme
Adding a folder to hold dat file resources. Adding a quick readme to generate the folder.
2025-05-28 15:04:30 +09:00
cambragol 4ff46801ec Update game.cc
Trying out adding a custom .dat file for Fallout2-CE - adding after  master and critter .dats, but before any other patches. This allows us to replace OG textures with our fixes, but our fixes can be written over by mods.
2025-05-28 15:01:01 +09:00
58 changed files with 218 additions and 96 deletions
+26 -21
View File
@@ -96,16 +96,32 @@ The main configuration file is `fallout2.cfg`. There are several important setti
The `sound` folder (with `music` folder inside) might be located either in `data` folder, or be in the Fallout folder. Update `music_path1` setting to match your hierarchy, usually it's `data/sound/music/` or `sound/music/`. Make sure it matches your path exactly (so it might be `SOUND/MUSIC/` if you've installed Fallout from CD). Music files themselves (with `ACM` extension) should be all uppercased, regardless of `sound` and `music` folders.
The second configuration file is `f2_res.ini`. Use it to change game window size, enable/disable fullscreen mode and configure IFACE settings (the control bar at the bottom of the game screen).
Additionally, the [graphics] section provides options for fine tuning the appearence of the game. The included settings are:
```ini
[MAIN]
SCR_WIDTH=1280
SCR_HEIGHT=720
WINDOWED=1 ; 0 = fullscreen
SCALE_2X=1 ; 0 = original scale, 1 = 2x - requires increasing the minimum resolution from 640x480 to 1280x960.
```
[graphics]
fullscreen=0 ; 1 = fullscreeen, 0 = windowed
game_height=480 ; main play area height
game_width=640 ; main play area width
scale2x=0 ; 0 = original scale, 1 = 2x - requires increasing the minimum resolution from 640x480 to 1280x960.
splash_size=0 ; 0 = normal, 1 = aspect stretch, 2 = fullscreen stretch
```
[IFACE]
Recommendations:
- **Desktops**: Use any size you see fit.
- **Tablets**: Set these values to logical resolution of your device, for example iPad Pro 11 is 1668x2388 (pixels), but it's logical resolution is 834x1194 (points).
- **Mobile phones**: Set height to 480, calculate width according to your device screen (aspect) ratio, for example Samsung S21 is 20:9 device, so the width should be 480 * 20 / 9 = 1067.
In time this graphcs settings will receive an in-game interface. For the time being it must be configured manually.
The second configuration file is `ddraw.ini` (part of Sfall). There are dozens of options that adjust or override engine behaviour and gameplay mechanics. This file is intended for modders and advanced users.
For a sample ddraw.ini configuration file, containing all currently working settings use this link: [ddraw.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/main/files/ddraw.ini)
Further, Fallout2-CE supports the following additional settings in ddraw.ini:
```
[Misc]
; if IFACE_BAR_MODE=0 - the bottom of the map view window sits at the top of the IFACE Bar.
; if IFACE_BAR_MODE=1 - the bottom of the map view window extends to the base of the screen and is overlapped by the IFACE Bar.
IFACE_BAR_MODE=0
@@ -128,22 +144,11 @@ IFACE_BAR_SIDES_ORI=0
;IFACE_BAR_WIDTH=640
```
Recommendations:
- **Desktops**: Use any size you see fit.
- **Tablets**: Set these values to logical resolution of your device, for example iPad Pro 11 is 1668x2388 (pixels), but it's logical resolution is 834x1194 (points).
- **Mobile phones**: Set height to 480, calculate width according to your device screen (aspect) ratio, for example Samsung S21 is 20:9 device, so the width should be 480 * 20 / 9 = 1067.
In time this stuff will receive in-game interface, right now you have to do it manually. For a sample f2_res.ini configuration file, containing all currently working settings use this link: [f2_res.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/mainmenu/files/f2_res.ini)
*Note*: use of the IFACE_BAR settings requires the f2_res.dat file, which contains graphical assets. Various versions are available, but one compatible with the above f2_res.ini be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/mainmenu/files/f2_res.dat)
The third configuration file is `ddraw.ini` (part of Sfall). There are dozens of options that adjust or override engine behaviour and gameplay mechanics. This file is intended for modders and advanced users.
For a sample ddraw.ini configuration file, containing all currently working settings use this link: [ddraw.ini](https://raw.githubusercontent.com/fallout2-ce/fallout2-ce/refs/heads/main/files/ddraw.ini)
*Note*: use of the IFACE_BAR settings requires the f2_res.dat file, which contains graphical assets. Various versions are available, but one compatible with the above settings be found here: [f2_res.dat](https://github.com/fallout2-ce/fallout2-ce/raw/refs/heads/mainmenu/files/f2_res.dat)
## Quality of life benefits over vanilla Fallout
* High resolution support
* Large game area support (through HiResMode=1 in ddraw.ini and game_height=480 and game_width=640 settings in fallout2.cfg)
* Increased pathfinding nodes 5x for more accurate pathfinding
* Ctrl-click to quickly move items when bartering, looting, or stealing
* _a_ to select "all" when selecting item quantity
+27
View File
@@ -10,6 +10,33 @@
;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
[Misc]
; if IFACE_BAR_MODE=0 - the bottom of the map view window sits at the top of the IFACE Bar.
; if IFACE_BAR_MODE=1 - the bottom of the map view window extends to the base of the screen and is overlapped by the IFACE Bar.
IFACE_BAR_MODE=0
;if IFACE_BAR_SIDE_ART=0 - Black, No Iface-bar side art used.
;if IFACE_BAR_SIDE_ART=1 - Metal (grey) look Iface-bar side art used.
;if IFACE_BAR_SIDE_ART=2 - Leather look Iface-bar side art used.
;if IFACE_BAR_SIDE_ART=3-6 - Alternative Metal look Iface-bar side art used.
;if IFACE_BAR_SIDE_ART=7 - Alternative Leather look Iface-bar side art used.
;if IFACE_BAR_SIDE_ART=8 - Metal (brown) look Iface-bar side art used.
IFACE_BAR_SIDE_ART=5
;if IFACE_BAR_SIDES_ORI=0 - Iface-bar side graphics extend from the Iface-Bar to the Screen edges.
;if IFACE_BAR_SIDES_ORI=1 - Iface-bar side graphics extend from the Screen edges to the Iface-Bar.
IFACE_BAR_SIDES_ORI=1
;This will increase the width of the interface bar expanding the area used to display text.
;if IFACE_BAR_WIDTH=640 - Interface bar will remain at it's original width.
IFACE_BAR_WIDTH=800
;Adds Fallout 1 style travel/trail dots
WorldMapTravelMarkers=0
;Prevents pausing music between map areas with the same music
GaplessMusic=0
;Uncomment these lines to change the timers of how many days after the game starts Hakunin dream sequences will occur
;MovieTimer_artimer1=5000
;MovieTimer_artimer2=5000
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More