mergeception

merge

merge

Merge pull request #21 from LocutusOfBorg/exclude-git Excluding .git directory from the source tarball creation

map halt(t) to exit(t) rather than assert(0). all test cases except gravity pass with pas2c now

Excluding .git directory from the source tarball creation

more fixing and allow pas2c to run tests. they will still fail though - engine does not exit with the specified exit codes, also data types are messed up

Merge pull request #20 from LocutusOfBorg/tests pull request merge: add testsuite, exclude pas2c build from testing for now

some more fixing

Disable testing if BUILD_ENGINE_C=ON (they fail)

fix some pas2c related issues

Verbose tests

fix invulnerability check for shotgun

Add testsuite

zopfli compression for images where the win was 10+% and the files would be included in the release

finnish translation fixes

Added TechRacer (still needs a lot of love), updated changelog

new implementation for Lua API DismissTeam. all hedgehogs of the team are now removed without using teamgone

move fixed test case out of 'todo'

Skip checkin on collision for frequently spammed gear types if collision gets huge instead of trying to delete mines.

move failing test into "todo" folder so that it can be excluded with ctest -E '^todo/'

Add scheme and weaponset for Construction Mode.

test case that spawns 2000 mines in a pit. run with ctest -R mines # only works if cmake was ran after pulling this commit

fix for issue #828: Manual placement animation is drawn twice

merge

make seduction thaw a frozen hog.

prevent seduction of frozen hogs

finnish translation update

small cleanup

Lua API: onSpritePlacement(spriteId, centerX, centerY) onGirderPlacement(frameIdx, centerX, centerY) onRubberPlacement(frameIdx, centerX, centerY)

add translation for "New Account" and strip trailing whitespaces

finnish translation update

update german translation

this string was untranslatable. thanks to siilimestari for pointing that out

don't flash frontend on hilight - while in-game

fix pas2c(?)

remove unimplemented ban action from user context menu

fix some indentation

fix view limits in stereo 3d

fix for issue #234 - the framebuffers for side-by-side and top/bottom had alpha channels. so when sprites with alpha were blended into the framebuffer it would blend the sprite pixel alpha with the fb pixel alpha

display airplane altitude indicator also with drill strike and air attack - when more-wind is activated

crate hat. partly based on Hadashi's draft

changelog

desync fix for Continental Supplies

Avoid promoting violence to hedgehogs. At least once a year.

tomato hat

password flag was the wrong way around

fix some nasty rendering issues reported by Nexia - thanks a lot!

policegirl hat

add feature size slider to disable list

tweaking changelog

Attempt on a custom combobox

make gear ability to speak somewhat less ironic

getScriptsList implementation

update changelog a little

merge default

chat: fix some glitches, add /togglechat command for changing chat visibility

fixes to chat input history: remember all inputs, don not remember duplicates

fix underwater-skipping bug and make air-strike missiles submersible when fired from within weSea

This should work, can't test: room flags passed in room info message instead of just 'in-game' state, including 'in-game', 'restricted joins', 'registered only' and 'passworded' flags

some whitespace fixes

some gravity script fixes

add bounce effect to bouncy world edges

I'm such a dirty boi... cleaning up my own mess a little

fix health crate collision

This helps too

hmpf

Oops

Fix difference in map generation between fpc and pas2c engine

per template dab vals

oups

modestly randomise dab, bump points again.

Model file for coverity checks

[PAS2C] Don't generate result variable for trivial functions consisting of single exit() call

Fix use of uninitialized variable

- Comment out getrandom in addgear for hedgehog, causes preview-game desync - New formula for minDistance - Some trials on dab formula, commented

Fix warnings given by 32-bit fpc

oops

lfObjMask is only used when flood filling

flip slider for perlin

Fix some stuff from coverity

check for new Qt req in cmake files

automatic RTL based on locale

raise/fix build reqs

fix one of my translation related brainfarts

You can't just exit function which is supposed to do copy

strip styling for the slider, since it won't be put over the button

Since unc0rr is quiet, try to avoid the assert

- Not only that, nemo, not only that (.cpp) - Also less confusion (.hs)

oh. one more param

Copypasta to hopefully hook up net sync correctly.

hookup perlin

Fix use of uninitialized variables (fixes straight lines in maze gen aswell)

Fiddling with slider, unbreak maze. Next to mess around w/ perlin params.

merge...

Merge pull request #19 from LocutusOfBorg/update-translation Update translation

Update italian translation

Remove obsolete translations

Partially hook up feature size so horrorcat has something to test.

sheepluva and unc0rr didn't like the idea of slider over preview.

Merge pull request #13 from LocutusOfBorg/fix-license Fixed many license problems, spotted by licensecheck program

Forgot the mission description.

Merge pull request #14 from LocutusOfBorg/fix-desktop Fixed desktop file https://wiki.debian.org/Games/JessieReleaseGoal

Merge pull request #18 from LocutusOfBorg/update-translation Update italian translation

swap off/on

Merge of unc0rr's last change against default.

Added two copyrights on gameServer

Fix map preview desync

A slider for controlling things like bumpiness of map and tunnel sizes.

Update italian translation

Added copyrights to gameServer directory

Fixed desktop file By adding an xpm icon

Scripts list module

Updates to german translation

Theme can be changed

Add Auto Camera messages to localisation

Allow using right button or wheel to change team color

Remove loc() called with a variable.

Show team color in teams list widget, also allow to change it on mouse click

Update Qt strings too

- Store index of color instead of its value - Reset game config when switching pages

Update locale to latest strings. This does NOT include the string format improvement.

- Allow to delete teams from config - Manage team colors (internally, no gui so far) - 'Play' button on local game page (works!)

Add Construction Mode (probably needs testing / fixing)

Perform some checks on team add

cosmetic disabling of clouds with sea edges and underwater theme

Teams widget now allows to add and remove teams (basic implementation, no checks performed, no colors, no hedgehogs)

Remove switching of hog's hat to chef. do it in draw instead.

Load and show local teams list

Revert hog tinting from rdb65298717da since it wasn't sufficiently complete for a release. More sprites need converting, and there's a slight bug in hog tinting, for away hogs with hats I believe.

- Implement getTeamsList (not tested) - Some small fixes

allow toggling ammo menu while NoTeamOrHH, as suggested by unC0Rr

Filter out garbage from themes list

find and add lua tests automagically

flib provides theme icons, qmlFrontend shows them

allow hogs to repeatedly enter portals placed on the ground

Themes model, also add some files I forgot to add previously

some unfinished stuff

Quick Game PoC

another small rendering tweak/fix

Getter and setter for seed

