Sirver, can you take a look at text_layout.h? I defined it as a read-only
interface, along with an implementation that allows adding nodes info. I am not
sure how/where to define that implementation. It is only used in the
fonthandler(which downcast and reset it) and rt_render.
Also, I
I merged your branch and updated textarea, editbox and multilineeditbox, with
various fixes.
--
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/fh1.
I will try to tidy the patch.
As we should first converge the API in graphics/ and text_layout.h, maybe you
should have a look there in the first place. From what I see, your text_layout
looks more appealing. I think we should merge yours into this one and update
text_layout and text_area.
Yep
Ill push my code as soons as I have this last bug gone with the editbox.
On Mon, Jul 21, 2014 at 6:53 AM, SirVer sir...@gmx.de wrote:
Cool. I am working on getting rid of the old font renderer too in
https://code.launchpad.net/~widelands-dev/widelands/text_area_richtext .
Maybe we can
This is what i get after merging trunk.
I made a test ui you can launch with ./widelands --testui
There are still some layout issues I need to fix.
--
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228
Your team Widelands Developers is subscribed to branch
Concerning the widgets, there are 2 minor issues left : Consecutive line breaks
and RTL auto-wrapping.
Other than that, all use new font renderer and (multiline) editboxes work great.
Sirver, I will try to check the changes in your branch.
--
Im working on the fh1 branch, but I will have a look into that afterwards.
On Sun, Jul 20, 2014 at 9:56 PM, SirVer sir...@gmx.de wrote:
This change would still be awesome to have in Widelands. Charly, you are
not by any chance taking things on again soon?
--
No rush - I wont have much time neither before release. And while not using
the rich text syntax explicitly, i have the feeling the scenario texts will
need to be reworked as well because the lua formatting interface does not
abstract completely the old renderer.
--
I completely agree with using composition over inheritance. However, the
inheritance you pointed here were not completely related to the log_message
thing and it requires more refactoring than expected to change them.
So I think I will open a bug report so that I won't forget to check that
I agree with the solution of linking fonts to locales. Things will be simplier.
We could therefore remove the face attribute of the font tag, and indeed
introduce new ones such as condensed, sherif and so on.
Apart for that point, the c++ code is almost completely using the new renderer
cghislai has proposed merging lp:~widelands-dev/widelands/bug1212191_bug1212192
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1212191 in widelands: 100% training site production without any soldier
https://bugs.launchpad.net/widelands/+bug
Maybe it would be good to add a rt text-style=sans / serif in the long term
and make sans and serif selectable?
Yes, why not. However, as I understood from reading some bug reports, custom
font support were implemented so that users using exotic locales could find a
font that render text
The change should work fine with build17 savegames. However, if you have
savegames from former trunk, with the descr pointer, it will fail.
--
https://code.launchpad.net/~widelands-dev/widelands/formerbuildings_index/+merge/179570
Your team Widelands Developers is subscribed to branch
Wait I'm speaking too fast - as only string are stored in savegames it should
work fine
--
https://code.launchpad.net/~widelands-dev/widelands/formerbuildings_index/+merge/179570
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/formerbuildings_index.
You don't have to review the whole thing now. At the very best I would
appreciate knowing if I am in the wrong before putting much time in it.
The important files are new interfaces (storage.h garrison.h) and how they are
used (militarysite.cc warehouse.cc)
--
cghislai has proposed merging lp:~widelands-dev/widelands/fix-bug-1208130 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1208130 in widelands: Spectators can click Prefer rookies/heros
buttons in military buildings
https://bugs.launchpad.net
I tried a caret tag renderer. It works fine except it seems there is a 1-pixel
space inserted between two text nodes, even if the caret has zero-size. So I'm
not quite sure it is the best option.
I still have other options to try, like removing the tag and continuing parsing
the text while
I fixed this along with some warnings. Sorry i forgot to add the files
--
https://code.launchpad.net/~widelands-dev/widelands/game_end_summary/+merge/176000
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/game_end_summary.
cghislai has proposed merging lp:~widelands-dev/widelands/message_expired into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1207477 in widelands: Assertion `it != end()' failed in message queue
https://bugs.launchpad.net/widelands/+bug/1207477
Yes I think this is it. For small changes, like here, I once tried to push them
in a branch, then revert locally to trunk, and commit locally other changes
that would be pushed elsewhere. So I didn't have to recompile the whole
codebase to test them.
Weird stuff happened, I will avoid working
cghislai has proposed merging lp:~widelands-dev/widelands/wareslist_sizes into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1205609 in widelands: Wincondition scripts reloaded too often
https://bugs.launchpad.net/widelands/+bug/1205609
Bug
The proposal to merge lp:~widelands-dev/widelands/wareslist_sizes into
lp:widelands has been updated.
Status: Needs review = Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/wareslist_sizes/+merge/178257
--
cghislai has proposed merging lp:~widelands-dev/widelands/wareslist_sizes into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1205609 in widelands: Wincondition scripts reloaded too often
https://bugs.launchpad.net/widelands/+bug/1205609
Bug
I revert the renaming interactiveplayer-mapview. I did it because I thought it
would make more sense, and I didn't even notice i misspelled 'packet'. And now
that I think of it, interactive_player makes more sense. Unfortunately, the
diff doesn't show the content differences. The only thing
How am i expected to launch the test suite? I don't find any __main__ method
anywhere...
--
https://code.launchpad.net/~widelands-dev/widelands/regression_testing/+merge/178000
Your team Widelands Developers is requested to review the proposed merge of
cghislai has proposed merging lp:~widelands-dev/widelands/replay_fix into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1206211 in widelands: Follow function in watch window crashes in
replays or when playing as a spectator
https
The proposal to merge lp:~widelands-dev/widelands/replay_fix into lp:widelands
has been updated.
Status: Needs review = Rejected
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/replay_fix/+merge/178109
--
I rejected this and will merge it into the log_message branch as changes
conflict with each other
--
https://code.launchpad.net/~widelands-dev/widelands/replay_fix/+merge/178109
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/replay_fix
So I've added some code dealing with autosaving , the watch window and replays.
Sorry for that, but I felt like rewriting the same things over and over.
The additional changes:
- Add a multiplayer field and getter in interactive gamebase
- Make Panel::die virtual and overwrite in Window to close
Currently I use that method, rendering a test string to know the font height.
I'm coming to the multiline edit box, and I was thinking, should the
wordwarpper be kept around? It is currently only used in the multiline textarea
and the multiline edit box. For the multiline textarea, i think the
I just resolved them
--
https://code.launchpad.net/~widelands-dev/widelands/bug1205010/+merge/177137
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug1205010.
___
Mailing list: https://launchpad.net/~widelands-dev
The proposal to merge lp:~widelands-dev/widelands/fh1 into lp:widelands has
been updated.
Status: Needs review = Approved
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228
--
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228
The proposal to merge lp:~widelands-dev/widelands/fh1 into lp:widelands has
been updated.
Status: Approved = Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/fh1/+merge/177228
--
cghislai has proposed merging lp:~widelands-dev/widelands/log_messages into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1206441 in widelands: Autosave leads to crash on replays
https://bugs.launchpad.net/widelands/+bug/1206441
For more details
cghislai has proposed merging lp:~widelands-dev/widelands/bug1206563 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1206563 in widelands: Error when loading savegame saved in replay
https://bugs.launchpad.net/widelands/+bug/1206563
For more
cghislai has proposed merging lp:~widelands-dev/widelands/ship_progress into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1194194 in widelands: Show build progress of the current ship
https://bugs.launchpad.net/widelands/+bug/1194194
For more
cghislai has proposed merging lp:~widelands-dev/widelands/compass into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #902558 in widelands: Workers returning to a building being dismantled
will attempt to enter it
https://bugs.launchpad.net
The proposal to merge lp:~widelands-dev/widelands/compass into lp:widelands has
been updated.
Description changed to:
These few fixes help a little bit workers to find their way correctly.
- Builder will correctly return to base flag after dismantling
- Workers will correctly return to baseflag
I figured it out - by saving the file_index given by the map object saver,
objects serial are loaded correctly through the map object loader. Works great
:)
--
https://code.launchpad.net/~widelands-dev/widelands/bug1186906/+merge/177204
Your team Widelands Developers is requested to review the
cghislai has proposed merging
lp:~widelands-dev/widelands/lua_mapview_persistence into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1203329 in widelands: Possible to trigger a crash by saving between
story dialogs
https://bugs.launchpad.net
Indeed a proper test suite would be nice. and each bug fixed should have, if
possible, a test written to check for regression.
But as you said some handler function would be required. I may try to implement
that, but Im don't think that should be ready for b18. Maybe we could open a
blueprint
cghislai has proposed merging lp:~widelands-dev/widelands/bug1205010 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1205010 in widelands: segfault on dismantle enemy building
https://bugs.launchpad.net/widelands/+bug/1205010
For more details
I went for an enum for the result (won/lost/resigned).
I also changed the report_result function to only take 3 arguments : player,
result, and the info string.
I added some comment to show allowed values for that string, and parsed some of
them in the game_summary screen.
--
cghislai has proposed merging lp:~widelands-dev/widelands/bug1186906 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1186906 in widelands: Remove entries from the message list that have
become obsolete
https://bugs.launchpad.net/widelands/+bug
I also thought about removing the position field, since we could get the
position through the object serial, but then i thought it might be useful to
know to which building - even if now destroyed - archived messages were linked.
--
And I realized that - as i feared - the serial are re-attributed during
loading. So, is there a way to handle this or shouldn't the serial field be
saved?
imo it doesn't matter much if they are not saved. Maybe we should go through
all messages once more before saving.
--
cghislai has proposed merging lp:~widelands-dev/widelands/fh1 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #577888 in widelands: Layouting large amount of rich text is slow
https://bugs.launchpad.net/widelands/+bug/577888
For more details
cghislai has proposed merging lp:~widelands-dev/widelands/fishing into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1094711 in widelands: Fisher runs out of fish even with double breeders
https://bugs.launchpad.net/widelands/+bug/1094711
Bug
I created a playersmanager class and moved all player handling code in there.
As there are many code making use of the functions of editor_gamebase, i simply
delegated the work for now.
I left a few comments
--
https://code.launchpad.net/~widelands-dev/widelands/game_end_summary/+merge/176000
cghislai has proposed merging lp:~widelands-dev/widelands/minimap into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #846409 in widelands: Improving the load game dialog
https://bugs.launchpad.net/widelands/+bug/846409
Bug #1202146 in widelands
Review: Approve
Looks good and works great. I also like those new icons.
Should there be such option for training sites as well, so we can choose to
train rookies or heroes ? I have no idea if the underlying logic could allow
this
--
Yes, you can still fetch the branch as I only committed locally for now
--
https://code.launchpad.net/~widelands-dev/widelands/game_end_summary/+merge/176000
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/game_end_summary into
cghislai has proposed merging lp:~widelands-dev/widelands/game_end_summary into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #576347 in widelands: show game results screen
https://bugs.launchpad.net/widelands/+bug/576347
For more details, see
cghislai has proposed merging lp:~widelands-dev/widelands/bug1204199 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1204199 in widelands: Buildings and building statistics have different
color groups for productivity
https
The proposal to merge lp:~widelands-dev/widelands/bug1204199 into lp:widelands
has been updated.
Description changed to:
Change the progress bar to switch from red to yellow at 33% and to green at
67%. Also change the limit to consider a building unproductive to 33% in the
BUildingStatistics
cghislai has proposed merging lp:~widelands-dev/widelands/bug1204144 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1204144 in widelands: Cursor Key Navigation in table not complete
https://bugs.launchpad.net/widelands/+bug/1204144
For more
Concerning the new class, I was thinking of a playersmanager that could,
eventually, handle all player related stuff. Currently, a lot is done in
editor_gamebase. Should I go toward that or only handle the end status?
--
cghislai has proposed merging lp:~widelands-dev/widelands/bug1203337 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1203337 in widelands: Map name appears untranslated in save dialog,
even when translation exists
https://bugs.launchpad.net
cghislai has proposed merging lp:~widelands-dev/widelands/bug1204171 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1204171 in widelands: Can't select ware in ware statistics window
https://bugs.launchpad.net/widelands/+bug/1204171
For more
Looks good to me. The only window not entirely fitting is the ware statistics
menu.
--
https://code.launchpad.net/~widelands-dev/widelands/normalize_requirements/+merge/176062
Your team Widelands Developers is requested to review the proposed merge of
should be fine now
--
https://code.launchpad.net/~widelands-dev/widelands/bug1201398/+merge/176043
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug1201398.
___
Mailing list: https://launchpad.net/~widelands-dev
cghislai has proposed merging lp:~widelands-dev/widelands/game_end_summary into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/game_end_summary/+merge/176000
So I have the game end screen
Looks fine also using opengl now.
--
https://code.launchpad.net/~widelands-dev/widelands/bug657285/+merge/175551
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug657285.
___
Mailing list:
I loaclly merged the bug657285 branch in order to test this under opengl
without crashing.
Everything works as intended.
--
https://code.launchpad.net/~widelands-dev/widelands/csite_improvement/+merge/174623
Your team Widelands Developers is subscribed to branch
cghislai has proposed merging lp:~widelands-dev/widelands/bug657285 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug657285/+merge/175551
I corrected the bug by handling mousein events
I add I feel sorry for all regressions linked to my code. I will fixes them all
asap. Those linked to opengl rendering may be tricky.
--
https://code.launchpad.net/~widelands-dev/widelands/bug657285/+merge/175551
Your team Widelands Developers is requested to review the proposed merge of
cghislai has proposed merging lp:~widelands-dev/widelands/boost_static_assert
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/boost_static_assert/+merge/175607
This get rid
Indeed, I missed that. I noticed however than even with this fix the table is
not updating in current trunk. I will push a new branch with the complete fix.
--
https://code.launchpad.net/~hjd/widelands/prodsite-null/+merge/175538
Your team Widelands Developers is requested to review the proposed
cghislai has proposed merging lp:~widelands-dev/widelands/workers_table into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/workers_table/+merge/175635
Fix the workers table.
Besides the fix
Yes i fetched that already for testing. I started to compile but I leave now, i
will test in a few hours.
--
https://code.launchpad.net/~widelands-dev/widelands/boost_static_assert/+merge/175607
Your team Widelands Developers is requested to review the proposed merge of
Indeed it compiled fine on my linux gcc 4.8.1. And without a warning (well, 1).
If this is merged my branch about BOOST_STATIC_ASSERT could be dropped.
I think widelands has always been a stable product - please allow me to
reiterate my apologies concerning the ui_improvement fixes that
Review: Approve
You are right, I was quite in a hurry to correct those bugs and the solutions I
proposed here weren't by far the optimal ones.
I saw that escaping characters were supported. I first went for that then
for some reason thought it would be best to handle that at the source
Review: Abstain
--
https://code.launchpad.net/~widelands-dev/widelands/bug657285/+merge/175551
Your team Widelands Developers is subscribed to branch
lp:~widelands-dev/widelands/bug657285.
___
Mailing list: https://launchpad.net/~widelands-dev
Post
Ah yeah you are right. I prefer it this way as well because it is easier to
revert back to the and condition if needed
--
https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639
Your team Widelands Developers is requested to review the proposed merge of
at r6566, I can play normally.
I get errors when graphics are reset after a game:
segfault at free(colormap); in Colormap destructor
invalid pointer at delete texutre in Graphic::cleanup()
--
https://code.launchpad.net/~widelands-dev/widelands/graphic_resetting/+merge/159985
Your team Widelands
Also it seems graphics are restted far too often. Once on game start, then once
each time mainmenu is displayed, then once on game loading, at least.
--
https://code.launchpad.net/~widelands-dev/widelands/graphic_resetting/+merge/159985
Your team Widelands Developers is subscribed to branch
cghislai has proposed merging lp:~widelands-dev/widelands/bug1201398 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1201398 in widelands: Save game claims win condition is Scenario, even
when it isn't
https://bugs.launchpad.net/widelands/+bug
The proposal to merge lp:~widelands-dev/widelands/bug1201398 into lp:widelands
has been updated.
Description changed to:
This corrects a few things with my previous save dialog changes.
Thanks hjd for pointing it out, there was a few other issues.
A new field in game has been created to
I knew it would be spotted :)
sed is not smarted than its user... ill fix that
--
https://code.launchpad.net/~widelands-dev/widelands/bug988870/+merge/174639
Your team Widelands Developers is requested to review the proposed merge of
lp:~widelands-dev/widelands/bug988870 into lp:widelands.
Ah, you merged already
I am pretty sure that it IS equal, but anyway in the last commit I put a when
condition, as its more readable.
The best imho would be to put the 3 lines separatelty and only and complex
conditions if it is really needed.
--
I'm a bit lost in the lua tests. It appears I cannot make it run even with
trunk code :
could not load test/lua/persistence.wmf
Could you check it? I will try to make a save-in-corountine test afterwards.
I refactored m_allow_autosaving to m_allow_saving, because i guess we have to
prevent
The proposal to merge lp:~widelands-dev/widelands/csite_improvement into
lp:widelands has been updated.
Status: Needs review = Work in progress
For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/csite_improvement/+merge/174623
--
Review: Approve
Yep looks good to me.
And sorry for the braquets includes, i will double check next commits
--
https://code.launchpad.net/~widelands-dev/widelands/save_dialog_improvements/+merge/174566
Your team Widelands Developers is subscribed to branch
The proposal to merge lp:~widelands-dev/widelands/csite_improvement into
lp:widelands has been updated.
Description changed to:
This contains a bunch of improvements not all related to construction sites
- Colored string for production efficiency and trends
- Anchored selection for ware
cghislai has proposed merging lp:~widelands-dev/widelands/bug988870 into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #988870 in widelands: Barbarian weaving mill produces endless cloth
https://bugs.launchpad.net/widelands/+bug/988870
For more
cghislai has proposed merging lp:~widelands-dev/widelands/csite_improvement
into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #580905 in widelands: write building status in a different font color
for construction sites
https://bugs.launchpad.net
cghislai has proposed merging
lp:~widelands-dev/widelands/autosave_on_objectives into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #536507 in widelands: Autosave after reaching objective
https://bugs.launchpad.net/widelands/+bug/536507
For more
cghislai has proposed merging
lp:~widelands-dev/widelands/save_dialog_improvements into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #706284 in widelands: Default save file name is always the first in list
https://bugs.launchpad.net/widelands/+bug
I get an invalid pointer when trying to free colormap (Colormap::~Colormap at
line 66)
This happens when i change to opengl rendering after having played with
non-opengl graphics
Additionally, i get a crash at GLSurfaceTexture::setup_gl(), line 280. This
happens when using opengl and buildings
cghislai has proposed merging lp:~widelands-dev/widelands/get_defeated_fix into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1198624 in widelands: A player should be considered defeated in
Autocrat after losing all warehouses, rather than all
90 matches
Mail list logo
