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

Enable referencing for data types #979

Merged
merged 201 commits into from
Aug 8, 2018
Merged

Enable referencing for data types #979

merged 201 commits into from
Aug 8, 2018

Conversation

niazim3
Copy link
Collaborator

@niazim3 niazim3 commented Aug 7, 2018

In the interest of getting addLabels merged into master with working links as soon as possible, in commit 9cb8887, RefType was reinserted as a field for Labels. Please follow the messages in #971 to see the reasoning for doing so.

elwazana and others added 30 commits June 22, 2018 12:44
… for referencing (removes some uses of missingP hack)
@JacquesCarette
Copy link
Owner

@niazim3 I just pointed out a few things to @samm82 that should be looked at before this can be merged. But it does seem like we're extremely close. 103 files changed, wow...

Copy link
Owner

@JacquesCarette JacquesCarette left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, please merge master (I just accepted a PR which conflicts) in one more time.

code/Makefile Outdated
@@ -27,7 +27,7 @@ SWHS_EXE = swhs
SSP_EXE = ssp
GAME_EXE = chipmunkdocs

DIRS = $(TINY_DIR) $(GLASS_DIR) $(NoPCM_DIR) $(SWHS_DIR) $(SSP_DIR) $(GAME_DIR) $(DATA_DIR) $(LANG_DIR) $(DOCL_DIR) $(EXAM_DIR) $(CODE_DIR) $(GEN_DIR) $(PRINT_DIR)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is GLASS_DIR removed?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was removed because of the error with GlassBR and apparently never added back in - I'll fix then merge master.

@JacquesCarette JacquesCarette merged commit e6fc580 into master Aug 8, 2018
@JacquesCarette JacquesCarette deleted the addLabels branch August 8, 2018 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants