Commit Graph

633 Commits (master)

Author SHA1 Message Date
cazfi 57acfa10c1 Removed ft_font.h from headers list.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@525 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-08-02 02:27:17 +00:00
cazfi 431ee9345f Include <climits> to ogl.cpp for INT_MAX
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@524 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-08-02 02:08:56 +00:00
cazfi a2a2ed71e2 Add Makefile.am for new data/courses/default directory
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@523 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-08-02 02:01:26 +00:00
cazfi 4afad3b149 Adjusted autotools build for courses directory hierarchy changes.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@522 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-08-02 01:58:22 +00:00
pkeus 15085ce2d6 Refactorizations:
- Visual Studio: Increased warning level to W4 (minus C4100 and C4512), enabled /Zc:inline
- Replaced NULL by nullptr
- Replaced 3 dynamically allocated arrays by a single std::vector CCourse::Fields
- Fixed a few MSVC W4 warnings

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@521 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-13 19:05:24 +00:00
pkeus 2cb8155816 Merged revision(s) 515 from branches/SFML2:
Refactorizations:
- Reduced time spend in set_material(), reduced calls in track_marks.cpp
- Uniformized some more double/float usage
- Prefer copy_n over memcpy, fill_n over memset
........

Merged revision(s) 518 from branches/SFML2:
Bugfixes:
- Slightly improved error handling (not fully merged from branches/SFML2)
- Fixed Credits GUI broken in r492
- Updated some copyright dates to 2014

Refactorizations:
- Fixed some warnings
- Avoid copying TScore objects
- Small simplifications
........

Fixed mistake in previous merge commit.

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@520 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-13 15:48:20 +00:00
pkeus 6d5872cb2b Merged revision(s) 512 from branches/SFML2:
Several small improvements:
- Translate word "author"
- Improved handling of KeyRepeat
- Added Icon to Installer
........

Fixed a few bugs caused by recent merges


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@519 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-13 15:15:14 +00:00
pkeus ee1be7908c Bugfixes:
- Improved handling of missing data/configuration files: Print error message instead of crashing
- Fixed "auto" resolution: Use desktop mode for fullscreen
- Fixed GUI scaling in higher resolutions than 800*600
- Fixed Credits GUI broken in r492
- Updated some copyright dates to 2014

Refactorizations:
- Fixed some warnings
- Avoid copying TScore objects
- Small simplifications

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@518 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-12 19:00:57 +00:00
pkeus 16c58e954a Merged revision(s) 492 from branches/SFML2:
Reimplemented CSPList on top of std::list<string>
Fixed a few cppcheck findings
........

Merged revision(s) 505 from branches/SFML2:
Refactorizations:
- Make use of C++11 feature emplae_back() to avoid object copying
- Rewritten frame copying
- Avoid converting sf::String to std::string
- Provide rvalue reference overload for CSPList::Add()
........


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@517 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-11 08:23:29 +00:00
pkeus df4a95d199 Merged revision(s) 491 from branches/SFML2:
Uniformized paranthese padding with AStyle, use AStyle 2.04

........
Merged revision(s) 489 from branches/SFML2:
Removed all empty translations to avoid confusion
Save language as string to avoid problems when languages.lst changes

........
Merged revision(s) 488 from branches/SFML2:
New features:
- Translatability of statistics at end of race
- Adapt GUI particle count to screen size

Fixes:
- Remember selected race in GUI
- Fixed crash in Debug mode when loading course without any trees
- Simplified collision detection

........
Merged revision(s) 487 from branches/SFML2:
Refactorizations:
- Check for gl_error automatically (in states)
- Cleaned up some unnecessary includes
- Removed some index maps that offer no performance gain
- Load credit text on demand and unload it when leaving credits menu
- Replaced loadIdentity+multMatrix by loadMatrix

