merge hedgeroid branch with tip hedgeroid
authorXeli
Sun, 28 Oct 2012 13:28:23 +0100
branchhedgeroid
changeset 7855 ddcdedd3330b
parent 6350 41b0a9955c47 (diff)
parent 7854 0b447175594f (current diff)
child 7857 2bc61f8841a1
merge hedgeroid branch with tip
QTfrontend/model/hats.cpp
QTfrontend/model/hats.h
QTfrontend/model/themesmodel.cpp
QTfrontend/model/themesmodel.h
QTfrontend/res/chat_default.png
QTfrontend/res/chat_default_off.png
QTfrontend/res/chat_default_on.png
QTfrontend/res/chat_friend.png
QTfrontend/res/chat_friend_off.png
QTfrontend/res/chat_friend_on.png
QTfrontend/res/chat_ignore.png
QTfrontend/res/chat_ignore_off.png
QTfrontend/res/chat_ignore_on.png
QTfrontend/util/HWDataManager.cpp
QTfrontend/util/HWDataManager.h
hedgewars/HHHandlers.inc
hedgewars/PascalExports.pas
hedgewars/uKeys.pas
misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj/default.mode1v3
misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj/default.pbxuser
misc/libfreetype/Xcode-iPhoneOS/Freetype.xcodeproj/project.pbxproj
misc/libfreetype/Xcode-iPhoneOS/Freetype_Prefix.pch
misc/libtremor/tremor/Version_script.in
misc/libtremor/tremor/backends.h
misc/libtremor/tremor/block.c
misc/libtremor/tremor/block.h
misc/libtremor/tremor/registry.c
misc/libtremor/tremor/registry.h
misc/libtremor/tremor/sharedbook.c
misc/libtremor/tremor/synthesis.c
misc/libtremor/tremor/window.c
misc/libtremor/tremor/window.h
project_files/Android-build/SDL-android-project/jni/SDL_mixer/Android.mk
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/FrontendDataUtils.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/GameMode.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Grave.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Map.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Scheme.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Team.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/Weapon.java
project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/TouchInterface/TouchInterface.java
project_files/Android-build/Templates/complete_build.sh
project_files/Android-build/Templates/default.properties
project_files/Android-build/Templates/local.properties
project_files/Android-build/Templates/pushToDevice.sh
project_files/HedgewarsMobile/Classes/AmmoMenuViewController.h
project_files/HedgewarsMobile/Classes/AmmoMenuViewController.m
project_files/HedgewarsMobile/Classes/HelpPageInGameViewController-iPad.xib
project_files/HedgewarsMobile/Classes/HelpPageInGameViewController-iPhone.xib
project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib
project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib
project_files/HedgewarsMobile/Classes/HelpPageViewController.h
project_files/HedgewarsMobile/Classes/HelpPageViewController.m
project_files/HedgewarsMobile/Classes/InGameMenuViewController.h
project_files/HedgewarsMobile/Classes/InGameMenuViewController.m
project_files/HedgewarsMobile/Classes/OverlayViewController.h
project_files/HedgewarsMobile/Classes/OverlayViewController.m
project_files/HedgewarsMobile/Classes/OverlayViewController.xib
project_files/HedgewarsMobile/Resources/Overlay/ammoButton.png
project_files/HedgewarsMobile/Resources/Overlay/ammoButton@2x.png
project_files/HedgewarsMobile/Resources/Overlay/arrowDown.png
project_files/HedgewarsMobile/Resources/Overlay/arrowDown@2x.png
project_files/HedgewarsMobile/Resources/Overlay/arrowLeft.png
project_files/HedgewarsMobile/Resources/Overlay/arrowLeft@2x.png
project_files/HedgewarsMobile/Resources/Overlay/arrowRight.png
project_files/HedgewarsMobile/Resources/Overlay/arrowRight@2x.png
project_files/HedgewarsMobile/Resources/Overlay/arrowUp.png
project_files/HedgewarsMobile/Resources/Overlay/arrowUp@2x.png
project_files/HedgewarsMobile/Resources/Overlay/cornerButton.png
project_files/HedgewarsMobile/Resources/Overlay/cornerButton@2x.png
project_files/HedgewarsMobile/Resources/Overlay/helpabove.png
project_files/HedgewarsMobile/Resources/Overlay/helpbottom.png
project_files/HedgewarsMobile/Resources/Overlay/helpingame.png
project_files/HedgewarsMobile/Resources/Overlay/helpleft.png
project_files/HedgewarsMobile/Resources/Overlay/helpplain.png
project_files/HedgewarsMobile/Resources/Overlay/helpright.png
project_files/HedgewarsMobile/Resources/Overlay/joyButtonAttack.png
project_files/HedgewarsMobile/Resources/Overlay/joyButtonAttack@2x.png
project_files/HedgewarsMobile/Resources/Overlay/joyButtonBackJump.png
project_files/HedgewarsMobile/Resources/Overlay/joyButtonBackJump@2x.png
project_files/HedgewarsMobile/Resources/Overlay/joyButtonForwardJump.png
project_files/HedgewarsMobile/Resources/Overlay/joyButtonForwardJump@2x.png
project_files/HedgewarsMobile/Resources/backSound.wav
project_files/HedgewarsMobile/Resources/clickSound.wav
project_files/HedgewarsMobile/Resources/selSound.wav
project_files/HedgewarsMobile/SDL-50560ca58f80.patch
share/hedgewars/Data/Graphics/Hats/Reserved/a1ed4756b565d13aaecb1f2b1a556570alwayss.png
share/hedgewars/Data/Maps/Sticks/map.cfg
share/hedgewars/Data/Maps/Sticks/preview@2x.png
share/hedgewars/Data/Music/Nature.ogg
share/hedgewars/Data/Scripts/plist/Balanced Random Weapon.plist
share/hedgewars/Data/Scripts/plist/Capture the Flag.plist
share/hedgewars/Data/Scripts/plist/Gaudy Racer.plist
share/hedgewars/Data/Scripts/plist/No Jumping.plist
share/hedgewars/Data/Scripts/plist/Normal.plist
share/hedgewars/Data/Scripts/plist/Random Weapon.plist
share/hedgewars/Data/Scripts/plist/Space Invasion.plist
share/hedgewars/Data/Scripts/plist/The Specialists.plist
share/hedgewars/Data/Scripts/plist/Tumbler.plist