Changes
#27 (Apr 12, 2019 4:35:20 AM)
- Rolled back to r12201 — Philip Wiese / detail
- Rolled back to r12201 — Philip Wiese / detail
- — peterf / detail
#26 (Mar 8, 2019 4:35:29 AM)
- placed new trunk from mergeFS18 — Philip Wiese / detail
- Shader merge — merholzl / detail
- Merging OrxoKart — merholzl / detail
- merged Wagnis — merholzl / detail
#23 (Nov 15, 2018 4:35:25 AM)
#22 (Oct 18, 2018 4:35:25 AM)
- Copied branch with new ogre version to trunk location — merholzl / detail
- merged pacman — merholzl / detail
- merged Tubes into SuperOrxoBros — merholzl / detail
- added OrxyRoad — merholzl / detail
- added space race improvements — merholzl / detail
- added scriptable controller — merholzl / detail
- Merged Masterserver, refresh button had to be removed — merholzl / detail
- new merge branch to cequi 0.8 and ogre 1.9 — merholzl / detail
- Set locale to minimum locale C and not user-preferred locale, as CEGUI 0.8 requires locale set to C — patricwi / detail
- Changed cmake config file to ogre 1.9 — patricwi / detail
- fixed material of debug drawer (to visualize collision shapes) — Fabian Landau / detail
- fixed some warnings with gcc 7 — Fabian Landau / detail
- added path to cegui for ubuntu 17.10 and also making cegui 0.8 the minimal supported version — Fabian Landau / detail
- added work around for a bug in cegui 0.8 (the cegui lua scripts expect a "Font*" pointer to call getTextExtent(), but cegui 0.8 only returns "const Font*") — Fabian Landau / detail
- attach Planets to MovableEntities to make them move (Planets are static now) — Fabian Landau / detail
- removed unneeded files and migrated GameplayMenu.lua to cegui 0.8 — Fabian Landau / detail
- migrated all ingame menus to cegui 0.8 — Fabian Landau / detail
- migrated HighscoreMenu.lua and CampaignMenu.lua to cegui 0.8 — Fabian Landau / detail
- fixed another alignment issue — Fabian Landau / detail
- fixed alignment — Fabian Landau / detail
- migrated NotificationLayer.lua to cegui 0.8 — Fabian Landau / detail
- fixed some config values; removed unused layout; renamed some background windows; removed unknown property — Fabian Landau / detail
- updated Settings.lua and all sub-menus to cegui 0.8 — Fabian Landau / detail
- updated HostMenu.lua, MultiplayerMenu.lua, ShipSelectionMenu.lua, SingleplayerConfigMenu.lua to cegui 0.8 — Fabian Landau / detail
- added (again) more include paths to make it work with ubuntu — Fabian Landau / detail
- updated CreditsMenu.lua and SingleplayerMenu.lua to cegui 0.8 — Fabian Landau / detail
- fixed build — Fabian Landau / detail
- merged ogre1.9 (including cegui0.8) into new branch — Fabian Landau / detail
- auto-migrated all cegui files to version 0.8 with ceed (http://cegui.org.uk/wiki/Using_CEED-Migrate) — Fabian Landau / detail
- removed umlaute — Fabian Landau / detail
- created new branch to merge cegui0.8 and ogre1.9 with the recent changes in trunk — Fabian Landau / detail
#21 (Feb 21, 2018 4:35:26 AM)
- this looks like a bug (detected by cppcheck -> https://www.orxonox.net/jenkins/view/Quality/job/orxonox_qc_trunk_checks/20/cppcheckResult/) — Fabian Landau / detail
#20 (Feb 20, 2018 4:35:26 AM)
- merged Presentation_HS17_merge back to trunk — Fabian Landau / detail
#19 (Feb 10, 2018 4:35:25 AM)
- [StoryModeMap_HS16] fixed warnings in console — Fabian Landau / detail
- [SpaceRace_HS16] fixed warning with MSVC — Fabian Landau / detail
#18 (Feb 5, 2018 4:35:25 AM)
- [SpaceRace_HS16] reverted some unwanted changes and fixed formatting a little bit — Fabian Landau / detail
#17 (Jan 21, 2018 4:35:25 AM)
- [BigShip_HS16] reverted changes in emptyLevel.oxw and removed unused file — Fabian Landau / detail
#16 (Jan 8, 2018 4:35:25 AM)
- tabs -> spaces — Fabian Landau / detail
- [Highscore_HS16] added license, added include guard, fixed formatting — Fabian Landau / detail
- [Highscore_HS16] moved logic to compare old an new score to Highscore; fixed formatting in Gametypes — Fabian Landau / detail
- [Highscore_HS16] removed playerName from Highscore because the player already has a name (see HumanPlayer.nick) — Fabian Landau / detail
- [Highscore_HS16] reverted changes in LevelInfo - they don't seem to be needed (everything is done by the Highscore class) — Fabian Landau / detail
- mark includes of external libraries as "SYSTEM" includes to avoid compiler warnings about code that we can't change anyways. in gcc this leads to the -isystem option being used instead of -I — Fabian Landau / detail
- icon is not needed in core-library, is already included in orxonox-main (fixes build in Visual Studio 2017 with PCH) — Fabian Landau / detail
#15 (Jan 7, 2018 4:35:24 AM)
- [HUD_HS16] updated HUDPickupSystem also in HUDTemplatesFPS.oxo — Fabian Landau / detail
- fixed two bugs in PickupInventory.lua:
- the update function had a messed up logic regarding the use-button in the detail window (condition was partially inverted)
- updating the event subscription of the use-button in the detail-window doesn't seem to work - probably CEGUI doesn't like updating/changing/overriding an event while begin IN a mouse-click-event already. moving the logic to the Use/Unuse-function instead seems to work. — Fabian Landau / detail - [HUD_HS16] removed unused function — Fabian Landau / detail
- [HUD_HS16] fixed issue that the hud shows pickups of ALL players/bots instead of just the own spaceship. fixed this by comparing objectIDs
note: network calls currently support only 5 arguments, so I removed representationObjectId which doesn't seem to be used (neither in C++ nor in Lua) — Fabian Landau / detail - fixed nullptr access when two pawns trigger a pickup-spawner at the same time (for the second pawn in the list, the pickup is already nullptr -> crash) — Fabian Landau / detail
- [HUD_HS16] pickups are now always shown in hud, but much smaller. removed HUDPickupTemplate.oxo — Fabian Landau / detail
- [HUD_HS16] removed HUDPickupItem as it is not really necessary (it's just an ogre overlay). also fixed several memory-leaks and some issues with positioning and visibility of the pickup items — Fabian Landau / detail
#14 (Jan 6, 2018 4:35:25 AM)
- [HUD_HS16] fixed wrong dependency between overlays and pickup module: pickup should NOT depend on overlays; instead overlays should use pickup.
also reverted all changes from HUD_HS16 in PickupManager for several reasons:
- calling HUDPickupSystem is not necessary anymore due to the fixed dependencies
- adding a console command is not necessary because there is already a full GUI for this purpose (press F4)
- limiting the number of pickups to 10 is a bad idea because PickupManager manages pickups for ALL players in the game — Fabian Landau / detail - [HUD_HS16] fixed bug with the position of the hud pickup items — Fabian Landau / detail
- [HUD_HS16] removed a lot of unused stuff — Fabian Landau / detail
- [HUD_HS16] removed debug output — Fabian Landau / detail
- merged the remaining commits of HUD_HS16 branch back to trunk (except commit r11392 which added DDDialogue that seems to be just a test) — Fabian Landau / detail
#13 (Jan 4, 2018 4:35:25 AM)
- trying to fix build for MSVC but still having trouble with the circular dependency between pickups and overlays — Fabian Landau / detail
- still trying to avoid CMP0026... can we define ORXONOX_EXECUTABLE_NAME like this? seems to work on windows and probably works on linux too (please test) — Fabian Landau / detail
- reverted r11694, apparently ORXONOX_EXECUTABLE_NAME IS used (for run-scripts in ./bin) — Fabian Landau / detail
- whoops. must remove the extensions from the library's file name before loading it — Fabian Landau / detail
#12 (Jan 3, 2018 4:35:26 AM)
- removed useless file that was added in BigShip_HS16 — Fabian Landau / detail
- CMP0026 is deprecated in recent versions of CMake -> moved it to the APPLE section because it seems to be used only there and therefore should be fixed there — Fabian Landau / detail
- apparently we must create the directory for module/plugin-files manually to make it work with some (older?) versions of CMake — Fabian Landau / detail
- with the latest CMake there are a lot of warnings about the usage of CMP0026. therefore the naming and content of the module/plugin-files had to be changed:
old: <library-filename>.module with content <target-name>
new: <target-name>.module with content <library-filename>
this seems to comply better with cmake and works equally well in c++ (with some small adjustments).
reference: https://cmake.org/cmake/help/v3.0/policy/CMP0026.html — Fabian Landau / detail - bugfix: don't try to unload a DynLib if it doesn't exist (e.g. after loading the DynLib failed) — Fabian Landau / detail
#11 (Oct 23, 2017 4:35:23 AM)
#10 (Oct 19, 2017 4:35:33 AM)
#9 (Oct 12, 2017 4:35:25 AM)
- Dialogue merged without core modifications — patricwi / detail
- reverted merge Dialogue — patricwi / detail
#8 (Oct 3, 2017 4:35:32 AM)
- SuperOrxoBros added — patricwi / detail
- Millenium Falcon merged — patricwi / detail
- Dialogue merged — patricwi / detail
#7 (Mar 21, 2017 4:35:31 AM)
- test: fixed unittest — Fabian Landau / detail
- testing commit mailinglist — Fabian Landau / detail
- test: failing unittest — Fabian Landau / detail
#6 (Mar 20, 2017 4:35:23 AM)
- test — Fabian Landau / detail
- test — Fabian Landau / detail
#5 (Mar 19, 2017 4:35:32 AM)
- story mode map merged — patricwi / detail
- space race merged — patricwi / detail
- big ship merged — patricwi / detail
- merged space race with trunk — patricwi / detail
- deleted comments — patricwi / detail
- merged updated HUD branch to trunk — patricwi / detail
- merged HUD branch to trunk — patricwi / detail
#4 (Jun 3, 2016 4:35:26 AM)
- COMPARE_VERSION_STRINGS resulted in strange error when version-header was not found. fixed this by setting version-variable to 'NOTFOUND' in this case. — Fabian Landau / detail