| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
I left them only where the contents is not indented, like in a namespace
or a template.
|
| |
|
|
|
|
|
| |
Via externs.h -> bitary.h, it was effectively included by everything anyway,
and this way simplifies include chains.
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
2 files are added to the root of the repository:
* AndroidAppSettings.cfg: settings file required for Android SDL port. Will
change on each minor release to reset configuration.
* AndroidBuild.sh: script called by the Android SDL port to commence building
the game itself
It might be nice to be able to move them elsewhere, but for now, their
presence here is required.
The build process is documented in docs/develop/android.txt
There's a TOUCH_UI compiler flag which sets all the things specific to a
touch screen interface.
There has been a large amount of changes in the Makefile for redefining where
the dat/, saves/, etc. directories go, because the "install" part of the make
isn't the final destination for these files under Android - the environment we
deploy to is a separate device from the build environment.
There is also a number of changes to the tiles interface. Some are specific
to the TOUCH_UI, but others are also changed in USE_TILE_LOCAL.
Touch only:
* 'a'bilities menu goes straight to menu without prompting first
* tap menu header to toggle/submit
* menu instead of prompt to select which corpse to butcher
* same for eating food from the floor (those 2 could go in local tiles too)
* show_more defaults to false and less --more-- messages
* pickup mode defaults to menu
* defaults for tile_layout_priority is different (commands are more
important than inventory)
* popup for yes/no prompts, level-up stat gain and swapping rings (should
be used for all prompts, and probably local tiles too)
* spell casting: force selection menu
* map mode: left-click rather than right-click for mouse mode; autotravel on
left-click removed
* remove skills training and memorisation panels
Also local tiles (some could also be integrated in webtiles):
* commands below description are clickable
* clickable shopping menu (uses PrecisionMenu)
* split the command panel in 2 (common actions and system commands)
* add a map command panel
* tapping or left-clicking the player is smarter:
* picks up the item if there's one on the tile, otherwise
* shows pick-up menu if there's several items on the tile, otherwise
* traverses stairs (or enters a portal or shop) if one is present, otherwise
* prays if an altar is present, otherwise
* waits one turn
* right-clicking the map enters map mode and brings the map commands tab to
the front; map mode stays until exited rather than upon release of mouse
Some more details can be found in android_patch_notes.txt on #5677 (although
some TODOs are already obsolete).
Signed-off-by: Raphael Langella <raphael.langella@gmail.com>
|
| |
|
|\
| |
| |
| |
| |
| | |
It lacks an actual font yet, but I realized we need to check if drivers
people use actually support sub-textures -- and if not, there'll be some
rethinking needed.
|
| | |
|
| | |
|
|/ |
|
| |
|
|\ |
|
| |
| |
| |
| |
| |
| | |
Conflicts:
crawl-ref/source/startup.cc
|
|/
|
|
|
| |
On some STL structures size() is slow. I did not bother limitting sed,
so innocent bystanders got pulled into the machine, but there's no loss.
|
| |
|
|
|
|
| |
(and OpenGLES doesn't have ordinary glOrtho(), just -f and -x)
|
| |
|
|
|
|
|
|
|
| |
Remove any non-const-reference parameters. Change const pointer
parameters to const reference parameters. Change all draw(NULL, NULL)
calls to just draw(). Also, refactor to remove pretranslate and prescale
parameters from draw calls.
|
| |
|
|
|
|
|
|
| |
Storing member variable pointers to data, even const ones, is sketchy.
Better to depend on compiler optimizations to eliminate redundant
variable copies.
|
| |
|
|
|
|
|
| |
This simplifies code that was setting and unsetting the global current
colour manually.
|
|
|
|
|
| |
This avoids weird global state setting and then querying in the next
function.
|
| |
|
| |
|
| |
|
|
|
|
| |
Applying standards, simplifying code, removing redundant comments.
|
|
|
|
|
| |
It's not really used anywhere at this point, and it's better to call
clear explicitly when the draw buffer needs to be refilled.
|
|
|
|
|
|
| |
This will force all drawing to be done through VertBuffer.
Signed-off-by: Enne Walker <enne.walker@gmail.com>
|
|
|
|
|
|
|
|
|
| |
Added convenience methods to GLState. Changed GLStateManager to check
current state before using glEnable in case those commands are slow, as
they are being called nearly ever draw. (Note: GLShapeBuffer is not
currently used.)
Signed-off-by: Enne Walker <enne.walker@gmail.com>
|
|
|
|
|
|
|
| |
glwrapper-ogl.cc, windowmanager-sdl.cc, and fontwrapper-ft.cc now contain
the static functions for their parent class's factory create. This
allows new implementations to be added without requiring modification of
the generic file (with #ifdefs).
|
|
|
|
|
|
| |
No spaces on parens. Line up function params. Sort includes more
rationally. Put curly braces on their own line. Don't C-style typedef
enum and structs. Put if-clauses on their own line.
|
| |
|
| |
|
| |
|
|
The makefile should now name the .o's based on what libraries you're using, as
well.
|