Beholder Posted December 26, 2010 Share Posted December 26, 2010 I have no good skills to work with GIT. I didn't update my copy from master repository after post diffs. What should I do? Link to comment
lynx Posted December 26, 2010 Share Posted December 26, 2010 Do: git pull It will surely complain out loud, due to conflicts. You'll need to resolve those manually, so see this: http://www.kernel.org/pub/software/scm/git...solving-a-merge Link to comment
Beholder Posted December 27, 2010 Share Posted December 27, 2010 Foooh, it's done. diffs: http://pastebin.ca/2030887 Link to comment
lynx Posted December 27, 2010 Share Posted December 27, 2010 looking at the first three files: 1. does the order really matter? 2. looks redundant, that variable isn't modified 3. only noise (same for guipr) guirec was merged badly - the oldvoice stuff should remain. Did you change anything in here at all? You can discard all local changes to a file by calling: git checkout file Link to comment
Beholder Posted December 28, 2010 Share Posted December 28, 2010 Please keep GUIScripts from current GIT. Scripts merged with my previous changes and I think it works good. I'll test it soon and tell about results. Is source files correctly merged? I compiled these sources yesterday with no errors (with added -DHAVE_SNPRINTF cflag). Link to comment
lynx Posted December 28, 2010 Share Posted December 28, 2010 Ok (except for guiopt). The c++ side is all new, no problem there. Link to comment
Guest Guest Posted December 30, 2010 Share Posted December 30, 2010 I have Some Issues With The Dialogs, I cant see the "continue" Butten and cant continue in any other way when i dont have an options for answers Link to comment
Nugrud Posted January 2, 2011 Share Posted January 2, 2011 Baldur's Gate on Android - HTC Desire HD 4,3" Link to comment
Beholder Posted January 2, 2011 Share Posted January 2, 2011 Baldur's Gate on Android - HTC Desire HD 4,3" Hm, widescreen mod is not applied. Result - graphical artifacts in travel mode. Link to comment
lynx Posted January 2, 2011 Share Posted January 2, 2011 Oh boy, what a pain to watch/play. Link to comment
Beholder Posted January 2, 2011 Share Posted January 2, 2011 Oh boy, what a pain to watch/play. Just need some time to get used to control Quite playable, especially for fans. Link to comment
Nugrud Posted January 2, 2011 Share Posted January 2, 2011 Maybe you could expose widescreen mod more in android market to improve the experience of gemrb on android newbies. I haven't yet seen any movie from biggers fights. It has to be painfull on mobiles. Link to comment
Beholder Posted January 3, 2011 Share Posted January 3, 2011 Maybe you could expose widescreen mod more in android market to improve the experience of gemrb on android newbies. I haven't yet seen any movie from biggers fights. It has to be painfull on mobiles. Not possible, Market only for android apps. Accept suggestions for improving controls in Android version.. Link to comment
Nugrud Posted January 3, 2011 Share Posted January 3, 2011 I meant: You NEED original game resources to play (also don't forget to "install" your desired resolution to resources with widescreen mod before putting it to sdcard)! Put it to /sdcard/app-data/net.sourceforge.gemrb folder .Resources and widescreen mod are NOT INCLUDED. Link to comment
deepinthewoods Posted January 3, 2011 Share Posted January 3, 2011 Accept suggestions for improving controls in Android version.. Drag to scroll! At least on the main game screen. Menus and stuff it doesn't matter. Maybe use multitouch for selection boxes. It's pretty much the standard way to implement scrolling on touch-screen devices, so it would be really awesome if gemrb did this. Link to comment
Recommended Posts
Archived
This topic is now archived and is closed to further replies.