57 Commits

Author SHA1 Message Date
hiker
8d07d26c25 Updated (c) year to include 2015. 2015-03-30 11:42:50 +11:00
Marianne Gagnon
84821ad604 Add focus callback to GUI engine 2015-01-15 20:18:31 -05:00
hiker
aa64f31f83 Added Screen::push() function to shorten the calls to pushScreen(). 2014-09-23 16:43:50 +10:00
Vincent Lejeune
bd7babe11f Rename cpp2011.h 2014-07-29 00:35:43 +02:00
Marianne Gagnon
0057e40e6d Work on cutscene+menu combination. Fix bugs in GPWin cutscene, make them easier to work with in general 2014-06-01 21:03:48 -04:00
hiker
5474b5528f Removed unnecessary parameter from onUpdate calls. 2014-01-22 07:43:17 +11:00
hikerstk
bced8cdb9f Merged with trunk, part 1 (due to previous failures I am splitting this
patch).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@14605 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-12-02 04:27:55 +00:00
hilnius
ea2b52a663 merging hilnius's branch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-07-31 18:03:11 +00:00
unitraxx
a6b492129e [_GSoC Uni_] 'Screen' has now a callback 'onDialogClose' which gets called by 'ModalDialog' after being dismissed. (Also removed a debug line in RibbonWidget)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/uni@13048 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-06-30 22:16:29 +00:00
curaga
57c3cbae3e Space cleanup pass on the headers
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@12817 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2013-05-30 19:47:39 +00:00
auria
8111440317 Make ipo animations always enabled. + start of work to have music on the challenge completed screen but doesn't appear to work yet
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11801 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-10-28 22:54:40 +00:00
wardje
f6689f382c Some coding style changes (mostly comments)
Sorry for the big recompile because of it, had some of these
after some experimenting and it was clouding my svn diff.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11443 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-07-26 21:24:15 +00:00
auria
dd487346aa Introduce (in a totally optional way) the C++2011 feature to explicitely mark overrides. This bit us quite a few times in the past, so if we start using this more then those with GCC 4.7 will at least catch the errors when they happen :)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@11231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-05-14 00:04:26 +00:00
hikerstk
351f766ca4 Made KArtProperties member of STKConfig a pointer,
which removes the dependency of kart_properties.hpp
from stk_config.hpp, hopefully reducing the compile
time when kart_properties.hpp is changed. Had to
add many missing includes all over the place as a
result :)


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@10683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2012-01-16 05:59:51 +00:00
auria
a8dfd29f65 improve a lot leaks of CGUIEditBox objects
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9990 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-10-16 00:00:57 +00:00
auria
07afe4c87b Fix quite a few leaks in the GUI engine, and introduce my quick leak-detection macros in dbeug mode (with Joerg's approval)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9885 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-09-22 18:08:04 +00:00
auria
a031bd5731 Display a message when clicking on the add-ons icon and it is not enabled
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@9394 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-07-31 01:20:41 +00:00
auria
30435bbde4 Highlight gamepad when pressing its keys, to help the player tell them apart
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8683 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-23 20:51:17 +00:00
auria
d501753ef2 Clean up irrlicht includes; avoiding including the huge irrlicht.h when we only need one specific class, especially in header files; use forwards when possible
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8660 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-22 18:03:28 +00:00
auria
15cdaf04bd For ticket #82 : start adding the infrastructure to show in the UI which gamepad is which
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8566 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-05-14 00:30:30 +00:00
auria
719e9c3622 Oops, in Doxygen the tag for preconditions is \pre
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8311 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-04-12 20:42:57 +00:00
auria
7cf08bf3e6 Update the screen loading code to support loading unicode XML files
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@8120 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-03-30 15:50:25 +00:00
hikerstk
4d8b8e5dea Renamed ptr_vector to PtrVector so that is follows
our naming convention, also changed contentsVector
to m_contents_vector, and removed unused add method
(which is using an iterator, which would not work
when using aligned_arrays on windows anyway).


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7602 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2011-02-03 22:20:53 +00:00
auria
03c6245e21 Added more copyright statements
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@7032 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-12-15 22:59:55 +00:00
auria
a22c395f1f Fixed silly typo in Screen docs + shorten lines a bit while at it
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@6098 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-21 00:38:21 +00:00
auria
963516e2fb Removed/fixed bogus/unneeded includes or forwards
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5952 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-09-10 00:05:56 +00:00
auria
8df52854fe Added way for GUI screens to receive all player actions
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5779 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-26 00:08:10 +00:00
auria
4e48bbd66b Extracted the new common base for Screen and ModalDialog out of the temporary location where it was put in previous commit
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5747 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:46:17 +00:00
auria
021dea1829 Reconciliated Screen and ModalDialog by extracting their common funcitonality into a common base class
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5746 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-16 00:39:53 +00:00
auria
975451c7ec Dialogs may now be specified in XML files. Ported the 'press a key' dialog to a XML file as a test and example
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5739 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 22:12:58 +00:00
auria
b1f7012cbd Moved layout code out of Widget and Screen classes; not only is it cleaner this way, it also paves the way for eventually making Dialog classes also use the XML layout code
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5737 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 20:24:51 +00:00
hikerstk
e034082a2b 1) Moved calls to World::(un)pause from state_manager into
the menus. This simplifies the state manager (no more
   hidden side effects of pushScreen), less parameter
   to onGameStateChange, easier extend for new RaceResultGUI
   (which must not have calls to pause). Now the calls
   are done in the Screen base class (and can be disabled
   in the constructor).
