immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,791 Commits
19 Branches
15 Tags
59 MiB
Commit Graph

6 Commits (colobot2)

Author SHA1 Message Date
Tomasz Kapuściński daa9419557 Merge branch 'dev' into dev-graphics-overhaul 
# Conflicts:
#	src/level/player_profile.cpp
#	src/object/task/taskgoto.cpp
#	src/object/task/taskgoto.h
#	src/ui/mainui.cpp
 2022-04-23 11:48:09 +02:00
Tad Hardesty 8fb0f76f6f Use https URLs for git submodules 2022-04-08 19:22:39 -07:00
Tomasz Kapuściński 628567701a Added nlohmann json as submodule 2022-02-26 21:12:40 +01:00
MrSimbax 38b9b9be4c Update data, gtest and add options to .gitmodules 
Update the `data` and `lib/googletest` submodules.

`git submodule update --remote` command should now
update the data submodule by rebasing on the remote branch named
the same as the current branch.

Changes in the `lib/googletest` submodule should now be ignored
in `git status`.
 2021-12-08 19:15:16 +01:00
MrSimbax 3da26a38ed Replace Google Test with a submodule 2020-07-11 10:54:52 +02:00
Piotr Dziwinski 3559100db9 Added colobot-data as git submodule 2012-12-19 21:25:40 +01:00