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

Revert "Add reference configs, scripts and shaders." #80

Merged
merged 1 commit into from
Nov 15, 2015

Conversation

CrossVR
Copy link
Contributor

@CrossVR CrossVR commented Nov 15, 2015

This reverts commit 0d00ac8.

As discussed on IRC with @nitrocaster, we shouldn't have any scripts, configs or other gamedata in our repository unless strictly necessary. This project should be focused on the engine, needlessly packaging all scripts, configs and shaders invites gameplay changes to be contributed to the project.

In the rare case that a script, config or shader change is necessary only the files changed should be committed. Therefore I have kept the two script files that were changed since these files were committed to the repository.

This reverts commit 0d00ac8.

Conflicts:
	res/gamedata/scripts/lua_help.script
	res/gamedata/scripts/ui_sleep_dialog.script
nitrocaster pushed a commit that referenced this pull request Nov 15, 2015
Revert "Add reference configs, scripts and shaders."
@nitrocaster nitrocaster merged commit c79a0d7 into OpenXRay:master Nov 15, 2015
@CrossVR CrossVR deleted the gamedata branch November 15, 2015 10:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants