Merge

don't search for lua 5.1 anymore

Don't activate invulnerability/vampirism between shots of multiattack weapon

minimal changes for compatibility with lua 5.2, thanks to v4hn for fixing standard library loads. note: ALSO compatibile with (internal) lua 5.1, until something bothers to upgrade bundled lua version

Fix typo leading to crashes

Add race type detection

- Fix bug with infinite rounds in racer when a team quits mid-game - Don't allow placing waypoint right on top of previous one, prevents accidental double waypoints - Don't limit maps on number of embedded waypoints

Fix new generator on 32 bit arch

No more occasional long straight edges

Spelling corrections

Optimize out path closing point for one point paths

Racer challenge map #7

Official racer challenge map #6

merge

param for original highlander mode - right now just allows getting another copy of a weapon you already had, but had used that turn.

Send updated info on map switched by voting

Fix condition

Fix build

- Fix applying vote result - Votes expiring (I'm sure it doesn't even build, but my ghc is broken for now, hoping for the best)

Fix script

Racer challenge #5

Some fixes to voting + small refactoring

Better detection

hm. I think I forgot to commit this when adding speech bubble change

Fix warnings

- Limit outline to leftX/rightX/topY instead of LAND_WIDTH/LAND_HEIGHT - Fix most of templates which could produce self-intersecting polyline as a start for distortion - Fix parsing in templates editor

- Make sure distortion doesn't move fill point to other side of segment, this prevents corrupted maps - Some adjustments/comments

Process segments from last to first point too

Prevent intersections with segment from last to first point, adjust size of details

Fix div by zero error in new generator

Greedy approach: divide while it divides

No self intersections, except for weirdness between first and last point

Fix detection of intersections, still need to check if passing any point in move, but result is already okayish

More math, implementation is nearly complete, just still have an issue to resolve

Some progress on new generator

Move template-based generator into its own file

Some optimizations

Fix perlin gen on 32 bit arch

- Room save/load into/from file - Vote on map (not complete implementation, also voting itself is still buggy)

Allow to save and delete room config in room

By request. Allow lua to make random things "talk". I'm not sure if this is a good idea, buuuut.

Feel free to revert this one, was just screwing around with stuff from before. I kinda like it and figured committing it was the easiest way for you to look at it. http://m8y.org/hw/perlin.png

this is fine right?

Tweaks and tweaks

- Rework FillLand - Optimize fade() function a bit, don't call min() function - Only leave parts of land which touch bottom border in perlin mapgen

as suggested, precompute to avoid use of double

Experiment: enforce a plate at bottom so the map generated is more connected

Some optimizations

Strip Z axis from calculations

Setup leftX, rightX and topY

Some tweaks to perlin generator

Add randomness

Perlin noise generator untweaked, temporarily replacing maze generator

Racer challenge map #4

merge

don't stack bye/teleport sounds of hogs (when a team is gone)

Don't run two engine threads simultaneously

Don't call halt()

Remove game/preview functions split in library mode, just let normal procedure run instead: - Remove tons of HWLIBRARY ifdefs - Override ParamCount and ParamStr to let GetParams work - Small fixes here and there

- Fix crasher in doStepSniperRifleShot - Fix hwLibrary.pas dependencies list

Make it build as library

Only draw border for solid land

Script might well override a static map, but can't risk it not doing it, and preview completely failing. Better to just not try it for static maps. Some script cfg might help. Could also avoid unnnecessary preview regenerations even if the script was doing nothing at all.

merge

always update. a bit inefficient, but scripts do weird things.

Fix "don't know how to make hwengine.pas" error

no idea what happened to this image... it seems like I'm reverting to most recent revision O_o

pass --prefix to previews too

Use all pixels, not only 8x8 areas

AI doesn't skip till action on the map stops (mostly dedicated to highlander) + various small tweaks

Oops, remove debug stuff which hid the feature

Add alpha channel to preview

Move preview rendering into HWMap

- Make world wrap edges not depend on gear radius - Camera jumps on wrap such that gear position on the screen doesn't change - Small fix to cmake script

move the freeModule too, couple of style tweaks

fix molotov sprite too

tweak dynamite sprite (pixels at frame border, leading to visible filtering artifacts when zoomed)

merge

change how textures from non-power-of-2-width textures are filled. this fixes e.g. the vertical lines appearing between Bath theme's horizontL