simplify {$IF that pas2c did not seem to understand

More refactoring: move PoC preview getting code into flib

also fix top/bottom and side-by-side rendering (got also broken in webgl branch)

Some refactoring

fix stereoscopic rendering leading to screen "running away to the left" since webgl merge (due to bug in webgl branch). reason was incomplete change of name/scope of variable stereoDepth -> cStereoDepth

- Get rid of engine's PathPrefix and UserPathPrefix - Some refactoring

fix mapgen of other scripts too

- Pages - Animations on buttons hovering

use constants for mapgen, expose those to lua

flib: - Ability to pass raw data via IPC qmlfrontend: - Pass message received by callback through event loop to handle it in main thread - Get preview image from engine on button click and render it in Image object

some more splash code tweaking/fixing

Move away from passing shortstrings into C code, now IPC works

tweak splash position

- Remove --port command - Some refactoring here and there - Try to get preview from engine, which doesn't work due to some ABI mismatch, probably shouldn't try to pass string255 to pascal

☹

Strip some HWLIBRARY ifdefs

climb home training/multiplayer

- More flib IPC routines - Rework engine's uIO to use new IPC mechanism

Make it a bit easier/safer to build ice bridges

Some work on new IPC, built with the use of mutexes and condition variables

update manpage

Some more of ignoration

mention the hwplay:// thing in --help

Basic layout of frontlib, some more sdl bindings

fix for < LocutusOfBorg1> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=760776

- Fix arguments parsing in engine assuming paramcount > 0 - Pass "--help" for testing

update with new winners

Let's get it started

- Revert try to add local team on rejoin - Don't allow more than 8 teams in local game widget

This should make frontend aware of your own teams in game on rejoin

Also pass maze_size parameter to perlin generator in game mode

Also convert the message if current team is gone

rename of variable typo for readability

ok. that's weird. I wonder if I was having non-clean build issues last time I tried messing with this. that could explain why my changing offsets didn't do anything.

Better diagnostics in log, even though it shouldn't matter anymore

Fix map contrainer widget look in russian locale

Fix issue #813

- Support for pausing multiplayer games - Some code cleanup

Add separate option for perlin gen

don't render crosshair/laser during kamikaze

comment out some debug output code

part of patch in issue #803 (ty) - this hopefully should fix issues with cmake Makefiles trying to run "Qt4::lrelease" in the shell

Apply new distortion on maze gen

Smooth perlin's outline

add bug reference to explain the qt version check on osx

I can't read. sry

contradiction with a hint of BS

this should fix the cmake 3.0 issue. thanks to Spacey for reporting

tweak test

add test I used for bisecting

I a recent commit I caused flames to use uninitialized values. that lead to fire burning slow and desyncs. this commit fixes/reverts this

Fix PlaceSprite

Challenge map #12

text visibility "fix"

do not render chat if HUD is hidden

Oops

fix flake angles

"fix" sinegun

should be RGBA, not RGB

Using blended makes smilies and CJK less hideous.

One more map

Forced sprites placing mode, exposed to scripts (not tested at all)

Oops

Official racer map #11

Racer challenge map #10

burst drowning gears into bubbles after timeout

drowning tweaks

cont.

simplifying some code

some adjustments and support for mirrored world rendering. disabled atm though, I think it is more confusing than helping

one finger ought to be enough for everybody

tweaks

merge (even although I rebased... ok)

for real this time

fix pas2c build

WIP: weSea tweaks, functional and visual

Treat "out" as "var"

simplify some code

Restore teams in teams list on rejoin, should fix issues with second rejoin.

Don't pick up own team if only recieved synced teamback message. Fixes second rejoin desync (untested).

Fix some issues with rejoining (rejoining client still desyncs though)

cpack: do not exclude liblua from release tarball It was inadvertedly removed in rb769a8e38cbd.

add assignment I forgot

lua api: allow to specify layer when adding visual gear

Make team disappear after 3 turns in 'gone' state

Fix issues with unsynced F and G messages being lost if current team which is supposed to convert them to synced f/g quits

Finish implementation of ability to take control over your team after being disconnected. Completely untested.

Fix build, and also make protocol a bit more consistent and flexible (only in docs though, to be implemented)

Ukrainian translation update

2x2 to avoid engine bug

couple of custom sprites for mikade to override in a lua sidecar if he wants to

Inform engine if player is back after being disconnected

Allow server admins to join room of another protocol version

Fix issue #791: - Send drawn map data on room creation - Don't use MAP parameter to deduce mapgen when it is one of "+rnd+", "+drawn+", "+maze+"

Racer challenge map #9

merge time. it's been a while

fix search&replace whoopsy

fix camera now being centered on land when game starts

cleanup and lol

move DrawWaves to uRender

Compressing and encoding

more tweaking

reuse buffers

render tweaks

tweak/refactor how water is drawn

tweak code of DrawTextureFromRectDir a bit, removing issue with different x offset depending on dir. also removing the workaround wrt that issue in the frozen hog code

Code drawn map in haskell \o/ (not finished, todo: compressing and base64 encoding)

fix typo that caused visual glitch in water body (e.g. visible on that particular screenie on bottom right corner)

"documentation"

fix some (newly introduces) glitches with normal water

fix pas2c build

little visual tweak to weSea rendering

adding some arrow

speed up tests

Qt-Frontend: update description of findhh to better reflect current behavior. thanks to the friendly reminder in issue #805

remove unneeded import

tweaking hogpointer position again

various tweaks

tweak engine segfault capabilities

Revert all recent sheepluva's work

fix videorec build

whoops. an "end" moved there

do not get stuck on "in game..." page just because of game crash. output a message instead. could still need some tweaking, but a man gotta sleep. and sheep too...

clean up halting a little

enforce style on message boxes some more

fix gl2 build, further rendering cleanup WIP, also new chat command: /debugvl

tweak how chat lines are rendered

huh? me? nono, don't mind me. I'm just here to clean up.

some rendering tweaks

make mouse cursor size same, no matter what zoom level is used...

grmlgrmlpas2cgrmlgrml

make using the teleporter a bit less challenging

fix pas2c build for real this time...

I misscounted

fix some pas2c related overloading issue

whoops, pas2c I owe you

state file name and line number in lua error messages

racer: if hog starts race without any weapon selected, select whatever is first

lua api: SetNextWeapon()

lua api: DismissTeam(teamname)

lua api: SetWeapon(ammoType)

fix broken speech bubble display in chat. caused by r1a6b9a98147c one line was forgotten when moving some code

more of the same

fix TryPlaceOnLand's ambiguity/messup wrt to making terrain indestructible (had boolean parameter for indestructible AND landflags parameters that could contain lfIndestructibly)

further WIP (better error messages)

placeSprite accepts any amount of landflags now; further WIP wrt cleanup/fixing

expose lfIndestructable, lfIce and lfBounce

Fix pas2c build

make enums crash-safe. and other fixes

WIP: PlaceSprite for lua API. also changed PlaceGirder so that it will return true/false for whether placing was successful too

fix possible engine crash that a lua script could cause by passing an invalid geartype to addgear

tiny lua documentation fix

uWorld does not require uMatrix anymore

fix hint and gl2 build. NOTE: this does not change that GL2 segfaults right away. that is an issue that dates back at least 50 commits, but most likely even back to the webgl merge. I guess nobody actually tried to run hedgewars in GL2 since back then :P

RAR: cleaning up a bit of the IFDEF-clusterf*ck

Fallback to old heuristic if not pit position

update viewlimits after screen/window resize

Allow barrels to spawn in U-shaped pits in stable position

whoops, forgot to include this file in commt

superminor tweaks

<koda> wut, chats as commit mesages?

"<unC0Rr> could also refuse to update textures when land changes if the tile isn't visible" You had me at "refuse" <3

figure out visible land tiles in advance

some minor tweaks and stuff

darken wrapped areas, which was a very nice suggestion by nemo

use cScaleFactor where I incorrectly used the variable zoom in the past. i was young and needed the money

here a personal experimental mockup of how I imagine wrapping world edges should look like. bouncing one could be similar just with mirrored stuff. please test and share opinion. note: you might wanna disable auto-cam

small hat loading tweak

load the girder.png of a theme a maximum of 1 times (minimum of 0), instead of once per generated bridge

clean up image loading a bit. gets rid of useless "Passed NULL data source" or PhysFS file not found errors

committing patch from issue #798, as requested by unC0Rr

fix cabal build (on linux)

fix for "Unexpected semi-colons in conditional" issue, as reported by YuGiOhJCJ (see http://www.hedgewars.org/node/5860 ) big thanks to burp for helping to identify and fix this issue

Some further work on map optimizer

tweak untint a little (especially in connection with GrayScale)

theme configurable sudden death music. untested

allow teleporting outside Land[]

escape info message arguments, fixes issue #801: Frontend parses INFO command output as html

collision indicator on failed girder placement (especially useful with rubberband I guess). still needs some tweaks but I am going to bed now :P

disable these weaponset flags. they bug up highlander and otherwise have no useful impact on the script.

get rid of fpc warnings/hints

Fix some of issues found by coverity

Official racer challenge map #8

Inform frontend of lines which didn't change anything on the map in advanced drawn maps mode

Fix some pas2c engine warnings

Count number of pixels changed during draw

Small optimization (no need to draw last point of the path)

Oops, should stop coding at night

Fix fpcrtl_strncompareA, also replace strncmp with memcmp for more efficiency

Support OR operator in $IFDEF. Fixes pas2c builds.

rolling back the rest

rolling back (most of) lua 5.2 compatibility patches. hopefully that will unbreak unC0Rr's lua issues for now.

sekret feature (test commit)

- Increase limits on number of mines and explosives in game scheme - Stop trying to place mines/explosives after 4 fails to place in row

Drawn maps optimizer - first steps: - Break paths into segments

Fix crashers in rc plane code

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