... | ... | @@ -3,13 +3,15 @@ Hierarchical list of branches included in `birdhouse-build-master`. Conflicting |
|
|
- `fkart-12-renderstats`: Merger branch (both branches touch timing code and conflict)
|
|
|
- `fkart-12`: Frame interpolation from fkart.
|
|
|
- `renderstats`: Various rendering stats for OpenGL and software renderers.
|
|
|
- `lessflicker`: Console variable to toggle flicker in midnight channel screen effect.
|
|
|
- `kodahack`: Toggle for flickering TV overlay effect used in Midnight Channel.
|
|
|
- `bh-ogl-merger`: Merger branch for various OpenGL additions that likely conflict
|
|
|
- `custom-resolutions`: Custom resolution support for command line parameters `-width` and `-height`. Increases max resolution to 4K. (Though this is in a ogl merger branch software can also use custom resolutions with this)
|
|
|
- `kodahack`: Toggle Kodachrome Void's textures to something else using the kodahack console command.
|
|
|
- `ogl-screentex-toggle`: Ability to toggle screen textures off to increase performance.
|
|
|
- `lessflicker`: Toggle for flickering TV overlay effect used in Midnight Channel.
|
|
|
- `turnsmoothing`: Keyboard turn smoothing options from fkart.
|
|
|
- `callmore/skin-select-2d`: New (toggleable) character selection screen from Callmore.
|
|
|
- `bugfix-branch`: This branch has sometimes been used for committing small bugfixes.
|
|
|
- `conenction-screen-improvements`: Improvements for the connection screen, including loading bars for file loading.
|
|
|
- `custom-resolutions`: Custom resolution support for command line parameters `-width` and `-height`. Increases max resolution to 4K.
|
|
|
- `http-mserv`: James's HTTP master server client
|
|
|
|
|
|
|