Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Tales of MajEyal
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tome
Tales of MajEyal
Commits
942ea363
Commit
942ea363
authored
10 years ago
by
Eric Wykoff
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' into more_fixes
parents
721818e6
9a67b421
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!191
More fixes
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
game/engines/default/engine/Map.lua
+42
-16
42 additions, 16 deletions
game/engines/default/engine/Map.lua
game/modules/tome/data/general/objects/world-artifacts.lua
+26
-21
26 additions, 21 deletions
game/modules/tome/data/general/objects/world-artifacts.lua
with
68 additions
and
37 deletions
Loading
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