........

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@516 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-11 07:58:50 +00:00
pkeus ad659cf18b Refactorizations:
- Reduced time spend in set_material(), reduced calls in track_marks.cpp
- Uniformized some more double/float usage
- Prefer copy_n over memcpy, fill_n over memset

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@515 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-10 21:25:13 +00:00
pkeus 7aeae80081 New Features:
- Translatable course names and descriptions
- Selection of race group in "practice" menu


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@514 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-10 11:43:36 +00:00
pkeus 896890e042 Added support for course groups. Only use group "default"
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@513 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-09 13:26:23 +00:00
pkeus 97d109235f Several small improvements:
- Fixed crash in sf::SoundBuffer destructor on startup caused by copying of TSound instances in std::vector<TSound> - replaced it with std::vector<TSound*>
- Improved GUI performance of TTextField and TIconButton by pre-creating SFML objects
- Translate word "author"
- Improved handling of KeyRepeat
- Added Icon to Installer

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@512 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-07-09 09:47:56 +00:00
cazfi 4c68584a13 Include SFML header before local headers.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@511 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-05-13 22:53:19 +00:00
cazfi 041b82d19b Avoid using SFML2 string class substring()
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@510 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-05-13 22:52:32 +00:00
cazfi 1bb9b3f1cf Removed ft_font.cpp from list of source files.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@509 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-05-13 22:43:30 +00:00
cazfi 41b607d5f5 Renamed etracericon.svg as etr.svg and install it as icon.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@508 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-05-13 22:27:21 +00:00
cazfi fc2a8e62e3 Renamed etracericon.svg as etr.svg and install it as icon.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@506 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-05-13 22:21:06 +00:00
pkeus 5251ccb2b2 Refactorizations:
- Make use of C++11 feature emplae_back() to avoid object copying
- Rewritten frame copying
- Avoid converting sf::String to std::string
- Provide rvalue reference overload for CSPList::Add()

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@505 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-04-05 17:49:48 +00:00
pkeus 1a058f4f00 Refactorization: Removed useless parameter 'unsigned int mod' and 'bool special'
Bugfix: Fixed key events are counted twice in main menu

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@504 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-04-05 16:35:47 +00:00
pkeus a6f5aecdb1 Refactorizations:
- Store time as float, resolving several compilation issues with clang
- Added missing virtual destructor in GUI
- Fixed typo in OS_WIN32_MINGW (bh.h)

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@503 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-17 18:51:23 +00:00
pkeus 49969b7924 Merged revision(s) 493-500 from trunk:
Include <sys/stat.h> for mkdir() declaration.

........
Include <string.h> for memcpy() declaration.

........
Fixed compile errors caused by mismatched ints and doubles.

........
Include <string.h> for memset() declaration.

........
Made templates standard compliant. Unqualified name lookup does not look
into dependent base classes.

........
Added new matrices.[cpp|h] and vectors.[cpp|h] sourcefiles to build. 

........
Avoid shadowing of the template parameters with local variables.

........
Updated lists of resource files to install.

........


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@502 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-09 09:20:32 +00:00
cazfi 254f893ea0 Fixed seconds vs milliseconds mixup causing game to run 1/1000 speed.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@501 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 04:05:50 +00:00
cazfi 637138dadf Updated lists of resource files to install.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@500 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:56:06 +00:00
cazfi 61df9cb648 Avoid shadowing of the template parameters with local variables.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@499 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:45:16 +00:00
cazfi 89c716b93b Added new matrices.[cpp|h] and vectors.[cpp|h] sourcefiles to build.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@498 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:41:31 +00:00
cazfi 1a580f8646 Made templates standard compliant. Unqualified name lookup does not look
into dependent base classes.


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@497 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:35:08 +00:00
cazfi bfa6e7bb3f Include <string.h> for memset() declaration.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@496 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:33:41 +00:00
cazfi 68df0a8fce Fixed compile errors caused by mismatched ints and doubles.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@495 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:31:43 +00:00
cazfi 071eebf830 Include <string.h> for memcpy() declaration.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@494 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:17:18 +00:00
cazfi 1d72918f5a Include <sys/stat.h> for mkdir() declaration.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@493 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-08 03:12:53 +00:00
pkeus d8a1ec6b68 Reimplemented CSPList on top of std::list<string>
Fixed a few cppcheck findings

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@492 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-02-07 11:23:50 +00:00
pkeus ee38139d2a Uniformized paranthese padding with AStyle, use AStyle 2.04
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@491 0420edf4-82e4-42fc-9478-35b55e6d67a3
2014-01-18 09:55:13 +00:00
pkeus d351e0124c GUI changes:
- Changed key shortcuts in GUI to provide more consistent behaviour
 - Clicking on a control locks focus to it
 - Fixed focussing in event menu
 - Fixed broken TTextField