minor comments fix

add preview init to tunnels too

fix remaining alpha pixel issues (explosion landbacktex borders etc

use data not text, so DLC doesn't get an *

Allow lua drawn maps (shoppamap, tunnels, diagonal maze etc) to generate previews.

Official challenge map #3 by 1937barcelona

Don't rewrite server ini file too often

Fix tinting of AI kills counter

Should never use State like this, since some states aren't synced (thinking state for example)

allow switching through hogs in reverse order with PRECISE+HOGSWITCH

Fix issue #780 (copy-paste fail)

Fix setting lc_endluatest result

Reduce number of warnings in pas2c-generated code

Fix build

What about exact value?

In stats-only mode: - Don't load all sprites - Don't use sdl_ttf - Don't load binds

Only check alpha channel like BlitImageAndGenerateCollisionInfo does

NULL PChar is okay

pngcrush on this file which will hopefully be cleaned up at some point

Fix read of freed memory found with valgrind

Use strchr instead of strstr with specially constructed string255 struct (not tested)

- Remove few PAS2C ifdef's - Load localization

Fix binds loading

- pas2c recognizes typecasts in initialization expressions - Forbid incompatible pointer types - Fixes and new functions to fpcrtl

Small fix which makes pas2c engine successfully replay demos

- Pas2C: make use of 'external' function decorator - Fixes to rtl - Some work here and there

Implement needed rtl functions

It compiles \o/ Doesn't link yet though, need to implement new rtl functions

fix lq rope being always drawn on screen with same width regardless of zoom

fix misleading indentation

Even more explicit type conversions and other stuff to help pas2c use ansistrings

Implicit type casts to help pas2c

Revert 88929358d2e1 in favor of ansistrings implementation in pas2c

Implement a bit of astring

Pas2C recognizes ansistrings

Fix build with old base package

disallow sinegun to penetrate solid land

fix potential buffer overflow

rolling back my PChar stuff, because unC0Rr improves string handling pas2c instead <3

Merge

get rid of hwpow. ~so long and thanks for all the wtfish~

Fix tons and tons of pas2c warnings (but still not all of them)

fix indentation of previous commit and simplify rc-plane's angle-fix after portal code

Drop support for other string types than string255

simplify rc-plane's angle-adjustment-after-wrap code

CMake checks for haskell modules needed

update FSF address. note: two sdl include files (by Sam Lantinga) still have the old FSF address in their copyright - but I ain't gonna touch their copyright headers

whoops, lost a space

fix a relevant warning I caused by accident

fixing the remaining PChar issues pas2c ran into to this point, now it stops because of being unable to deal with "set of char"

yo dawg, I herd you like PChar...

remove obsolete type conversions that messed with pas2c

fix some string related pas2c issues

use uConsts rather than including config.inc more than once

add travis dependencies

fix for issue #777 (IceGun: Segfault when freezing water, with rqBlurryLand enabled)

- Cut actions array instead of performing full copy, when it is possible - Fix use of uninitialized attack parameters struct (existed for years, and could maybe explain some weird ai behavior)

Tiny optimization

don't allow getting 2nd copy of wep you already have, prevent gaining banned weps even if set to infinite in scheme.

Actually do some actions when flood detected

Define some boundaries to detect events

More work on flood detector

Fix build

Official racer challenge #2

- Start work on flood detector - More agressive joins flood protection - Also fix some warnings

aaaand remove switch

tweaks

Implement kick voting

This should help server bypass malformed replays

remove a few weps I missed. forgot I'd uncommented prior to a diff I'd done earlier

AI always activates invulnerability and extra damage if it has them

Make highlander configurable using weapons, commit weaponset mimicking old values

unbreak build. didn't test changes

Implement 'voted' function

Even more love to pas2c

Fix times

Some love to pas2c

ADMIN_ACCESS is deprecated long ago

Mutual authentication: server side

Filter confusables to some limits

Mutual authentication: client side

Now convert to xml rules

freaking space

add glew and ghc-zlib dependencies for travis tests

ghc ooops

add AppData file close #706

use CMAKE_CURRENT_SOURCE_DIR consistently

Must not code at late night (fix sanity check)

- Add SCHEME which is needed in room config - Fix replay of games on maze maps

Some basic sanity tests for replay files

confusables.txt to insert query converter

Handle chars and not bytes for usernames :-p

turned out this blocked CJK characters too. stick to ASCII control char ban only, do NOT include UTF-8 control chars

hide complete IP of other users, when non-admin requests player info. showing the first two parts of the IP was kinda pointless to begin with (what for?) and has recently lead to increased abuse and lobby flooding due to bots collecting/posting IP tracking information

Use zlibFormat

disallow control chars in player nicks, thanks for burp to helping making the list more complete

- Implement /callvote

- Allow delegation to specific person in fixed room - Remove redundant check in DELEGATE handler

Don't delegate special room to another player when owner quits

More robust implementation of decompression

Small update of my voice-pack Default_ru

actual fix

fix server not building

Show which file has failed

Check if frontend was too lazy to actually send drawn map data to the server

Oops, forgot this

test tweak/fix

more scripts found by sheepluva

little gameServer cleanup

restore revinfo

readd r3be36d2fdca6

ok really restore tests

restore tests

restore gameServer changes

merge

Halfplement voting

Fix uGearsHandlersMess.pas changes lost in merge r1c02143bfe9c. This seems to only include the drill rocket fixes ( re0dd66b2e73b and r8db0c56f7e2f ) as well as the initial cake push ( r8786d4ac9e0b )

Fix server producing unreplayable records

use new API for changing GameFlags

luaAPI: * add paramater count checks to gameflag functions * add GetGameFlag(gameflag) for checking a gameflag's current state

Fix detection of mapgen

Merge

This adds idle hog tinting. Active hog tinting still needed.

let log know when a test finished properly, so that an unexpected termination (segfault, divbyzero, etc) is easier to tell apart from test fail

* fix divbyzero found by GetGravity test (cWindSpeed was used where cMaxWindSpeed should have been) * make GetGravity return same integer value that was given by SetGravity (by rounding away precision errors rather than just truncate) - a problem also identified by the test :P

test for GetGravity and SetGravity

add a test based on unC0Rr's suggestion. still a lot of mess and redundancy involved, sry :P

Implement drawnMapData function so checker could check replays with drawn maps

drill rocket test

new cmake option NOVERSIONINFOUPDATE -- to be used if source is in a git/repo that is NOT the hedgewars repo

remove DroidSans font from source dir. it is unused afaik and also wrongly included in the source tarballs

fix despeckle mutilating blurry land

- Make Racer report achievements - Add official racer challenge map #1 - Helper script to detect official challenge maps by land digest

no idea how I ended up forgetting about the offset I need for same position in different rows (in 1d array); also remove obsolete comment

small tweak/hax for blurry land to make tile borders vanish (when clamping is off)

add travis tests for the two new cmake options

(experimental) merging the new procedures for different pixel representations (1D/2D arrays) into a single procedure with the algorithm and two procedures for the different mapping. - because redundant code sucks (at least twice)

fixwhitespace and dos2unix

(experimental) make the mysterious borders around land/hats/etc that appear on zoom vanish note: not applied to everything yet note: I'll probably merge the two functions that do the same thing (one for 1darray, one for 2darray representation of pixels) into a single function

partial merge of the webgl branch This commit contains the new pas2c conversion tool, the pascal to c build structure and the opengl2 rendering backend. Patch reviewed by unC0Rr.

Fix checker logon process

changing build files without testing the change is fun, isn't it? especially for trivial things that would take less than 10 seconds to test :p

Make poison damage possibly variable (might as well since effects is a count). Scripts might find it handy.

Add check for gear kind of hedgehog on invulnerability effect. This probably fixes bug #766, is similar to change in previous r2a1483d91977 and was introduced by r7d925e82e572

well. let's fix this at least - only apply to gears that are actually hedgehogs, not just ones associated with a hedgehog (which can be pretty much any gear since damage tracking was added)

Convert some ansistrings to pchars

drop redundancies for lua and physfs

fix linking physfs after a run of cmake

happy 10000th commit also fix the travis build by adding a system physfs library

fix build on travis

use bundled physfs on win and osx

fix some travis BUILD_ARGS and add a new one

Merge pull request #11 from LocutusOfBorg/fix-arm Added cast to qreal, avoiding ftbfs due to issue #758

disallow currenthh arrow to go offscreen, always point in direction of the hog - this should make the life of new players easier

position "finger"/pointer over current hog above tags

style tweaks

update copyright to 2014

move room state filter

unCORr likes PChar arrays

In special rooms game starts when all players are ready

* allow telling cmake where to find required fonts in system when user supplies the paths, as suggested by unC0Rr, e.g. -DFONTS_DIRS='/usr/share/fonts/truetype/wqy;/usr/share/fonts/truetype/dejavu' * the build system will use the paths to lookup fonts and install those not found * the engine will load the paths into physfs (mountpoint /Fonts) to make the fonts available at runtime * overriding fonts in packages should be possible again now

allow engine to use symlinked fonts. disallow packages to "overwrite" fonts

PhysicsFS 2.0.0 seems to be sufficient; also fix a typo

add compatibility for physicsfs 2.0

oops, fix build

Also define default value of THEME

simple mechanism to run lua-based test cases. experimental - I will back it out if it turns out to be nonsense

fix seteffect documentation, lua wiki misled me there

ifdef for now

GravRacer, GravHigh, GravMutant, Grav... uhm... shoppamap? Easy! Gravity script could be combined with any other script now. TODO: security concerns? script name to load is passed via game scheme.

Fixed build failure to a missing math library linked with BUILD_ENGINE_C=1 and clang

Free cached ammo menu tex on quit.

'-d' option to pas2c

Parse " and \ escaping in binds

rename NOPASCAL option to BUILD_ENGINE_C

fix missing escape for usernick used in regexp

cosmetics

Oops, forgot 'hg add' this file

call pas2c on hwengine only

Allow logins at any interval, but not more than 2 logins in 30 seconds, 4 in 2 minutes and 6 in 10 minutes.

Oops

Stub for joins monitor which is a replacement to plain ban for 10 seconds system after join

Remove X and Y from the structure since those are misaligned in c code and I failed to do anything about that and they were the last cause of desyncs and only used in 4 places and I'm too lazy

That check was too weird and complicated

Fix these too

Cake falls when loses ground

Fix two desync causes

keep velocity from fluttering between 2 and 3px / ms when falling...

pas2c engine now writes debug log

fix a few uses of VERSION_* checks

Render chars as hex numbers

drop extra spaces from a few CMakeLists.txt files

oh those signed chars

consistent cmake checks

Fix doStepHandlers confusion

use mainstream project name

- Don't define NOCONSOLE - Fix initialization with a pointer to stack (pas2c can't handle typed consts in functions) in uMisc.initModule

