merge

Allow JOINED message in lobby

fix FindFFMPEG

I shouldn'tve tracked this really, I should have just rejected that part of the transplant

Simplified Chinese Translation update

improve html links + small bugfixes

Final checkpoint w/ campaign.

Check if 'for' cycle body is executed at least once

FindFFMPEG.cmake (used only for frontend for now). +fix for linux (older version of Qt)

All missions: switched blood needers with meatbags in dialogues

Don't accept room messages when not in room state. Not tested even if it builds.

merge

Mission 3: Added initial FirePunch

When exiting a room where one was host, server sends a REMOVE_TEAM for the local team. It appears that this loop would not break in that case. Add a log message and a break. (I've hit a frozen frontend twice now)

Mission 2: fixed ammo menu bug

Keep room till last player quits

Mission 7: increased distance between Leaks and the princess, fixed EmitDenseClouds typo

er. more like this.

Mission 5: fixed a few bugs that came with the update (ammo menu bug and initial gear elimination bug)

Allow scripting to delete gears

Changed a line in Mission 2 dialogue...

oops

Fixed crashes in mission 3 after RestoreHog

Keep inlining

Modified missions to be compatible with the merge Removed empty functions

More mess in pas2c: - Store rendered type declaration of identifier - Convert 'for' cycles properly (well, not sure, but I tried :P) into 'do .. while()'

Mission 3: Modified onPrecise (added out-commented debug code)

revert 3188794b9d87. does not do what I'd like.

Hedgeroid: Frantic scrabbling toward the deadline - Added activities for weapon/scheme editors (unfinished) - Completed tablet version of netroom activity - Added map preview - Fixed default team files having the wrong names - Restructuring - Updated frontlib JNA bindings to respect the latest frontlib changes

improve video uploading

Mission 3: reduced enemy turn time, fixed other HideHog problems

oops

frontlib: Moved mapname sending to the end of flib_netconn_send_map

merge

Solved issues with HideHog in mission 2 and 3

no cake for youuuuu

engine: Added JNI-compatible function to start map generation

Modified AddAmmo()-s in consideration of gfPerHogAmmo in mission 2

Introduce 'a' and 'u' client flags to mark admins and authenticated users

frontlib: - Removed metascheme-reading and made metascheme a constant instead - Removed reference counting in favor of copying (less confusion about ownership)

Removed debug code.

Add bot level to CPU flag

frontlib/Hedgeroid: Modified frontlib build in Hedgeroid so it works without having to copy the source dir.

Mission 7: Added a visual gear to mark height, changed ShowMission to be more precise.

Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop

Hedgeroid: fix wrong filenames due to windows not treating files case sensitive

Fixed a typo, frontend is now working properly

Also flag cases. Side effect might be some odd collision in rare cases w/ portals. Also, might cause unexpected collisions w/ cases in TestColl - although we could add a proximity check to the flag there, or simply switch to TestCollExcludingMe again. uCollisions seems mismatched w/ AI TestColl anyway. Possibly r+1+r vs r+r for gear diametre.

Removed useless cast in cmdlineClient

Silly add to facilitate transplant

oops

Hedgeroid: - (hopefully) completed the frontlib JNA mappings - added documentation - Changed more code to use frontlib for ini reading/writing - tried to make everything work again that was working before - Teamlist can now be used to add and remove teams - Netplay now correctly handles team additions when being room chief - Fixed TeamCreatorActivity so that editing teams works

Mission 7: changed enemy health, ammos, fixed crashes, princess no longer hidden

unbreak AI. remove inits from uLand

frontlib improvements: - Added README with overview documentation - Improved code documentation/comments - Added flib_gameconn_send_quit to gracefully exit a running game - Changed the type of some size variables to size_t - Fixed starting a mission/training sending the mission script like a multiplayer script - Removed reference counters from flib_scheme and flib_map - Removed INGAME state from netconn (there is no useful difference to ROOM state) - Added extras/jnacontrol.c to warn when functions signatures used by Hedgeroid change - Other small code improvements

Forgot to add mission 10

An experimental template to abuse this ability. A quick doubling of the "Islands" crazy template

frontlib: Added functions to query important constants from the library

Added a story ending mission/cut-scene

First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.