Merge from parent

Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog

Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated

fixed minor problem with saving hash

Removed whitespaces, refactored hash setting getting and clearing

Removed commented-out unused code

*sigh*

Patched login dialog bugs, added retry dialogs

Try to be friendlier to small screen sizes. Use 800x600 if width/height of 2/3rds is smaller than 800x600 (things don't look smaller than that size), use desktop size if it is for some reason smaller than 800x600

uint32_t -> quint32

Fix linux build broken in ra1577759bf62 (probably)

Fix non-osx build broken in ra874d00df4a4. Dudes... :(

Fix windows build broken in raf97cdbb7713

cmake set variable and typo

GCI2012: Autoupdate Button in Settings

cmake verbosity/documentation/cleanup/formatting

Implement some more callbacks

partially revert r1fba650c2aa4 on misc/physfs/CMakeLists.txt which randomly set true and false variables

Delete poller when game is over

less linking needed, raise minimum_osx_version when videorec is enabled

Merge with default

hides the 'email' prompt on the feedback page (as that doesn't work, so it's a misleading/useless feature), makes the "please add your email" text a little nicer and more noticeable, and makes the "feedback" and "downloadable content" buttons on the main menu a little bit larger, and more clickable.

Some fixes

Unbreak build

Unbreak build

removing the optimisation that caused (most likely) the lua crashes on osx

removing the optimisation that caused (most likely) the lua crashes on osx

strip available ram entry, add notice for entering email

strip available ram entry, add notice for entering email

GCI2012: Google Issue Login

GCI2012: Google Issue Login

will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build

will fix this http://code.google.com/p/hedgewars/source/detail?r=9f0e79ab51f00f3b1e133ae70cdd63f6963439c0 and will allow hedgewars to build without video recording enabled, for the time being although i want to talk to koda or someone to understand what should be #ifdef'd and if i've done too much or too little.. but at least that will let it build

updated frontend translation

updated frontend translation

fix some comments and add basic doxygen file

fix some comments and add basic doxygen file

GCI2012: Corrected headers for generate documentation (doxygen)

GCI2012: Corrected headers for generate documentation (doxygen)

fix build on linux for me ( the uint32_t releated breakage )

fix build on linux for me ( the uint32_t releated breakage )

GCI2012: Refactor Authors Page

GCI2012: Refactor Authors Page

tinker around the info delivery...

GCI2012: Sound Option, Hear Only Music

GCI2012: Embed System Info

tinker around the info delivery...

Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two). Still need to figure out why isSEBackup is used and if my changes affect it.

GCI2012: Embed System Info

Merge

Cleaned up frontend options a bit and added a couple WhatsThis messages.

Command to delegate room to other player

Removed redundant "enable"s on checkboxes and variable names.

Change room name if room admin is kicked

Command to delegate room to other player

Stop syncing when recieved 'o' message

Change room name if room admin is kicked

Send "ROUND_FINISHED" to room clients when server thinks so

Stop syncing when recieved 'o' message

Better check for bans

Send "ROUND_FINISHED" to room clients when server thinks so

Show others if spectator is in game

Better check for bans

Show who's in game to spectators

Merge

Show others if spectator is in game

"Registered users only" room flag

Changed uSound.pas so that music will still play if music is enabled and sound is disabled. Effectively, isSoundEnabled represents only sound effects and does not include music (and I have replaced the places where both are concerned with a logical combination of the two). Still need to figure out why isSEBackup is used and if my changes affect it.

Show who's in game to spectators

Cleaned up frontend options a bit and added a couple WhatsThis messages.

kinda treat graves like hedgehogs for the purpose of looking up hog info

"Registered users only" room flag

Removed redundant "enable"s on checkboxes and variable names.

GCI2012: Remove Quit Prompt On Mouse Click

kinda treat graves like hedgehogs for the purpose of looking up hog info

backout rea7541f77944 since development of frontlib is on another branch

GCI2012: Remove Quit Prompt On Mouse Click

don't set stereomode when stereo is disabled

don't set stereomode when stereo is disabled

GCI2012: Fix Cancelling Video Uploads

GCI2012: Fix Cancelling Video Uploads

readd this debug line, commented out, could be useful

readd this debug line, commented out, could be useful

can reopen engine again...

can reopen engine again...

third merge, yay

Made user data path default to '.'.

second merge

Register flib_gameconn callbacks

first merge

merge from default

Made user data path default to '.'.

Create hedgewars.ini if not exists manually, as QSettings uses QTemporaryFile for that, and QTemporaryFile doesn't respect custom file engines.

GCI2012: Navigation Output

GCI2012: Convert uMobile into a Callback Record

don't allow resizing videorec widgets

GCI2012: Move Video Preferences in Settings Tab

Merged changes from upstream.

Move video description text underneath thumbnail to prevent the layout from resizing.

Fix crashes and wtf behaviour introduced in r0b8beacff8a5

Merged with upstream.

Unbreak build with freepascal < 2.6.0

Fixed crash that occured after recording a video (pagevideos' config wasn't set).

caught a few more possible glitches in engine cmakefile

Merged koda's fix for the hwengine bug. eG: --

MERGE

Make video recording options have fixed size and merge with spinbox->combobox change.

Fix check for file existance

Merged changes from upstream.

- Disable in-room bans - Actually check for banned nickname

fix compiling engine (bug introduced in r33868aea694c)

GCI2012: Find Out What is Causing This Problem (frontend leaks on OS X)

unify default videorec values loading/reloading, fix setting index/value from previous commit

GCI2012: Check for Non-Standard Recorder Framerate

resize the qt window to fill 2/3 of the screen size (no more crammed widgets on first launch) and always center it

Merged changes from upstream. HK: changed QTfrontend/ui/page/pageadmin.h

fix mask only

GCI2012: User/Pass Single Prompt

GCI2012: Move Freepascal discovery code into a CMake module

Refactor: get rid of excessive QSettings instances on the same poor hedgewars.ini file

Fix QSettings problems: - Reopen file in ReadOnly mode if it was open in ReadWrite mode and is being read. This is needed for stupid QSettings which opens file in ReadWrite mode just to call readAll() on it. - Implement setSize(0)

Some fixes

shorten tip

Google Code-in: Center help text field Modifies the grid layout slightly so that the help text which appears when hovering over certain elements is centered with respect to the window, even when there are more buttons on one side. https://google-melange.appspot.com/gci/task/view/google/gci2012/7968226

Fix more errors. It compiles!

also this can be deleted

Merge

Merge

Fix some stupid errors I caused

minor xcodeproj update

use High() to avoid future out of bounds in uSound

Make user folder default to global folder in hwengine

Refactor Freepascal module.

oups

Move noexecstack flags to Freepascal module and refactor.

remove unneeded @2x images

Move code for Freepascal to separate CMake module.

GCI2012: Remove Structure Weapon Code

Make user folder default to global folder in hwengine

set window modality for new ban dialogs

Fix warning

Bans manager

- Fix UNBAN bug - Rework BANLIST message format

Case insensitive test for banned nickname

Implement ban by nickname

GCI2012: Too many variables

GCI2012 - In-Game Chat Commands

Google Code-in: Move video preferences in settings tab Moves the video recording preferences out of the video recording page into their own tab in the settings page. https://google-melange.appspot.com/gci/task/view/google/gci2012/7968230

GCI2012: Command Line Parsing

Google Code-in: Center help text field Modifies the grid layout slightly so that the help text which appears when hovering over certain elements is centered with respect to the window, even when there are more buttons on one side. https://google-melange.appspot.com/gci/task/view/google/gci2012/7968226

use the correct symbol

Use same macro for hiding video record button and keybinding Modified my previous patch to use the already-in-place VIDEOREC macro (used previously just for hiding the button on the main menu) instead of creating another one. https://google-melange.appspot.com/gci/task/view/google/gci2012/7948213

GCI2012: Lowercase CMake functions (main files only)

Move global variables to units that use them

Google Code-in: Hide "video record" keybind option Removes the recording keybinding option using preprocessor conditions when it is unavailable. This includes when Hedgewars is being built either with the recording feature explicitly disabled or when FFMPEG/LibAV were not found. https://google-melange.appspot.com/gci/task/view/google/gci2012/7948213

Remove unused global variables

*sigh*

merge

A bit of refactoring

Use HW_TEAMCOLOR_ARRAY from frontlib

Invert S3D_DISABLED to more consistent USE_S3D_RENDERING

Merge

GCI: use player's name for the default team task: http://www.google-melange.com/gci/task/view/google/gci2012/8007227 note: these bugs were NOT introduced by this: - double confirmation on team removal - team addition fails

Fixed flib_weaponset_create creating an empty weaponset (for real this time :P)

unbreak linking pending some fix or other by koda. this is the same thing video recording still does.

Some fixes

Added default weaponset to frontlib hwconsts Now the weaponset create function can actually do what it promises and create a default set instead of an empty one :)