2) Many cosmetic changes to make the code follow our
   coding standards.


git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5736 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-08-15 01:15:19 +00:00
auria
5f18162c25 Simplified and cleaned up kart selection focus dispatcher logic; also corrected warp-around to work properly there
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5563 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-26 17:19:12 +00:00
auria
4afb71659f Modified music handling, fixing the music heard during GP lost/won
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5513 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-06-13 18:25:49 +00:00
auria
16e3988ddd Another major update to the input configuration screen. There are now separate configurable keys for menu navigations. Conflictm detection was not implemented back yet; multiplayer gameplay seems broken too. To be continued
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5371 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-03 23:37:38 +00:00
auria
1bdc320742 Fixed karts selection screen messed up after a resolution switch; added some refactor to allow easier fixing of such problems in the future. Documented many more methods along the way.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5333 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-05-01 19:16:38 +00:00
auria
5d827f12ef Some code cleanup, that might have fixed JoergH's build problem on the way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5282 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-26 23:14:59 +00:00
auria
189fd13b37 More code cleanup (yeah, again, that's because I care ;)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5273 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-25 19:23:57 +00:00
auria
8cc06205e4 More documentation improvements to GUI code. Fixed a couple old comments that were no longer valid and thus misleading.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5266 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-25 17:58:22 +00:00
auria
00683fb0a5 Documentation improvements (some comment was misplaced and was attributed to the namespace and not the function inside the namespace where it belonged)
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5265 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-25 17:36:08 +00:00
auria
2810193fb2 Lots of small changes to make the output Doxygen file much more useful
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5249 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-04-23 20:36:13 +00:00
mbjornstk
e863a5e705 Add include to fix "error: must #include <typeinfo> before using typeid".
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5089 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-27 23:57:55 +00:00
auria
2f3cf6d8b4 Cleanup : less publicly editable members in Widget, renamed the name of tabs in options because there was a name conflict, improved widget search into the tree
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5086 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-27 23:18:07 +00:00
auria
fad4cb4c01 Updated menu singleton code, there was a bug in its logic (that had no consequence that i know but better fix it anyway) + some code style cleanup along the way
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5023 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-18 18:18:19 +00:00
auria
90b95f6944 Fixed what happens when pressing escape on feature unlocked screen
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4894 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-03-01 23:40:20 +00:00
auria
7b8fc1e592 Fixed compilation warnings, + warn if many keys are assigned to the same action in input settings
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4380 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2010-01-02 01:46:29 +00:00
auria
47db6ffa41 Fixed crash on reschange caused by very subtle pointer management issue; added various debug checks to make sure this doesn't happen again -.- those debug checks should have unnoticeable performance effect on a release build
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@4376 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-30 20:59:56 +00:00
auria
957fc9281b A menu that uses animations can now choose not to throttle FPS to 35. This means credits and feature unlocked are now smoother
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4251 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-12-06 02:19:37 +00:00
auria
b1f540e062 Improved support for multiplayer kart selection
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4156 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-28 23:04:38 +00:00
auria
512f97a63b Fixed resolution switch
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/branches/irrlicht@4116 178a84e3-b1eb-0310-8ba1-8eac791a3b58
2009-10-13 23:43:19 +00:00