$12256 / $11500
Hi all,
I was pulling today and got this :-
:~/games/flare-game$ git pull origin master
remote: Counting objects: 354, done.
remote: Compressing objects: 100% (99/99), done.
remote: Total 273 (delta 195), reused 242 (delta 169)
Receiving objects: 100% (273/273), 108.21 KiB | 53.00 KiB/s, done.
Resolving deltas: 100% (195/195), completed with 62 local objects.
From https://github.com/clintbellanger/flare-game
* branch master -> FETCH_HEAD
e91152c..4eb0ac9 master -> origin/master
Updating e91152c..4eb0ac9
error: The following untracked working tree files would be overwritten by merge:
mods/default/cutscenes/credits.txt
mods/default/cutscenes/intro_example.txt
mods/default/engine/combat.txt
mods/default/engine/death_penalty.txt
mods/default/engine/elements.txt
mods/default/engine/font_colors.txt
mods/default/engine/font_settings.txt
mods/default/engine/gameplay.txt
mods/default/engine/languages.txt
mods/default/engine/misc.txt
mods/default/engine/resolutions.txt
mods/default/engine/tileset_config.txt
mods/default/engine/tooltips.txt
mods/default/fonts/LiberationSans-Regular.ttf
mods/default/images/logo/icon.png
mods/default/images/menus/buttons/button_default.png
mods/default/images/menus/buttons/button_x.png
mods/default/images/menus/buttons/checkbox_default.png
mods/default/images/menus/buttons/down.png
mods/default/images/menus/buttons/left.png
mods/default/images/menus/buttons/listbox_default.png
mods/default/images/menus/buttons/right.png
mods/default/images/menus/buttons/scrollbar_default.png
mods/default/images/menus/buttons/slider_default.png
mods/default/images/menus/buttons/up.png
mods/default/images/menus/config.png
mods/default/images/menus/confirm_bg.png
mods/default/images/menus/logo.png
mods/default/images/menus/tab_active.png
mods/default/images/menus/tab_inactive.png
mods/default/languages/engine.be.po
mods/default/languages/engine.cs.po
mods/default/languages/engine.de.po
mods/default/languages/engine.el.po
mods/default/languages/engine.en.po
mods/default/languages/engine.es.po
mods/default/languages/engine.fi.po
mods/default/languages/engine.fr.po
mods/default/languages/engine.gl.po
mods/default/languages/engine.it.po
mods/default/languages/engine.ja.po
mods/default/languages/engine.nb.po
mods/default/languages/engine.nl.po
mods/default/languages/engine.pl.po
mods/default/languages/engine.pot
mods/default/languages/engine.ru.po
mods/default/languages/engine.sk.po
mods/default/languages/engine.sv.po
mods/default/languages/engine.uk.po
mods/default/languages/engine.zh.po
mods/default/languages/readme.txt
mods/default/languages/xgettext.py
mods/default/menus/config.txt
mods/default/menus/fps.txt
mods/default/menus/gameload.txt
mods/default/menus/gamenew.txt
mods/default/menus/menus.txt
Please move or remove them before you can merge.
Aborting
Then removed the directory and pulled again :-
~/games/flare-game$ cd mods
~/games/flare-game/mods$ rm -rf default
~/games/flare-game/mods$ cd ../
~/games/flare-game$ git pull origin master
From https://github.com/clintbellanger/flare-game
* branch master -> FETCH_HEAD
Updating e91152c..4eb0ac9
Fast-forward
mods/alpha_demo/enemies/grisbon.txt | 7 +-
mods/alpha_demo/enemies/krakatoa.txt | 7 +-
mods/alpha_demo/enemies/miner.txt | 7 +-
mods/alpha_demo/enemies/necromancer_apprentice.txt | 7 +-
mods/alpha_demo/enemies/professor_langlier.txt | 7 +-
mods/alpha_demo/enemies/reanimated_skeleton.txt | 7 +-
mods/alpha_demo/enemies/rilrak.txt | 7 +-
mods/alpha_demo/enemies/scathelocke.txt | 7 +-
mods/alpha_demo/enemies/sir_evan_maddox.txt | 7 +-
mods/alpha_demo/enemies/skeletal_prophet.txt | 7 +-
mods/alpha_demo/enemies/skeletal_thundersword.txt | 7 +-
mods/alpha_demo/enemies/the_warden.txt | 9 +-
mods/alpha_demo/enemies/ukkonen.txt | 7 +-
mods/alpha_demo/enemies/vesuvvio.txt | 7 +-
mods/default/cutscenes/credits.txt | 20 ++
mods/default/cutscenes/intro_example.txt | 11 +
mods/default/engine/combat.txt | 5 +
mods/default/engine/death_penalty.txt | 18 ++
mods/default/engine/elements.txt | 5 +
mods/default/engine/font_colors.txt | 9 +
mods/default/engine/font_settings.txt | 8 +
mods/default/engine/gameplay.txt | 3 +
mods/default/engine/languages.txt | 20 ++
mods/default/engine/misc.txt | 7 +
mods/default/engine/resolutions.txt | 9 +
mods/default/engine/tileset_config.txt | 10 +
mods/default/engine/tooltips.txt | 7 +
mods/default/fonts/LiberationSans-Regular.ttf | Bin 0 -> 352308 bytes
mods/default/images/logo/icon.png | Bin 0 -> 1089 bytes
mods/default/images/menus/buttons/button_default.png | Bin 0 -> 295 bytes
mods/default/images/menus/buttons/button_x.png | Bin 0 -> 243 bytes
mods/default/images/menus/buttons/checkbox_default.png | Bin 0 -> 168 bytes
mods/default/images/menus/buttons/down.png | Bin 0 -> 229 bytes
mods/default/images/menus/buttons/left.png | Bin 0 -> 226 bytes
mods/default/images/menus/buttons/listbox_default.png | Bin 0 -> 146 bytes
mods/default/images/menus/buttons/right.png | Bin 0 -> 228 bytes
mods/default/images/menus/buttons/scrollbar_default.png | Bin 0 -> 218 bytes
mods/default/images/menus/buttons/slider_default.png | Bin 0 -> 212 bytes
mods/default/images/menus/buttons/up.png | Bin 0 -> 229 bytes
mods/default/images/menus/config.png | Bin 0 -> 206 bytes
mods/default/images/menus/confirm_bg.png | Bin 0 -> 108 bytes
mods/default/images/menus/logo.png | Bin 0 -> 5895 bytes
mods/default/images/menus/tab_active.png | Bin 0 -> 126 bytes
mods/default/images/menus/tab_inactive.png | Bin 0 -> 144 bytes
mods/default/languages/engine.be.po | 913 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.cs.po | 912 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.de.po | 1127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.el.po | 1018 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.en.po | 21 ++
mods/default/languages/engine.es.po | 924 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.fi.po | 917 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.fr.po | 968 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.gl.po | 1148 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.it.po | 1146 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.ja.po | 1120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.nb.po | 942 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.nl.po | 1147 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.pl.po | 920 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.pot | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.ru.po | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.sk.po | 1131 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.sv.po | 1161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.uk.po | 920 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/engine.zh.po | 960 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mods/default/languages/readme.txt | 27 ++
mods/default/languages/xgettext.py | 124 ++++++++
mods/default/menus/config.txt | 88 ++++++
mods/default/menus/fps.txt | 6 +
mods/default/menus/gameload.txt | 14 +
mods/default/menus/gamenew.txt | 15 +
mods/default/menus/menus.txt | 100 +++++++
mods/fantasycore/enemies/antlion.txt | 7 +-
mods/fantasycore/enemies/antlion_blinker.txt | 7 +-
mods/fantasycore/enemies/antlion_burster.txt | 7 +-
mods/fantasycore/enemies/antlion_freezer.txt | 7 +-
mods/fantasycore/enemies/antlion_hatchling.txt | 7 +-
mods/fantasycore/enemies/antlion_slasher.txt | 7 +-
mods/fantasycore/enemies/antlion_spitter.txt | 7 +-
mods/fantasycore/enemies/cursed_grave.txt | 5 +-
mods/fantasycore/enemies/goblin.txt | 7 +-
mods/fantasycore/enemies/goblin_charger.txt | 7 +-
mods/fantasycore/enemies/goblin_charger_elite.txt | 7 +-
mods/fantasycore/enemies/goblin_shaman.txt | 7 +-
mods/fantasycore/enemies/goblin_spearman.txt | 7 +-
mods/fantasycore/enemies/goblin_spearman_elite.txt | 9 +-
mods/fantasycore/enemies/minotaur.txt | 7 +-
mods/fantasycore/enemies/skeletal_archer.txt | 7 +-
mods/fantasycore/enemies/skeletal_knight.txt | 7 +-
mods/fantasycore/enemies/skeletal_mage.txt | 7 +-
mods/fantasycore/enemies/skeletal_occultist.txt | 7 +-
mods/fantasycore/enemies/skeletal_sniper.txt | 7 +-
mods/fantasycore/enemies/skeletal_warrior.txt | 7 +-
mods/fantasycore/enemies/skeleton.txt | 7 +-
mods/fantasycore/enemies/wyvern.txt | 7 +-
mods/fantasycore/enemies/wyvern_adult.txt | 7 +-
mods/fantasycore/enemies/zombie.txt | 7 +-
mods/fantasycore/enemies/zombie_bloodthirsty.txt | 7 +-
mods/fantasycore/enemies/zombie_brute.txt | 7 +-
mods/fantasycore/enemies/zombie_iceclaw.txt | 7 +-
mods/fantasycore/enemies/zombie_rotting.txt | 7 +-
mods/fantasycore/engine/combat_text.txt | 2 +-
mods/fantasycore/engine/loot.txt | 2 +-
mods/fantasycore/engine/stats.txt | 3 +-
mods/fantasycore/powers/powers.txt | 120 ++++----
mods/minicore/engine/loot.txt | 2 +-
105 files changed, 19927 insertions(+), 238 deletions(-)
create mode 100644 mods/default/cutscenes/credits.txt
create mode 100644 mods/default/cutscenes/intro_example.txt
create mode 100644 mods/default/engine/combat.txt
create mode 100644 mods/default/engine/death_penalty.txt
create mode 100644 mods/default/engine/elements.txt
create mode 100644 mods/default/engine/font_colors.txt
create mode 100644 mods/default/engine/font_settings.txt
create mode 100644 mods/default/engine/gameplay.txt
create mode 100644 mods/default/engine/languages.txt
create mode 100644 mods/default/engine/misc.txt
create mode 100644 mods/default/engine/resolutions.txt
create mode 100644 mods/default/engine/tileset_config.txt
create mode 100644 mods/default/engine/tooltips.txt
create mode 100644 mods/default/fonts/LiberationSans-Regular.ttf
create mode 100644 mods/default/images/logo/icon.png
create mode 100644 mods/default/images/menus/buttons/button_default.png
create mode 100644 mods/default/images/menus/buttons/button_x.png
create mode 100644 mods/default/images/menus/buttons/checkbox_default.png
create mode 100644 mods/default/images/menus/buttons/down.png
create mode 100644 mods/default/images/menus/buttons/left.png
create mode 100644 mods/default/images/menus/buttons/listbox_default.png
create mode 100644 mods/default/images/menus/buttons/right.png
create mode 100644 mods/default/images/menus/buttons/scrollbar_default.png
create mode 100644 mods/default/images/menus/buttons/slider_default.png
create mode 100644 mods/default/images/menus/buttons/up.png
create mode 100644 mods/default/images/menus/config.png
create mode 100644 mods/default/images/menus/confirm_bg.png
create mode 100644 mods/default/images/menus/logo.png
create mode 100644 mods/default/images/menus/tab_active.png
create mode 100644 mods/default/images/menus/tab_inactive.png
create mode 100644 mods/default/languages/engine.be.po
create mode 100644 mods/default/languages/engine.cs.po
create mode 100644 mods/default/languages/engine.de.po
create mode 100644 mods/default/languages/engine.el.po
create mode 100644 mods/default/languages/engine.en.po
create mode 100644 mods/default/languages/engine.es.po
create mode 100644 mods/default/languages/engine.fi.po
create mode 100644 mods/default/languages/engine.fr.po
create mode 100644 mods/default/languages/engine.gl.po
create mode 100644 mods/default/languages/engine.it.po
create mode 100644 mods/default/languages/engine.ja.po
create mode 100644 mods/default/languages/engine.nb.po
create mode 100644 mods/default/languages/engine.nl.po
create mode 100644 mods/default/languages/engine.pl.po
create mode 100644 mods/default/languages/engine.pot
create mode 100644 mods/default/languages/engine.ru.po
create mode 100644 mods/default/languages/engine.sk.po
create mode 100644 mods/default/languages/engine.sv.po
create mode 100644 mods/default/languages/engine.uk.po
create mode 100644 mods/default/languages/engine.zh.po
create mode 100755 mods/default/languages/readme.txt
create mode 100755 mods/default/languages/xgettext.py
create mode 100644 mods/default/menus/config.txt
create mode 100644 mods/default/menus/fps.txt
create mode 100644 mods/default/menus/gameload.txt
create mode 100644 mods/default/menus/gamenew.txt
create mode 100644 mods/default/menus/menus.txt
Saw the git log it says :-
~/games/flare-game$ git log
commit 4eb0ac9f33d032e0d31bff3b8b1ceb56608bb3e7
Merge: e91152c 967597c
Author: Clint Bellanger <clintbellanger@gmail.com>
Date: Thu Sep 26 14:47:35 2013 -0700
Merge pull request #325 from stefanbeller/floatingpointmovement
Floatingpointmovement
commit 967597c190663a9afedfdcbc24cf68190e9f32fb
Merge: d114879 e91152c
Author: Justin Jacobs <jajdorkster@gmail.com>
Date: Sat Sep 7 18:50:51 2013 -0400
Merge remote-tracking branch 'upstream/master' into fp_movement
Guessing that the default mod is no longer needed to be linked or copied from flare-engine ?
This website's content is licensed under a Creative Commons Attribution-ShareAlike 3.0 Unported License.
Exactly, the default mod was readded to the flare-game.
(fe1ae5434, 2013-06-13, Adding the default mod again.)
We did get 4 complaints and probably a lot of problems relating to the
default mod being treated special go unreported.
Hence let's readd the default mod to the game data.
Flare originally was trying to be simple. This may not be true any more
for some parts of the code (optimizing and error-handling contradict
being simple), but it should be simple for the users to play.
So sorry for your problem, but having the default added back makes less trouble (you're the first to come up with an issue for 3 month, having the default mod removed we had issues on a weekly basis if I remember correctly)
@ stefan, no trouble at all, just was asking to confirm if this was a case or not.
As far as the commit you have shared, just saw in the log. Just curious though why it didn't come in the git pull I had initiated some days ago after getting your git-bundle. No harm done anyways as now it's here :)