merge

No more crashes when running quick game

GCI2012: Empty list help text (issue #375)

Try to setup weapon sets for quick game

Remove limit on hedgehogs number

Merge from default to have recent fixes

koda, koda... could have checked your claims

link physfs on ios, add its library and (most importantly) implement automatic dependencies resolution

Updated Slovak translation

add ios project to physfs

merge

INSTALL and README updates

physfs: no carbon depency on osx, add cdecl attributes on extra functions

Updated Slovak translation

Load sounds with the help of physfsrwops library

merge

Refactor identifiers names

GCI2012: Check for Clang Version in CMake

Refactor Clang module.

Implement QAbstractFileEngine::FastReadLineExtension

Move version check of Clang to CMakeLists.

Use alternative way of checking for file end. Also refactor this code a bit.

Move code for Clang to separate CMake module.

Move code for Clang to separate CMake module.

Bring ansistrings back

Oops, temporary objects involved

ok at least pas2c now parses allnots.......

show console on win when debugging to see frontend messages

Convert HWTeam to be a wrapper to flib_team

update var name

Oops, sorry, libphysfs.dll

- frontlib loads team config via physfs - some more work on frontlib port

throw in some 'nots' trying to restore pas2c functionality

- Fix saving .ini files - Fix frontend effects value loading - Fix some places working with files not via physfs

Remove debug messages

updated branch

revisit the debugfile section

Fix some frontlib bugs

moar cmake cleanup, use message(WARNING ...) where appropriate

Try to use map preview facilities: - HWGame and HWRecorder are completely broken - HWMap should work, but doesn't

Follow IANA suggestions better

cleanup revision section, make hg launch tolerant to config errors, drop deprecated exec_prog for desktop configuration in favour of execute_process

Bad unC0Rr

Bad koda!

little cmake cleanup, search installed modules first, then our own

how this happened?

Take care of parameter passed to FileEngine::fileName. Fixes problem with weird paths on windows.

Some fixes to build process

added sdl_net headers and def lib for windows, fix frontlib compilation on windows

lotsa hackery to get frontend somehow link libengine...

frontlib paths

fix physfs on osx, now all platforms should be happy

Oops

Start port to frontlib

Fix build

Fix SDL library name

find lua.h ...

thou shall not use system headers for crossplatformness

physfs compilation on windows * external calls must always be named * physfs has to be compiled as dll * there shouln't be external variables, implemented a function that sets buffer * physfs extras is now integrated in main physfs * removed physfs extras

use lua headers correctly

Fix typo

Okay, remove previous request only if it has same parent as this one. Fixes the last note of previous commit (which was nearly impossible to hit, but whatever, just cleaning implementation)

- Only allow one engine instance running at the moment - When adding new map preview call to the queue, check if previous map preview request has started, and if no, remove it from queue. Could be harmful if you manage to request previews for two widgets in less time than needed to generate one.

win build changes, fpc 2.6, CMAKE_PREFIX_PATH, glut header

Link some libraries needed for physfs on windows (there are still 5 symbols which couldn't be found - to be resolved)

Merge

fix deprecation warnings for libav sources

meh

linking phsyfs on osx

allow the engine to use physfs on android too

Merge from 0.9.18

Convert reading hedgehogs limit from map config

Download .zip too, and store them to .hwp

merge... need to remember to update first

Merge physfslayer branch into default. Have fun!

Close this branch

- Download .hwp files into Data folder and mount them immediately (yes, could cause problems in case of overlapped contents) - QuaZIP no more. RIP.

oops

oops

Mount .hwt files found in Data folder

oft-requested, should make the shoppa guys happy, probably, but, knowing them, I'm sure someone will complain

link main on osx

Get rid of DataManager::findFileForRead

Backed out changeset 5d00c28059e3 - enable the feedback button again

cleanup headers, remove -I . from rtl lib to save a few warnings

Use (undocumented) Mix_LoadMUS_RW to load music

mutatis mutandis

some CMake cleanup

We need custom script loading function in lua now

up android target api (but this commit is actually just to test buildbot: desync

fix build

Keeping bruteforce

another tweak tomake --stats-only work on headless servers

and install it too

Oops, didn't realize FindLua.cmake is our own module

Don't rely on hedgehog facing direction, check intentions instead. Should fix excessive turns around and weird jumps to water

comments and runtime list of files to convert and compile

Implement reader in C ffs

Pretend AI knows how to use drill rocket (actually has no idea of drilling)

finally hwengine in c links without errors

Script loading via physfs which doesn't work: - Some scripts just refuse to load for no obvious reason - Some scripts load fine when you set BUFSIZE to a large value, like 64k, but don't load with small values Error messages in both cases don't seem to have relation to lua file contents

Call fallers less often. Should hopefully still be about as effective at the intended purpose. Should help loads quite a bit.

cmake linking for engine in c

Engine loads fine with basic config

make stats-only mode work headless. also skip a few things to save time/memory.

merge xymeng's gsoc engine with a few updates (and further checks on symbol definitions)

Get rid of Pathz and UserPathz

oops

better clang search

- Add physfsrwops library - Load images via physfs (crashes)

Don't accept in-room flags when not in room

merge xymeng pas2c

merge with default

merge with latest default

Some tweaks to AI

fix demo playback

couple of nots

merge

Various tweaks to recent AI change

this wasn't needed IMO

objects too

something bender asked for. allow a mask without a map

oups

search for more clang names

Make FindPlace more flexible on large maps.

no globs, sources not yet generated

merge

correct includes and clang detection

LongInt Land width/height, mouse coords

More strictness on room bans

Fix why my first attempt to compile main had failed, causing me to ask koda what the secret was. apparently using an OS that ignores case...

strip BOM

add a few cmakefiles for c engine and rtl

Only a handful of ISO 639-3 languages are supported by Qt. Standard Malay is not one of them. Using the macrolanguage code seems fine. Not too sure what the numerusform is for a macrolanguage, but appears that wikipedia equates MS w/ "bahasa" too

add FindGLEW.cmake module

Try to beat AI in Mutant!

rename BUILD_ENGINE_LIBRARY to LIBENGINE option, so that no _ are used for cmake options

merge

split WEBGL and NOPASCAL cmake options

add gstMoving to avoid sticking

better GL.h (which was needed after all)

Don't zero TeamHealth, only show empty health bar

add xymeng's pas2c header

Spam log with checksums

empty or old files

Maybe this caused server crashes? Add more strictness on team owner record field

well this was silly

This should ensure zsm doesn't screw up locale, hopefully.

add xymeng's rtl port

Add zsm since Myystery is offering to do this language. Also update the .pro file and existing strings.

move stuff out of engine folder

Remove duplicate files from voices (add a fallback check in uSound). Add JustYouWait as an alternate to IllGetYou. Note that IllGetYou being called every turn seems awkward. IMO they probably should be reserved for significant enemy action. Maybe played by team of heavily damaged or killed hog.

verbose pas2c for parsed args

issue #458

parentheses for everyone

revert merge w/ Medo change, since it crashes the engine. Access violation line 70 of uLandOutline.pas|line 231 of uLand.pas etc

haskell usability on windows

support ridiculously large maps

add CMakeFile for pas2c, add WEBGL config option

Oops, fix room info on room admin change

dos2unix hedgewars.pro

close branch

move pas2c files in their own directory and add a warning about argument order

ios: fill in CFBundleVersion and CFBundleShortVersionString information better

Build physfs lib before engine

Replay without frontend mode

pas2c is now fully parametric with command line options (maybe unC0Rr needs to clean this up a little)

Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.

Fix function prototype

removing the optimisation that caused (most likely) the lua crashes on osx

pas2c can search for inc files in alternate folders (needed for out of source builds)

bad koda

Start work on physfs support in engine

Fix crash in kamikaze

pas2c can read files without changing the process directory

Causes AI fail. Needs testing 'cause at some point, I thought this was needed for portal, I don't remember *why*

- Load teams via physfs - Some fixes which allow Qt to load ini files and icons via physfs

advice from hasufell

pas2C is slowely becoming parametric

oups

merge with default again

strip bad line

let's start to introduce bugs in haskell stuff too

merge .18 lua

Better place for SendUpdateOnThisRoom

Simplify ammo menu conditions so it shows up in more states. Should fix issue #465. The part w/ sliding in uworld is main #465 problem.

Send notification about 1 player in room on room creation

play nicer with system flags

leak

avwrapper needs to depend on hwengine not on ENGINECLEAN

this version of tremor requires a nil check on close_func https://svn.xiph.org/trunk/Tremor/vorbisfile.c

fix parallel compilation

merge from 0.9.18

*sigh*

more fixes

Script typos

update lua (remove duplicate strings, esp in fr.lua - mostly my fault - and add a bit more escaping to the crude script)

5 files that fail to load in libpng1.5 - ran convert against libpng1.2 then pngcrushed 'em to strip for good luck

many osx sparkle fixes

remove mobile ifdefs, replace writeLn's for WriteLnToConsole

Wee, now frontend is able to load translation file

fix name

merge from hedgeroid, includes Medo's work from GSoC

Merge with default

merge from default

oops, fix incorrect room owner name in ROOM UPD command again

Added tag 0.9.18-release for changeset 2fc02902c7cb

oops, fix incorrect room owner name in ROOM UPD command

Removed tag 0.9.18-release

fix for forts mode *sob*

Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes

Added tag 0.9.18-release for changeset be11c26a3a0b

Small fixes to b-day image. For next year I 'spose

Removed tag 0.9.18-release

Backed out changeset 5d00c28059e3 - enable the feedback button again

Fix 0.9.18 desync: CreateNetGame() slot creates signal-slot connections from hwnet to hwgame. The problem is that this slot is called asynchronously using queued connection, and hwnet could send some signals to hwgame before hwgame object is created and connected. Changed this to direct connection. Also changed connections to hwgame object to queued, but this is unrelated. Sorry, it is frontend patch. Maybe a little delay on server side could help, but not much, as tcp packets could get glued on client's side, and that greately depends on pc and internet connection performance. Frontend should be reworked to be safe for queued connections, as it is extemely dangerous to have a mix of queued/direct connections.

merge again

updated Info.plist

merge with 0.9.18

small it.txt update

this should fix the highlighting failz with non-lowercase player names like the one CheezeMonkey ran into. there is a workaround: in the user dir put the playername in <playerNameWithCorrectCase>_highlight.txt

Added tag 0.9.18-release for changeset 2f203395baca

!@#$

add missing cmakelists.txt, move portal mission graphic to correct dir

merge trunk w/ final 0.9.18

merge w/ trunk

update lua loc, adjust cleaver in ammo sets

portal challenge

birthday style

- Fix for little mistakes (applied to every hedgewars_*.ts file). - Full hedgewars_pt_PT.ts and pt_PT.txt Portuguese (Portugal) translation. - Partial pt_PT.lua translation.

Update ai actions tracing subsystem

Fix white background in players list on halloween, christmas and easter

Merge from default

Clear in-game flag when user joins room

libav name refactor

another stake at variable pre-initialisation - we lost preview logging in the course

apparently an older version was provided earlier and this one is newer and theoretically desync free. untested.

fix hat names. more efficient killing off of limited hogs (takes too long to wait otherwise)

new script specialising in altering weapon behaviour

merge from stable

polish language update (+ closes issue #322)

consistent line endings

consistent line endings

fix reserved hats from scripting

fix reserved hats from scripting

remove cleaver gradient

remove cleaver gradient

merge trunk in 0.9.18

dev version bump, for 'stable' commits please use 0.9.18 branch

disable this block since it doesn't fit star's new graphic. doesn't show up often anyway, since unc0rr changed gst clearing

use VideoItem::prefix instead of VideoItem::name as suggested by Stepan777

tweaked hedgehog sprite (gstLoser and such) this version tries to clean up a bit of the pixelation from having not been edited in inkscape

Change messages a bit

Mutant script

Fix training script positions altered by variable land dimension change. issue #453

Fix 440, used 'grave' rather than '`' in default binds

darken and contrast the gray images to distinguish more easily from pink

Arbitrarily tweaked to not firepunch loose, and to increase chance of bazooka doing it to about 20%

Improve TestSniperRifle a bit

Allow cleavers to be knocked loose by explosions. Probabilities might need tweaking.

boo, koda

this commit is a no-op

close engine shortcut, from the discussion in issue #317

disable fps widget when recording

add videorec button descriptions and delete screenshot when video is deleted (issue #427)

apparently we are forced to use a (dummy) callback for glut 3.0 compatibility

increase framerate and bitrate (issue #427)

double cleaver rotation speed, also make spin direction dX dependent.

Slight update of russian translation

Choose first unused color for added team (addresses issue #431) + other small changes

add SDL as an dependency

let animation objects delete themselves after they are not being used anymore PS: I don't like that we create new animation objects every single time before a page transition is done, I'm sure that can be done in a nicer way. But at least we're not keeping those non-reused objects around forever now...

revert tremor back to a version before koda broke it ;p

more like here

merge Medo's GSoC work

Workaround for visual bug. issue #442

merge hedgeroid branch with tip

add flag of the soviet union (issue #297)

fix for issue #432, show ready toggle for room admins, set them always ready, keep the blinking option

merge

forgot to remove these files when reverting tremor