add other libav library versions

Prevent assertion on uninitialized variable

21 now

- Fix build via pas2c - Remove pas2c hacks in uLandTemplates

Ban arch.c from source tarball

Fix build (no idea what's going on in this branch btw)

pick random x/y prior to addgear (as generic faller does) to avoid random numbers picked out of order

merge default

Added cast to qreal, avoiding ftbfs due to issue #758 More explanation here https://wiki.debian.org/ArmEabiFixes And on qt-project.org reference website: "Typedef for double on all platforms except for those using CPUs with ARM architectures. On ARM-based platforms, qreal is a typedef for float for performance reasons."

+speedup in binds config (fixes issue #749)

enable verbosity in travis builds

revert 58dee07f7552

hwlibrary also depends on hwengine

correctly set this pascal flag for future compatibility

update copyright year (twice) for Info.plist

set common pascal library search path once

explicitly set linker library path for pascal when deploying an older version

allow specifying a different CMAKE_OSX_SYSROOT

less spam

I'd meant for this to match the frontend

fix git hash reporting

enable travis bot

add more travis tests

Close branch

have revinfo also try to pick up git hashes

Fix building on OSX when autoupdate is disabled

Merge pull request #10 from LocutusOfBorg/fix-avwrapper2 Fixed commit 887b9eca023c94c26daf9607c7ac9b18172c634d

don't stack bye/teleport sounds of hogs (when a team is gone)

Fixed commit 887b9eca023c94c26daf9607c7ac9b18172c634d

backport of r2aa9cf5badfcc978268a9bf06950942f27dfd366 Added cast to qreal, avoiding ftbfs due to issue #758 More explanation here https://wiki.debian.org/ArmEabiFixes And on qt-project.org reference website: "Typedef for double on all platforms except for those using CPUs with ARM architectures. On ARM-based platforms, qreal is a typedef for float for performance reasons."

Merge pull request #8 from LocutusOfBorg/fix-avwrapper-exit-calls Fixed avwrapper exit calls, fixing issue #752

revert 58dee07f7552

Fixed avwrapper exit calls, fixing issue #752

hwlibrary also depends on hwengine

Merge pull request #7 from LocutusOfBorg/fix-FPIC Fixed fPIC link failure with arm and sparc architectures, fixing issue #757

correctly set this pascal flag for future compatibility

Fixed fPIC link failure with arm and sparc architectures, fixing issue #757 Added TargetArch.cmake, from https://github.com/petroules/solar-cmake/blob/master/TargetArch.cmake

unsynced remote changes...

update copyright year (twice) for Info.plist

Merge pull request #6 from LocutusOfBorg/added-travis Added simple travis file for automated github testing

tweak

set common pascal library search path once

Added simple travis file

hey, if unc0rr can screw with gravity...

explicitly set linker library path for pascal when deploying an older version

merge cmake osx sdk changes

allow specifying a different CMAKE_OSX_SYSROOT

Oops, fix message

I'd meant for this to match the frontend

- Utility script for parameters handling - Add varying gravity to Gravity script

fix git hash reporting

Only emit roomNameUpdated when it actually is changed

have revinfo also try to pick up git hashes

Prepend '!' to 42nd scheme parameter in network traffic

Fixed commit 887b9eca023c94c26daf9607c7ac9b18172c634d

Special script parameter variable in game scheme

Fixed avwrapper exit calls, fixing issue #752

Try to keep old weapon sets (not tested at all)

Fixed fPIC link failure with arm and sparc architectures, fixing issue #757 Added TargetArch.cmake, from https://github.com/petroules/solar-cmake/blob/master/TargetArch.cmake

Don't set gravity to normal immediately on turn end, let watchdog do its job if game gets frozen

This is the way I like it: - Only call fpc on hwengine.pas, let compiler rule the dependencies - Make hwengine.pas depend on all other source files, so 'make' always calls fpc

tip is no longer .20 compatible

Some fixes

This is the way I like it: - Only call fpc on hwengine.pas, let compiler rule the dependencies - Make hwengine.pas depend on all other source files, so 'make' always calls fpc

Not a thing which is needed in release tarball

allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2

allow SDL 1.2 to at least do a 32767 map. We probably should add a TryDo somewhere to assert that limit on SDL 1.2 to avoid overflows. Ditto int version for SDL 2

Added tag 0.9.20-release for changeset af0520a6bf00

remove one spurious WARNING tag from cmake message

merge from .20 again

improve OSX SDK selection when build and deploy target don't match

switch every optimization from Os to O2 Also move 'disable optimizations' in the internal pascal file for debug mode.

missed this in the merge. rejected the uGearsHandlersMess changes thinking they were all desyncing, but there was the function rename from uLandGraphics

Some fixes

move CMAKE_Pascal_FLAGS_* flags after enabling the Pascal language or they get overwritten

Not a thing which is needed in release tarball

merge safe fixes from default. physfs include order, tips file length check, server checker fixes, shoppa border fix, land drawing optimisations, physfs off by 1 (probably unused by us), rubber svg image

merge from .20

merge

Uberfix. TODO: ask fpc guys wtf.

A bit of formatting

Be friendly with pas2c

debian is pedantic and isn't aware this is just a dev comment

Delete Application

also make drill much much less likely to explode on shallow angles

reset X/Y too (make drill less explodey. mask fixes revealed an issue)

add the source image so it doesn't get misplaced again

merge further changes from 0.9.20

I don't trust fpc with -O3

Store protocol number in database for replays

Uberfix. TODO: ask fpc guys wtf.

Heh, hardcoded paths :D

debian is pedantic and isn't aware this is just a dev comment

Oops, meant Land

Delete Application

BUILD: make binary/libdir destinations modifiable

BUILD: make binary/libdir destinations modifiable

include paths before platform, move config code around

merge a few changes from 0.9.20

drop 10.4 support, needed after introduction of @rpath

Added tag 0.9.20-release for changeset 2b8f928faa14

correctly handle @rpath

Merge pull request #5 from AMDmi3/freebsd Fixes required to build hw on freebsd

merge

give cake a tiny initial push so it does something useful in zerog

Prevent div by zero

skip writing the full destination name

merge w/ 0.9.20