Skip to content

GitLab

  • Projects
  • Groups
  • Snippets
  • Help
    • Loading...
  • Help
    • Help
    • Support
    • Submit feedback
    • Contribute to GitLab
  • Sign in
maxr
maxr
  • Project overview
    • Project overview
    • Details
    • Activity
    • Releases
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 211
    • Issues 211
    • List
    • Boards
    • Labels
    • Service Desk
    • Milestones
  • Merge Requests 1
    • Merge Requests 1
  • Analytics
    • Analytics
    • Repository
    • Value Stream
  • Wiki
    • Wiki
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Create a new issue
  • Commits
  • Issue Boards
  • maxr
  • maxrmaxr
  • Merge Requests
  • !17

Open
Opened Nov 18, 2019 by Dmitry Kargin@TinGoose
  • Report abuse
Report abuse

AnyUnitSize, part 2. New loader for game data.

  • Overview 8
  • Commits 3
  • Changes 8

I have improved a process of loading game data. Now the loading process is incapsulated by cLoader class. It loads data in a background thread. Interaction with cLoader is done through SDL events.

cLoader got its initial support for loading mods. Though, most of mod support is still in AnyUnitSize branch. cLoader loads mods by iteratively calling cLoader::loadFolder(const char* path) method.

MakeLog function is changed. Now it is cLoader::writeConsole method. And it has additional argument increment. It can specify whether we need to write to the same line, or to the next. It makes generating text for loading screen much easier.

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch "https://git.maxr.org/TinGoose/maxr.git" "develop"
git checkout -b "TinGoose/maxr-develop" FETCH_HEAD

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git fetch origin
git checkout "origin/develop"
git merge --no-ff "TinGoose/maxr-develop"

Step 4. Push the result of the merge to GitLab

git push origin "develop"

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines.

Assignee
Assign to
None
Milestone
None
Assign milestone
Time tracking
1
Labels
init
Assign labels
  • View project labels
Reference: maxr/maxr!17