Other changes:
 - Fixed german translation
 - Small refactorizations

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@490 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-12-04 21:27:34 +00:00
pkeus c762af8373 Removed all empty translations to avoid confusion
Save language as string to avoid problems when languages.lst changes

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@489 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-12-03 22:06:13 +00:00
pkeus 34b0e51efa New features:
- Support resolution and fullscreen changing without restart in both Windows and Linux
- Translatability of statistics at end of race
- Adapt GUI particle count to screen size

Fixes:
- Remember selected race in GUI
- Fixed crash in Debug mode when loading course without any trees
- Simplified collision detection



git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@488 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-12-03 21:08:46 +00:00
pkeus ff90183305 Refactorizations:
- Check for gl_error automatically (in states)
- Cleaned up some unnecessary includes
- Removed some index maps that offer no performance gain
- Load credit text on demand and unload it when leaving credits menu
- Replaced loadIdentity+multMatrix by loadMatrix

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@487 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-30 18:02:01 +00:00
pkeus e2b58a7b9b Updated settings:
- Removed obsolete sound settings
- Adapted types and limits of settings to actual needs of ETR
- Changed default BPP mode to 0 (choose system's mode. Now implemented) instead of 1 (16-bit)

Bugfixes:
- Fixed track marks being broken since sf::Color introduction
- Fixed splash screen logo position

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@486 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-30 09:17:19 +00:00
pkeus 0d621aac9b Corrections to HUD: Fixed papercut font mode, improved string positioning
Use more GUI controls in config_screen

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@485 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-29 16:40:59 +00:00
pkeus f1ab7abc60 Major improvements to GUI focus:
- Decrease focus on Shift+Tab
 - A UI widget will be focussed on startup of a menu.
 - Focus snaps back to last by keyboard focussed widget when mouse leaves a widget
 - Fixed activation behaviour of arrows in TUpDown widget

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@484 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-27 21:54:57 +00:00
pkeus f6e2bf399a Merged revision(s) 478-482 from branches/SFML2:
Refactorizations:
- Avoid duplicating object properties
- Avoid adding literals - apparently this is not optimized by some compilers
- Use STL containern to store vertices in TPolygon
- Formatted with AStyle 2.04
........
Use STL in Polyhedrons, reduced redundant data storage in game_ctrl
........
Use pointers instead of indices in several places
........
Code and data cleanup:
- Cleaned up textures: Keept only those in /data/textures that are currently needed by the game. Resized several textures to remove empty space
- Refactored HUD, fixed bug in wind display when racing upwards the hill
- Removed apparently unnecessary environment box rendering in quadtree code, improving framerate during race
........
Added perf_level 4: Use High resolution textures for skybox.
........



git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@483 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-27 20:45:32 +00:00
pkeus fe70ab7b52 Added perf_level 4: Use High resolution textures for skybox.
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@482 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-27 20:10:33 +00:00
pkeus 12cb17cc1b Code and data cleanup:
- Cleaned up textures: Keept only those in /data/textures that are currently needed by the game. Resized several textures to remove empty space
- Refactored HUD, fixed bug in wind display when racing upwards the hill
- Removed apparently unnecessary environment box rendering in quadtree code, improving framerate during race

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@481 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-27 19:20:04 +00:00
pkeus df0203e807 Use pointers instead of indices in several places
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@480 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-27 17:11:54 +00:00
pkeus b0911a942b Use STL in Polyhedrons, reduced redundant data storage in game_ctrl
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@479 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-27 08:33:26 +00:00
pkeus 0484183cbe Refactorizations:
- Avoid duplicating object properties
- Avoid adding literals - apparently this is not optimized by some compilers
- Use STL containern to store vertices in TPolygon
- Formatted with AStyle 2.04

git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@478 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-26 15:46:54 +00:00
pkeus a222d7e917 Improved GUI: Implemented TLabel and TFramedText, improving performance and reducing code duplication and reaction on mouse focus
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@477 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-23 18:15:19 +00:00
pkeus 5f39d2424f Fixed several bugs found by cppcheck, removed no longer supported and required mipmap functions
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@476 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-22 19:51:54 +00:00
pkeus 29f5fff30b Fixed speed display
git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/branches/SFML2@475 0420edf4-82e4-42fc-9478-35b55e6d67a3
2013-11-03 10:14:23 +00:00