New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bring Luomu's game msg log over from the SSP fork. #2527
Conversation
I'm not against this is principle (haven't looked at the code or tested yet), but I am wary of doing anything with the old UI since its all going to be replaced. Though I know its taking a while and this doesn't touch much, so it might be ok. What do you think? Can you split this out into separate logical commits? Or even pick @Luomu's original commits? |
The IFF bits are literally just their definitions in |
Apart from getting the font from the UI context, I don't see any use of the new UI. I do see direct calls into the text renderer. I also see calls into the renderer to change depth attributes etc. I'm not saying they're unnecessary, but because there's no related commit message I can't tell what they're actually for. And there's also build changes, they don't belong in the same commit. |
I guess I've got half an hour right now, I'll see what I can do with this over breakfast. |
Build changes? Ah of course, I didn't do the makefiles! Want me to fixup the makefiles before bed whilst you enjoy breakfast :) |
Build files are MSVC project file updates too. I don't expect you to do the Makefiles, that's my problem. But having MSVC project changes in the same commit as the code sucks. |
Really, one won't work without the other though? Well, I suppose I could have added the files, modified the project, then done the hookup in 3 separate commits. |
Don't worry about it. I think I'm overreacting a bit because its everything in one commit and can't see what relates to what else. Back to the original question. Is it worth doing this now? I'm inclined to think its harmless enough, though I expect most of it will be ripped out when WorldView is moved to the new UI. |
Worth it? Hmm, well I was reminded of it and the other changes the other day when I found myself wanting to bite through my keyboard in frustration at the dribble of messages dropping me out of time-accel every few seconds. Yeah, it's a nice change, it looks much nicer, and it'll be cleaner to rewrite when the time comes - and until the time comes, it'll also suck less than the current system :) |
Oh and i'll try to make the other commits cleaner / more-staged anyway :) |
I tend to agree with that. Ok :) (must do more work on the station screens on the train ride in today) |
Linux build fixes on I'm going to try some different positions and font sizes, but that's not a big deal. All but the bottom line are being clipped when the station screen is showing. It also probably isn't going to play nice when the info screens are up. My plan once everything is on new-ui was to have something like this in the worldview only, and reporting from the other screens (buy/sell failures etc) done in UI dialogs or other elements. I'm not saying we should do that now, but it'd be nice if new additions didn't make things worse in the interim. I'm not sure what to do here. I really want to like this one! |
I could maybe move the render order so that it's done after the GUI, then it'd draw over the top on the station and other screens. |
…nto LuomuMsgLog
Conflicts: src/StationShipViewForm.cpp win32/vc2010/pioneer.vcxproj.filters win32/vc2012/pioneer.vcxproj.filters win32/vc2013Express/pioneer.vcxproj.filters
re-merged, resolved conflicts etc. |
…nto LuomuMsgLog Conflicts: src/LuaChatForm.cpp src/Makefile.am src/MarketAgent.cpp src/Player.cpp src/SpaceStation.cpp src/StationCommodityMarketForm.cpp src/StationPoliceForm.cpp src/StationShipEquipmentForm.cpp src/StationShipRepairForm.cpp src/StationShipViewForm.cpp win32/vc2012/pioneer.vcxproj win32/vc2013Express/pioneer.vcxproj
Took a little bit of kicking to get this working again since there's 2 months of changes. It's not the best system, but it's better than our existing one so I still think that it's worth having until such time as we get a new one which works the way it should. |
I'm testing this. This is one of the essential things that should be first on the list. If we want the work of game-tester less frustrating. Task Less frustrating = more game testers Only two problems, until now. The font size is very small. I tried FONT_SMALLEST = FONT_NORMAL (in Widget.h), and work well. I guess there are better way to do this. The other problem is that the text of Tombstone disappeared. |
I've got my own version of this coming down the pipes right now. It's a perfect feature for getting the new UI into the worldview and experimenting with layouts and such. It should be good to go in a couple of days. |
ok cool, I'll close this then :) |
…nto LuomuMsgLog Conflicts: src/Makefile.am src/Pi.cpp src/Pi.h src/SectorView.cpp src/Ship.cpp src/ShipCpanel.cpp src/ShipCpanelMultiFuncDisplays.cpp src/WorldView.cpp win32/vc2010/pioneer.vcxproj win32/vc2010/pioneer.vcxproj.filters win32/vc2012/pioneer.vcxproj win32/vc2012/pioneer.vcxproj.filters win32/vc2013Express/pioneer.vcxproj win32/vc2013Express/pioneer.vcxproj.filters
State ticket, setting a render state and a couple of places that added new messages.
This might be controversial but since nothing else ever came along to replace this I've updated it to latest master ( |
@robn PING! ;) |
|
Is that Linux or Windows? I built it last night using vs2013 but I had to guess at the Linux makefile as I don't have a machine to test it on at the moment. |
Ok it was missing a cpp file, I think I've added it back in correctly but cannot test. |
👍 People: protest now, or forever hold your peace. |
Abstaining from the vote. I think it's wrong to put effort into maintaining an old-UI system, and time would be better spent finishing the new comms panel. But if I'm not willing or able to do something right now then there's certainly no way I'd insist someone else do it. |
👍 |
Not hearing any protests :) |
How quick the new UI would come? If very soon, then by all means, abandon it. |
Mergey mergy merged |
Bring Luomu's game msg log over from the SSP fork.
|
So only the two strings beloning to StationRefuelling.lua has the extra ":". Strange. |
no "extra", lack station name (Moscow: Welcome aboard Moscow. Your...) Line 35 in a719b3b
|
Open a new issue don't comment on closed pull requests because they might not get seen. |
Description:
@Luomu wrote a much nicer msg logging service that doesn't interrupt the scanner, can display multiple messages and does a nice slow fade out. Since he's busy with real life and a house without stairs he's given me permission to bring it over.
Notes:
You might notice some stuff in the
Colors.h
etc files mentioning IFF, don't worry about this for now it was just easier to leave it in with this commit than pick it out only to add it in subsequent commits that I'm in the process of preparing.Big thanks should go to @Luomu for this, not me, I'm just copying n' pasting ;)