| Sat, 03 Nov 2012 10:18:44 -0400 |
nemo |
more fixes
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 18:50:03 -0400 |
nemo |
Script typos
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 16:26:51 -0400 |
nemo |
update lua (remove duplicate strings, esp in fr.lua - mostly my fault - and add a bit more escaping to the crude script)
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 19:12:22 -0400 |
nemo |
5 files that fail to load in libpng1.5 - ran convert against libpng1.2 then pngcrushed 'em to strip for good luck
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 00:06:11 +0100 |
koda |
many osx sparkle fixes
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 20:59:57 +0100 |
Xeli |
remove mobile ifdefs, replace writeLn's for WriteLnToConsole
|
changeset |
files
|
| Sun, 04 Nov 2012 23:56:27 +0400 |
unc0rr |
Wee, now frontend is able to load translation file
physfslayer
|
changeset |
files
|
| Fri, 02 Nov 2012 00:03:56 +0100 |
koda |
fix name
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 20:57:20 +0100 |
Xeli |
merge from hedgeroid, includes Medo's work from GSoC
|
changeset |
files
|
| Sat, 03 Nov 2012 00:34:35 +0400 |
unc0rr |
Merge with default
physfslayer
|
changeset |
files
|
| Thu, 01 Nov 2012 21:42:06 +0100 |
koda |
merge from default
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 10:17:52 +0400 |
unc0rr |
oops, fix incorrect room owner name in ROOM UPD command again
|
changeset |
files
|
| Thu, 01 Nov 2012 16:22:40 -0400 |
nemo |
Added tag 0.9.18-release for changeset 2fc02902c7cb
0.9.18
|
changeset |
files
|
| Fri, 02 Nov 2012 10:07:30 +0400 |
unc0rr |
oops, fix incorrect room owner name in ROOM UPD command
|
changeset |
files
|
| Thu, 01 Nov 2012 16:22:07 -0400 |
nemo |
Removed tag 0.9.18-release
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 15:54:05 -0400 |
nemo |
fix for forts mode *sob*
0.9.18 0.9.18-release
|
changeset |
files
|
| Fri, 02 Nov 2012 00:09:40 +0400 |
unc0rr |
Send ROOM UPD message when team is added/deleted from room, and when game starts or finishes
|
changeset |
files
|
| Thu, 01 Nov 2012 13:22:52 -0400 |
nemo |
Added tag 0.9.18-release for changeset be11c26a3a0b
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 08:59:16 -0400 |
nemo |
Small fixes to b-day image. For next year I 'spose
|
changeset |
files
|
| Thu, 01 Nov 2012 13:22:17 -0400 |
nemo |
Removed tag 0.9.18-release
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 06:10:50 +0100 |
koda |
Backed out changeset 5d00c28059e3 - enable the feedback button again
|
changeset |
files
|
| Thu, 01 Nov 2012 14:31:53 +0400 |
unc0rr |
Fix 0.9.18 desync:
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 04:26:36 +0100 |
koda |
merge again
|
changeset |
files
|
| Thu, 01 Nov 2012 04:25:03 +0100 |
koda |
updated Info.plist
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 01:35:59 +0100 |
koda |
merge with 0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 01:35:04 +0100 |
ChipHome |
small it.txt update
0.9.18
|
changeset |
files
|
| Mon, 21 Nov 2011 21:23:23 +0100 |
sheepluva |
this should fix the highlighting failz with non-lowercase player names like the one CheezeMonkey ran into.
0.9.18
|
changeset |
files
|
| Thu, 01 Nov 2012 01:05:35 +0100 |
koda |
Added tag 0.9.18-release for changeset 2f203395baca
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 16:39:07 -0400 |
nemo |
!@#$
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 16:35:43 -0400 |
nemo |
add missing cmakelists.txt, move portal mission graphic to correct dir
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 15:54:55 -0400 |
nemo |
merge trunk w/ final 0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 15:31:18 -0400 |
nemo |
merge w/ trunk
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 15:29:16 -0400 |
nemo |
update lua loc, adjust cleaver in ammo sets
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 15:21:29 -0400 |
sphrix |
portal challenge
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 15:10:21 -0400 |
nemo |
birthday style
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 22:59:18 +0400 |
inu |
- Fix for little mistakes (applied to every hedgewars_*.ts file).
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 14:51:03 +0400 |
unc0rr |
Update ai actions tracing subsystem
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 14:50:45 +0400 |
unc0rr |
Fix white background in players list on halloween, christmas and easter
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 12:52:53 +0400 |
unc0rr |
Merge from default
0.9.18
|
changeset |
files
|
| Wed, 31 Oct 2012 16:52:31 +0400 |
unc0rr |
Clear in-game flag when user joins room
|
changeset |
files
|
| Tue, 30 Oct 2012 12:50:50 +0100 |
koda |
libav name refactor
|
changeset |
files
|
| Tue, 30 Oct 2012 02:22:54 +0100 |
koda |
another stake at variable pre-initialisation - we lost preview logging in the course
|
changeset |
files
|
| Tue, 30 Oct 2012 18:01:11 -0400 |
Vatten |
apparently an older version was provided earlier and this one is newer and theoretically desync free. untested.
0.9.18
|
changeset |
files
|
| Mon, 29 Oct 2012 20:37:57 -0400 |
nemo |
fix hat names. more efficient killing off of limited hogs (takes too long to wait otherwise)
|
changeset |
files
|
| Tue, 30 Oct 2012 14:40:40 -0400 |
Vatten |
new script specialising in altering weapon behaviour
0.9.18
|
changeset |
files
|
| Tue, 30 Oct 2012 00:17:23 +0100 |
koda |
merge from stable
|
changeset |
files
|
| Tue, 30 Oct 2012 00:13:22 +0100 |
szczur |
polish language update (+ closes issue 322)
0.9.18
|
changeset |
files
|
| Mon, 29 Oct 2012 18:20:08 -0400 |
nemo |
consistent line endings
0.9.18
|
changeset |
files
|
| Mon, 29 Oct 2012 18:20:08 -0400 |
nemo |
consistent line endings
|
changeset |
files
|
| Mon, 29 Oct 2012 17:38:54 -0400 |
nemo |
fix reserved hats from scripting
0.9.18
|
changeset |
files
|
| Mon, 29 Oct 2012 17:38:54 -0400 |
nemo |
fix reserved hats from scripting
|
changeset |
files
|
| Mon, 29 Oct 2012 17:17:26 -0400 |
Star |
remove cleaver gradient
0.9.18
|
changeset |
files
|
| Mon, 29 Oct 2012 17:17:26 -0400 |
Star |
remove cleaver gradient
|
changeset |
files
|
| Mon, 29 Oct 2012 21:46:50 +0100 |
koda |
merge trunk in 0.9.18
0.9.18
|
changeset |
files
|
| Mon, 29 Oct 2012 21:49:09 +0100 |
koda |
dev version bump, for 'stable' commits please use 0.9.18 branch
|
changeset |
files
|
| Mon, 29 Oct 2012 16:26:26 -0400 |
nemo |
disable this block since it doesn't fit star's new graphic. doesn't show up often anyway, since unc0rr changed gst clearing
|
changeset |
files
|
| Mon, 29 Oct 2012 21:14:48 +0100 |
koda |
use VideoItem::prefix instead of VideoItem::name as suggested by Stepan777
|
changeset |
files
|
| Mon, 29 Oct 2012 16:23:45 -0400 |
Star |
tweaked hedgehog sprite (gstLoser and such) this version tries to clean up a bit of the pixelation from having not been edited in inkscape
|
changeset |
files
|
| Tue, 30 Oct 2012 00:16:42 +0400 |
unc0rr |
Change messages a bit
|
changeset |
files
|
| Tue, 30 Oct 2012 00:10:31 +0400 |
unc0rr |
Mutant script
|
changeset |
files
|
| Mon, 29 Oct 2012 14:22:29 -0400 |
nemo |
Fix training script positions altered by variable land dimension change. Issue #453
|
changeset |
files
|
| Mon, 29 Oct 2012 18:17:36 +0100 |
Xeli |
Fix 440, used 'grave' rather than '`' in default binds
|
changeset |
files
|
| Mon, 29 Oct 2012 10:39:46 -0400 |
nemo |
darken and contrast the gray images to distinguish more easily from pink
|
changeset |
files
|
| Mon, 29 Oct 2012 09:35:16 -0400 |
nemo |
Arbitrarily tweaked to not firepunch loose, and to increase chance of bazooka doing it to about 20%
|
changeset |
files
|
| Mon, 29 Oct 2012 14:32:54 +0400 |
unc0rr |
Improve TestSniperRifle a bit
|
changeset |
files
|
| Mon, 29 Oct 2012 05:06:15 -0400 |
nemo |
Allow cleavers to be knocked loose by explosions. Probabilities might need tweaking.
|
changeset |
files
|
| Mon, 29 Oct 2012 12:51:21 +0400 |
unc0rr |
boo, koda
|
changeset |
files
|
| Mon, 29 Oct 2012 05:12:24 +0100 |
koda |
this commit is a no-op
|
changeset |
files
|
| Mon, 29 Oct 2012 04:26:44 +0100 |
koda |
close engine shortcut, from the discussion in issue 317
|
changeset |
files
|
| Mon, 29 Oct 2012 00:36:40 +0100 |
koda |
disable fps widget when recording
|
changeset |
files
|
| Mon, 29 Oct 2012 00:20:34 +0100 |
koda |
add videorec button descriptions and delete screenshot when video is deleted (issue 427)
|
changeset |
files
|
| Sun, 28 Oct 2012 23:53:38 +0100 |
koda |
apparently we are forced to use a (dummy) callback for glut 3.0 compatibility
|
changeset |
files
|
| Sun, 28 Oct 2012 22:52:08 +0100 |
koda |
increase framerate and bitrate (issue 427)
|
changeset |
files
|
| Sun, 28 Oct 2012 17:31:54 -0400 |
nemo |
double cleaver rotation speed, also make spin direction dX dependent.
|
changeset |
files
|
| Mon, 29 Oct 2012 00:03:42 +0400 |
unc0rr |
Slight update of russian translation
|
changeset |
files
|
| Sun, 28 Oct 2012 23:43:56 +0400 |
unc0rr |
Choose first unused color for added team (addresses issue 431) + other small changes
|
changeset |
files
|
| Sun, 28 Oct 2012 15:18:26 +0100 |
Xeli |
add SDL as an dependency
hedgeroid
|
changeset |
files
|
| Sun, 28 Oct 2012 20:35:08 +0100 |
sheepluva |
let animation objects delete themselves after they are not being used anymore
|
changeset |
files
|
| Sun, 28 Oct 2012 15:15:39 +0100 |
Xeli |
revert tremor back to a version before koda broke it ;p
hedgeroid
|
changeset |
files
|
| Sun, 28 Oct 2012 12:36:08 -0400 |
nemo |
more like here
|
changeset |
files
|
| Sun, 28 Oct 2012 15:12:37 +0100 |
Xeli |
merge Medo's GSoC work
hedgeroid
|
changeset |
files
|
| Sun, 28 Oct 2012 11:04:03 -0400 |
nemo |
Workaround for visual bug. Issue #442
|
changeset |
files
|
| Sun, 28 Oct 2012 13:28:23 +0100 |
Xeli |
merge hedgeroid branch with tip
hedgeroid
|
changeset |
files
|
| Sun, 28 Oct 2012 04:57:11 +0100 |
koda |
add flag of the soviet union (issue 297)
|
changeset |
files
|
| Sun, 28 Oct 2012 04:47:30 +0100 |
koda |
fix for issue 432, show ready toggle for room admins, set them always ready, keep the blinking option
|
changeset |
files
|
| Sun, 28 Oct 2012 04:31:27 +0100 |
koda |
merge
|
changeset |
files
|
| Sun, 28 Oct 2012 04:31:16 +0100 |
koda |
forgot to remove these files when reverting tremor
|
changeset |
files
|
| Sun, 28 Oct 2012 04:28:39 +0100 |
koda |
cleanup in initEverything and freeEverything
|
changeset |
files
|
| Sun, 28 Oct 2012 04:00:07 +0100 |
koda |
revert r767d3c4153a1 this tremor implementation is buggy
|
changeset |
files
|
| Sun, 28 Oct 2012 03:48:37 +0100 |
koda |
* fix initialisation, preload values and then read args
|
changeset |
files
|
| Sun, 28 Oct 2012 03:12:49 +0100 |
koda |
disable audio dampening on mobile
|
changeset |
files
|
| Sun, 28 Oct 2012 00:16:59 +0200 |
szczur |
polish translation update (bug448)
|
changeset |
files
|
| Sat, 27 Oct 2012 21:56:58 -0400 |
nemo |
issue #428 - move power to after team labels
|
changeset |
files
|
| Sat, 27 Oct 2012 21:40:37 +0200 |
sheepluva |
german engine translation update
|
changeset |
files
|
| Sat, 27 Oct 2012 21:24:17 +0200 |
sheepluva |
german Qt-Frontend translation update
|
changeset |
files
|
| Sat, 27 Oct 2012 22:23:41 +0400 |
unc0rr |
- Better fix than the one from rc7f5c3bd7f8c. Now just scrolling back till net/nettype/main page. Not tested aswell.
|
changeset |
files
|
| Sat, 27 Oct 2012 20:05:52 +0200 |
Xeli |
apply unC0Rr's fix for 435 to landscape and non numbered ammomenu
|
changeset |
files
|
| Sat, 27 Oct 2012 21:39:09 +0400 |
unc0rr |
Fix issue 435, and also unreported bug when 2 or even 4 entries could have selection at the same time in weapons menu.
|
changeset |
files
|
| Sat, 27 Oct 2012 19:27:20 +0200 |
sheepluva |
these files had the executable flag/permission set
|
changeset |
files
|
| Sat, 27 Oct 2012 11:33:38 -0400 |
nemo |
Issue #443 - change in syntax for effects
|
changeset |
files
|
| Sat, 27 Oct 2012 14:50:38 +0200 |
koda |
minor macro cleanup
|
changeset |
files
|
| Sat, 27 Oct 2012 14:28:52 +0200 |
ChipHome |
updated italian translation (#447)
|
changeset |
files
|
| Sat, 27 Oct 2012 01:16:35 +0400 |
unc0rr |
Clear hedgehog's gear Power value when switching. Should fix issue 446 (not tested, but looks obvious).
|
changeset |
files
|
| Sat, 27 Oct 2012 00:53:23 +0400 |
unc0rr |
Oops, fix room players list emptyness
|
changeset |
files
|
| Sat, 27 Oct 2012 00:39:27 +0400 |
unc0rr |
This should cover all entries from issue 438
|
changeset |
files
|
| Sat, 27 Oct 2012 00:27:15 +0400 |
unc0rr |
Fix cake splashing bug (issue 429)
|
changeset |
files
|
| Sat, 27 Oct 2012 00:20:31 +0400 |
unc0rr |
No hacks! Fix issue 437
|
changeset |
files
|
| Fri, 26 Oct 2012 20:37:18 +0200 |
sheepluva |
fix for issue 441 ("Cannot overwrite default weapon set 'Default'!" message when no change to weapon set was made)
|
changeset |
files
|
| Fri, 26 Oct 2012 14:06:42 -0400 |
nemo |
Set minimums on a few values to avoid camera zooming out past them. partly Issue #430. Might be worth defining a new constant for this.
|
changeset |
files
|
| Fri, 26 Oct 2012 13:50:03 -0400 |
nemo |
eh. might as well toss this in for reference purposes
|
changeset |
files
|
| Fri, 26 Oct 2012 13:47:16 -0400 |
nemo |
Fix bad loc calls in campaign, rope training. Regenerate lua. Untested.
|
changeset |
files
|
| Fri, 26 Oct 2012 19:38:25 +0200 |
sheepluva |
fix for the root cause of issue 434 (previous pages being visible in the background)
|
changeset |
files
|
| Fri, 26 Oct 2012 12:42:56 -0400 |
nemo |
issue #445 spin math
|
changeset |
files
|
| Fri, 26 Oct 2012 17:21:28 +0200 |
sheepluva |
disable F5 key and data refresh
|
changeset |
files
|
| Fri, 26 Oct 2012 17:05:12 +0200 |
sheepluva |
rollback of r08642c7da4a3b5e05be51a8b45995e799bbc4bbf ("add DLC button to net game room")
|
changeset |
files
|
| Fri, 26 Oct 2012 10:31:26 -0400 |
nemo |
missed this one when fixing regular flakes. issue #444
|
changeset |
files
|
| Fri, 26 Oct 2012 14:13:09 +0100 |
koda |
0.9.18 release branch
0.9.18
|
changeset |
files
|
| Thu, 25 Oct 2012 13:55:55 -0400 |
nemo |
Restore -gv, limit points to template dimensions
|
changeset |
files
|
| Thu, 25 Oct 2012 13:30:08 -0400 |
nemo |
-gv was causing broken behaviour
|
changeset |
files
|
| Thu, 25 Oct 2012 11:57:06 -0400 |
nemo |
add gsoc students. also sphrix to translators
|
changeset |
files
|
| Thu, 25 Oct 2012 05:06:00 +0200 |
koda |
countless small optimisation for cmake, output messages are now coherent (mostly) and the options get fully respected (eg. skipping library search if not activated)
|
changeset |
files
|
| Thu, 25 Oct 2012 01:16:13 +0200 |
koda |
finally videorec on osx
|
changeset |
files
|
| Wed, 24 Oct 2012 18:44:23 +0100 |
koda |
I hate Windows and it hates me...
|
changeset |
files
|
| Wed, 24 Oct 2012 17:24:04 +0200 |
Randy |
add surname to credits
|
changeset |
files
|
| Wed, 24 Oct 2012 14:55:31 +0100 |
koda |
support video recording on windows with automation and headers
|
changeset |
files
|
| Wed, 24 Oct 2012 13:21:18 +0100 |
koda |
enable png support under win32
|
changeset |
files
|
| Wed, 24 Oct 2012 10:23:37 +0100 |
koda |
hgignore and skip one config file for win32
|
changeset |
files
|
| Wed, 24 Oct 2012 10:18:42 +0100 |
koda |
download SDL dlls if not present
|
changeset |
files
|
| Wed, 24 Oct 2012 10:17:38 +0100 |
koda |
update SDL headers for winutils
|
changeset |
files
|
| Wed, 24 Oct 2012 12:41:46 +0400 |
unc0rr |
Make explosion look depend less on fps
|
changeset |
files
|
| Wed, 24 Oct 2012 04:21:29 +0200 |
koda |
fuuuuuuuuuuuu don't use stack checking
|
changeset |
files
|
| Tue, 23 Oct 2012 20:15:15 -0400 |
nemo |
missing nil test
|
changeset |
files
|
| Tue, 23 Oct 2012 16:52:13 -0400 |
nemo |
Flag script parsecommands to avoid echoing to net
|
changeset |
files
|
| Wed, 24 Oct 2012 00:35:27 +0400 |
unc0rr |
Get rid of C-style operators
|
changeset |
files
|
| Tue, 23 Oct 2012 12:09:15 -0400 |
nemo |
better?
|
changeset |
files
|
| Tue, 23 Oct 2012 11:14:08 -0400 |
nemo |
Ok. Seems to me if you disconnect on any page, you should go to the main net page, since presumably you were in some part of net play. I think this should avoid ending up in a "lobby" after disconnecting
|
changeset |
files
|
| Tue, 23 Oct 2012 15:52:06 +0100 |
koda |
lupdate -no-obsolete project_files/hedgewars.pro
|
changeset |
files
|
| Tue, 23 Oct 2012 07:34:33 -0400 |
nemo |
tweak tab styling
|
changeset |
files
|
| Tue, 23 Oct 2012 12:12:28 +0100 |
koda |
tweaks to win build script, hedgewars.pro now supports win32 target
|
changeset |
files
|
| Tue, 23 Oct 2012 04:06:12 -0400 |
nemo |
tweak tab appearance to try to appease koda
|
changeset |
files
|
| Tue, 23 Oct 2012 07:14:28 +0200 |
koda |
forgot modality for this widget
|
changeset |
files
|
| Tue, 23 Oct 2012 07:05:24 +0200 |
koda |
disable feedback button for now
|
changeset |
files
|
| Tue, 23 Oct 2012 07:03:07 +0200 |
koda |
set window modality also for custom dialogs, small text changes
|
changeset |
files
|
| Tue, 23 Oct 2012 06:50:19 +0200 |
koda |
QMessageBox overhaul: unify buttons, style and appearance of info dialogs, fixing a few typos and return values along the way
|
changeset |
files
|
| Tue, 23 Oct 2012 05:21:44 +0200 |
koda |
add standard copyright header
|
changeset |
files
|
| Tue, 23 Oct 2012 04:40:13 +0200 |
koda |
don't try to delete a default scheme
|
changeset |
files
|
| Mon, 22 Oct 2012 22:30:03 -0400 |
nemo |
Completely arbitrary tweaking of tunnel values (avoids a nil) - still needs smooth curves (probably a target dx/dy to aim for, and slow alterations) and taking less CPU. Also disable unused function in Highlander
|
changeset |
files
|
| Mon, 22 Oct 2012 23:35:12 +0400 |
unc0rr |
- Fix desyncs triggered by AI
|
changeset |
files
|
| Mon, 22 Oct 2012 21:24:38 +0400 |
unc0rr |
Check cake and air attack again if walked far from initial position (not tested)
|
changeset |
files
|
| Mon, 22 Oct 2012 14:39:49 +0400 |
unc0rr |
Track targets better in multiattack mode
|
changeset |
files
|
| Mon, 22 Oct 2012 14:16:10 +0400 |
unc0rr |
Mark places where tried to jump, avoid too much of thinking
|
changeset |
files
|
| Sun, 21 Oct 2012 22:42:50 -0400 |
nemo |
*sigh* revert the multishoot thingy. worked fine in my tests w/ smine and cleaver, screwed up deagle. need to find out why, but sleepy. for later
|
changeset |
files
|
| Sun, 21 Oct 2012 22:34:20 -0400 |
nemo |
Someone should look this over to make sure it should stay in
|
changeset |
files
|
| Sun, 21 Oct 2012 21:15:10 -0400 |
nemo |
Disable jiggling of cleavers 'cause it just looks odd. Adding a constraint based on proximity to portal is an option too, this was just easier.
|
changeset |
files
|
| Sun, 21 Oct 2012 21:14:33 -0400 |
nemo |
Turn off freezing in multishoot, unless unc0rr can come up w/ a good reason why this was here :)
|
changeset |
files
|
| Mon, 22 Oct 2012 00:44:52 +0400 |
unc0rr |
0.9.17 -> 0.9.18 changelog
|
changeset |
files
|
| Sun, 21 Oct 2012 13:19:16 -0400 |
nemo |
crude workaround for problem inu reported with sound button
|
changeset |
files
|
| Sun, 21 Oct 2012 12:28:05 -0400 |
nemo |
ok. for some reason, this now works without problems. weird. (reenable smine/cleaver alt)
|
changeset |
files
|
| Sun, 21 Oct 2012 19:17:00 +0400 |
unc0rr |
Fix include
|
changeset |
files
|
| Sun, 21 Oct 2012 01:28:33 +0400 |
unc0rr |
Fix build
physfslayer
|
changeset |
files
|
| Sun, 21 Oct 2012 10:20:48 -0400 |
nemo |
Fix knockball
|
changeset |
files
|
| Sun, 21 Oct 2012 00:34:14 +0400 |
unc0rr |
Workaround over QIcon failing to load from physfs
physfslayer
|
changeset |
files
|
| Sun, 21 Oct 2012 17:00:35 +0400 |
unc0rr |
Keep room admin ready status always set
|
changeset |
files
|
| Sun, 21 Oct 2012 00:33:38 +0400 |
unc0rr |
Simplify DataManager as physfs partially implements its functions
physfslayer
|
changeset |
files
|
| Sun, 21 Oct 2012 16:38:54 +0400 |
unc0rr |
Remove deprecated signals
|
changeset |
files
|
| Sun, 21 Oct 2012 00:32:32 +0400 |
unc0rr |
Oops, forgot this
physfslayer
|
changeset |
files
|
| Sat, 20 Oct 2012 22:43:25 -0400 |
nemo |
fix trophyrace. also tweak it a little
|
changeset |
files
|
| Sun, 21 Oct 2012 00:31:48 +0400 |
unc0rr |
Many bugfixes and features to FileEngine
physfslayer
|
changeset |
files
|
| Sat, 20 Oct 2012 18:54:03 +0400 |
unc0rr |
Don't need this button anymore
|
changeset |
files
|
| Sat, 20 Oct 2012 00:20:39 +0400 |
unc0rr |
Try using PhysicsFS.
physfslayer
|
changeset |
files
|
| Thu, 18 Oct 2012 14:04:24 -0400 |
nemo |
damn nots
|
changeset |
files
|
| Wed, 17 Oct 2012 23:50:28 +0400 |
unc0rr |
Fix most of server warnings
|
changeset |
files
|
| Wed, 17 Oct 2012 23:33:33 +0400 |
unc0rr |
'In game' client flag, both server and frontend support
|
changeset |
files
|
| Wed, 17 Oct 2012 23:09:16 +0400 |
unc0rr |
- Show unready status in icon
|
changeset |
files
|
| Tue, 16 Oct 2012 22:57:48 -0400 |
nemo |
I like this condition for home run better
|
changeset |
files
|
| Tue, 16 Oct 2012 22:35:01 +0400 |
unc0rr |
Better error handling
|
changeset |
files
|
| Tue, 16 Oct 2012 13:41:23 -0400 |
nemo |
skip all dx/dy mod if Power is 0
|
changeset |
files
|
| Tue, 16 Oct 2012 17:16:08 +0400 |
unc0rr |
Tweak TestDesertEagle. Bots should prefer direct shots to shots through land now, but I didn't test that yet.
|
changeset |
files
|
| Mon, 15 Oct 2012 22:30:20 -0400 |
nemo |
cut down on excessive checkins in some situations
|
changeset |
files
|
| Mon, 15 Oct 2012 22:07:37 -0400 |
nemo |
Remove slot overcrowding, disable angle detection which isn't doing what I want.
|
changeset |
files
|
| Tue, 16 Oct 2012 00:05:58 +0400 |
unc0rr |
Don't accept ROUNDFINISHED message twice. Fixes game hangs when half of teams quit game.
|
changeset |
files
|
| Mon, 15 Oct 2012 10:10:54 -0400 |
nemo |
Try to prevent a situation where hogs embedded in other hogs/barrels/cleavers get stuck, by checking for gears overlapping on Y
|
changeset |
files
|
| Sun, 14 Oct 2012 20:24:08 -0400 |
nemo |
Also shove using shotgun, switch off hat when not active hog
|
changeset |
files
|
| Sun, 14 Oct 2012 13:35:15 -0400 |
nemo |
First pass at cleaver.
|
changeset |
files
|
| Sun, 14 Oct 2012 00:22:33 +0400 |
unc0rr |
Two cavern templates which aren't horribly long to generate, produce pretty varying maps, and allow 48 hedgehogs gameplay
|
changeset |
files
|
| Sat, 13 Oct 2012 23:36:04 +0400 |
unc0rr |
Fix crasher in TestCake
|
changeset |
files
|
| Sat, 13 Oct 2012 15:45:14 +0400 |
unc0rr |
Switch to vector library for arrays
|
changeset |
files
|
| Sat, 13 Oct 2012 13:13:15 +0200 |
sheepluva |
small tweak. (reverse mouse wheel directions for color change)
|
changeset |
files
|
| Sat, 13 Oct 2012 00:35:20 +0400 |
unc0rr |
Convert ColorWidget from QWidget to QFrame and make use of The Box Model(tm) in stylesheet
|
changeset |
files
|
| Sat, 13 Oct 2012 00:07:46 +0400 |
unc0rr |
UNBAN implementation
|
changeset |
files
|
| Fri, 12 Oct 2012 11:02:43 +0200 |
sheepluva |
add Randy to extended credits
|
changeset |
files
|
| Thu, 11 Oct 2012 17:21:52 -0400 |
sphrix |
french translation. primarily of the campaign.
|
changeset |
files
|
| Fri, 12 Oct 2012 00:10:28 +0400 |
unc0rr |
Better use random number here
|
changeset |
files
|
| Thu, 11 Oct 2012 21:17:56 +0400 |
unc0rr |
- Nicks starting from not-letter char go to bottom of the list
|
changeset |
files
|
| Wed, 10 Oct 2012 23:58:23 +0400 |
unc0rr |
Remove old signal-slot conenctions
|
changeset |
files
|
| Wed, 10 Oct 2012 23:55:09 +0400 |
unc0rr |
- Finish conversion to nicks model
|
changeset |
files
|
| Wed, 10 Oct 2012 23:30:34 +0400 |
unc0rr |
Get rid of deprecated chat widget stuff
|
changeset |
files
|
| Wed, 10 Oct 2012 23:15:58 +0400 |
unc0rr |
Restore old context menu behavior
|
changeset |
files
|
| Wed, 10 Oct 2012 00:14:01 -0400 |
nemo |
no. still doesn't work right
|
changeset |
files
|
| Wed, 10 Oct 2012 00:40:00 +0400 |
unc0rr |
Please pas2c
|
changeset |
files
|
| Wed, 10 Oct 2012 00:21:18 +0400 |
unc0rr |
- Enable chat context menu actions
|
changeset |
files
|
| Wed, 10 Oct 2012 00:18:35 +0400 |
unc0rr |
Don't ask for full rooms list on part/kick
|
changeset |
files
|
| Tue, 09 Oct 2012 21:08:37 +0400 |
unc0rr |
Reset nickname so it may be reused while old connection is still hanging
|
changeset |
files
|
| Mon, 08 Oct 2012 21:56:24 -0400 |
nemo |
no. still doesn't work right.
|
changeset |
files
|
| Mon, 08 Oct 2012 21:07:18 -0400 |
nemo |
Knife is still broken, but so koda can fix it...
|
changeset |
files
|
| Tue, 09 Oct 2012 00:38:17 +0400 |
unc0rr |
Load friends/ignored nicks from file
|
changeset |
files
|
| Mon, 08 Oct 2012 23:57:17 +0400 |
unc0rr |
Room players list
|
changeset |
files
|
| Mon, 08 Oct 2012 13:27:46 -0400 |
nemo |
A bit more on the knife. Also add missing files to CMakeLists
|
changeset |
files
|
| Sun, 07 Oct 2012 16:44:16 -0400 |
nemo |
Data for copying throwing knife to Land once it hits.
|
changeset |
files
|
| Sun, 07 Oct 2012 23:59:55 +0400 |
unc0rr |
Bring back sorting
|
changeset |
files
|
| Sun, 07 Oct 2012 23:33:09 +0400 |
unc0rr |
Bring icons back
|
changeset |
files
|
| Sun, 07 Oct 2012 11:59:42 -0400 |
nemo |
Set default collision mask for gears at currenthedgehog X/Y to FF7F, expose mask to scripting as well. This should resolve the collision part of bug #420
|
changeset |
files
|
| Sun, 07 Oct 2012 00:12:46 +0400 |
unc0rr |
Further work on moving to players list model
|
changeset |
files
|
| Sat, 06 Oct 2012 23:36:43 +0400 |
unc0rr |
Simplify file loading procedure
|
changeset |
files
|
| Sat, 06 Oct 2012 01:09:41 +0400 |
unc0rr |
Start moving to players list model.
|
changeset |
files
|
| Wed, 03 Oct 2012 12:04:29 +0400 |
unc0rr |
No commit message
|
changeset |
files
|
| Mon, 01 Oct 2012 12:01:39 +0400 |
unc0rr |
- Fix warnings and hints
|
changeset |
files
|
| Mon, 01 Oct 2012 00:31:38 +0400 |
unc0rr |
Show more statuses in icons.
|
changeset |
files
|
| Sat, 29 Sep 2012 19:26:18 +0400 |
unc0rr |
Move hedgehog's step routine into separate function, use it in both hedgehog and ai code
|
changeset |
files
|
| Fri, 28 Sep 2012 18:03:32 +0100 |
koda |
use cmake OPTION for arguments and further cleanup on CMakeFiles
|
changeset |
files
|
| Thu, 27 Sep 2012 13:37:10 -0400 |
nemo |
revert since I didn't quite get this working smoothly enough. was close though. perhaps some other time. Shame because calling game tick less frequently can save a lot of CPU
|
changeset |
files
|
| Fri, 28 Sep 2012 00:51:04 +0400 |
unc0rr |
Fix some hints
|
changeset |
files
|
| Fri, 28 Sep 2012 00:39:20 +0400 |
unc0rr |
Shutup pas2c
|
changeset |
files
|
| Fri, 28 Sep 2012 00:18:07 +0400 |
unc0rr |
vector2Angle function which converts vector to angle from -2048 to 2048
|
changeset |
files
|
| Thu, 27 Sep 2012 23:24:01 +0400 |
unc0rr |
Always run simple game on medium maps
|
changeset |
files
|
| Thu, 27 Sep 2012 19:15:49 +0400 |
unc0rr |
Oops
|
changeset |
files
|
| Wed, 26 Sep 2012 11:36:41 +0400 |
unc0rr |
Fix framing
|
changeset |
files
|
| Tue, 25 Sep 2012 22:45:40 +0400 |
unc0rr |
- Keep track of room name so correct name is displayed when you become room admin
|
changeset |
files
|
| Tue, 25 Sep 2012 02:57:03 +0200 |
koda |
only accept RELASE and DEBUG build type configuration
|
changeset |
files
|
| Tue, 25 Sep 2012 02:35:21 +0200 |
koda |
another little tweak
|
changeset |
files
|
| Tue, 25 Sep 2012 02:25:22 +0200 |
koda |
sdl_extras updated/fixed (is this file still needed?)
|
changeset |
files
|
| Tue, 25 Sep 2012 01:27:26 +0200 |
koda |
forgot a few checks from rev f40c65ae3eab
|
changeset |
files
|
| Tue, 25 Sep 2012 01:02:21 +0200 |
koda |
force a DEBUG build when HW_DEV is true, some CMakeLists.txt cleanup/commenting
|
changeset |
files
|
| Tue, 25 Sep 2012 00:35:49 +0200 |
koda |
slight tweak to lua linking (that will break everything, i'm sure)
|
changeset |
files
|
| Sat, 22 Sep 2012 19:14:58 +0400 |
unc0rr |
Make sheepluva happy
|
changeset |
files
|
| Sat, 22 Sep 2012 19:01:39 +0400 |
unc0rr |
Allow using system proxy settings
|
changeset |
files
|
| Fri, 21 Sep 2012 23:33:34 +0400 |
unc0rr |
- Small fix
|
changeset |
files
|
| Fri, 21 Sep 2012 23:29:57 +0400 |
unc0rr |
Support for proxies (not tested)
|
changeset |
files
|
| Fri, 21 Sep 2012 01:29:33 +0200 |
koda |
blindly trying to fix the android build
|
changeset |
files
|
| Fri, 21 Sep 2012 01:07:56 +0200 |
koda |
nicer debug log visuals on ios
|
changeset |
files
|
| Fri, 21 Sep 2012 00:50:04 +0200 |
koda |
switch the Tremor implementation from the Cocos2D one to the lowmem-no-byte branch and let's see what happens
|
changeset |
files
|
| Thu, 20 Sep 2012 23:04:10 +0200 |
koda |
update ios project file again to reflect SDL2 renaming
|
changeset |
files
|
| Sun, 16 Sep 2012 23:52:36 +0200 |
Medo |
Hedgeroid: Updated base locale
|
changeset |
files
|
| Thu, 20 Sep 2012 22:17:02 +0200 |
koda |
issue ENGINECLEAN only when fpc < 2.6
|
changeset |
files
|
| Sun, 16 Sep 2012 22:41:58 +0200 |
Medo |
Hedgeroid: Update to new NDK toolchain (requires NDK r8b)
|
changeset |
files
|
| Thu, 20 Sep 2012 22:10:32 +0200 |
koda |
updated ios project file
|
changeset |
files
|
| Sun, 16 Sep 2012 22:31:34 +0200 |
Medo |
frontlib+Hedgeroid: Added support for the new client flags (chief, admin, reg)
|
changeset |
files
|
| Sun, 16 Sep 2012 23:30:55 +0400 |
unc0rr |
Treat init expression in parens as just expression instead of array initializer when there's only one entry in expressions list
|
changeset |
files
|
| Sun, 16 Sep 2012 17:42:48 +0200 |
Medo |
frontlib: Add/change comments to correspond to recent changes in QtFrontend and server
|
changeset |
files
|
| Sun, 16 Sep 2012 22:55:33 +0400 |
unc0rr |
New hwSqrt which is up to 8.7% more efficient than old one on synthetic tests
|
changeset |
files
|
| Sun, 16 Sep 2012 16:54:51 +0200 |
Medo |
Merge
|
changeset |
files
|
| Sun, 16 Sep 2012 09:33:57 +0400 |
ChipHome |
Italian translation update
|
changeset |
files
|
| Tue, 11 Sep 2012 22:19:23 +0400 |
ChipHome |
Italian engine translation update
|
changeset |
files
|
| Sun, 09 Sep 2012 20:58:45 +0200 |
sheepluva |
recognize client-flags h and u, ROOM_CONTROL_ACCESS will be ignored from here on
|
changeset |
files
|
| Sun, 09 Sep 2012 20:11:07 +0200 |
sheepluva |
client-flags: make code easier to read/prettier; add parsing of flag 'a'; add warning in console on unknown flag; ignore ADMIN_ACCESS
|
changeset |
files
|
| Sun, 09 Sep 2012 19:57:13 +0400 |
unc0rr |
'h' status for room admins
|
changeset |
files
|
| Sun, 09 Sep 2012 15:37:10 +0400 |
unc0rr |
Reset to default colors button
|
changeset |
files
|
| Sun, 09 Sep 2012 14:45:21 +0400 |
unc0rr |
- Some improvements to tr() calls
|
changeset |
files
|
| Sun, 09 Sep 2012 13:40:02 +0400 |
unc0rr |
- Fix some warnings in frontend
|
changeset |
files
|
| Sun, 09 Sep 2012 11:50:34 +0400 |
unc0rr |
Polish settings page a bit
|
changeset |
files
|
| Sat, 08 Sep 2012 10:30:16 +0400 |
unc0rr |
More consistency in terminology
|
changeset |
files
|
| Fri, 07 Sep 2012 12:13:38 +0200 |
sheepluva |
merging in campaign updates - please test
|
changeset |
files
|
| Wed, 05 Sep 2012 16:54:13 +0300 |
belphegorr |
Fixed grammar/vocabulary and improved balance
|
changeset |
files
|
| Thu, 06 Sep 2012 15:47:52 +0200 |
sheepluva |
fix for issue 293 : "rope stuck after picking crate"
|
changeset |
files
|
| Wed, 05 Sep 2012 12:36:47 +0200 |
sheepluva |
fix a segfault related to tcp servers deleting themselves without removing themselves from the internal server list first.
|
changeset |
files
|
| Tue, 04 Sep 2012 18:40:53 -0400 |
nemo |
retain frontend effects setting exiting/leaving settings
|
changeset |
files
|
| Wed, 05 Sep 2012 02:17:04 +0400 |
unc0rr |
Fix some warnings
|
changeset |
files
|
| Wed, 05 Sep 2012 02:11:51 +0400 |
unc0rr |
Stop messages without possible desync on load from save
|
changeset |
files
|
| Tue, 04 Sep 2012 13:18:26 +0200 |
sheepluva |
I didn't want to do this since it seems less clean, but...
|
changeset |
files
|
| Tue, 04 Sep 2012 15:18:22 +0400 |
unc0rr |
Show who is the room admin on join (no tested, also I don't like how it is done via server warnings, but it seems there's no other solution compatible with .17)
|
changeset |
files
|
| Tue, 04 Sep 2012 12:43:55 +0200 |
sheepluva |
skip second CheckForWin if water wasn't raised after first one
|
changeset |
files
|
| Tue, 04 Sep 2012 12:34:00 +0200 |
sheepluva |
fix multi-shot related game ends leading to incomplete stats, fixes issue 372
|
changeset |
files
|
| Tue, 04 Sep 2012 12:25:55 +0400 |
unc0rr |
More Qt-ish code, fix couple warnings.
|
changeset |
files
|
| Tue, 04 Sep 2012 12:16:36 +0400 |
unc0rr |
Unset room restrictions on player/team joins when changing room admin
|
changeset |
files
|
| Tue, 04 Sep 2012 11:09:23 +0400 |
unc0rr |
More precision
|
changeset |
files
|
| Mon, 03 Sep 2012 14:50:26 -0400 |
nemo |
forgot to add back c96ff1a053d0
|
changeset |
files
|
| Mon, 03 Sep 2012 20:46:34 +0200 |
sheepluva |
fix for issue 376 (embedding barrels in ceiling)
|
changeset |
files
|
| Mon, 03 Sep 2012 14:08:01 -0400 |
nemo |
Fix line endings, add missing amMine entry
|
changeset |
files
|
| Mon, 03 Sep 2012 20:04:42 +0200 |
sheepluva |
teleport hack fixes:
|
changeset |
files
|
| Mon, 03 Sep 2012 13:52:35 -0400 |
nemo |
adjust velocity when entering/exiting the 4x routine
|
changeset |
files
|
| Mon, 03 Sep 2012 12:35:51 -0400 |
nemo |
Let's try *4 instead. Not nearly as much of a win, but might be usable.
|
changeset |
files
|
| Mon, 03 Sep 2012 00:00:54 -0400 |
nemo |
So, unc0rr won't let me revert to pre-e496587db93e, but reverting db731c523653 makes the rope less-sticky-enough to actually be usable in an ordinary game without my screaming at the monitor as I drown for the nth time...
|
changeset |
files
|
| Sun, 02 Sep 2012 22:27:01 +0200 |
sheepluva |
if this doesn't work I shall cry like a lady
|
changeset |
files
|
| Sun, 02 Sep 2012 22:09:06 +0200 |
sheepluva |
I assumed NO_VIDEOREC would be set if ${FFMPEG_FOUND} was false. doesn't seem to be the case.
|
changeset |
files
|
| Sun, 02 Sep 2012 21:55:56 +0200 |
sheepluva |
engineclean returns
|
changeset |
files
|
| Sun, 02 Sep 2012 19:58:56 +0400 |
unc0rr |
Not sticky rope
|
changeset |
files
|
| Sun, 02 Sep 2012 11:44:59 -0400 |
nemo |
perf tweak
|
changeset |
files
|
| Sun, 02 Sep 2012 10:11:24 -0400 |
nemo |
LAND_HEIGHT/LAND_WIDTH need setting later now
|
changeset |
files
|
| Sun, 02 Sep 2012 09:23:36 -0400 |
nemo |
Correct snow fall/rotation (matching visual gear)
|
changeset |
files
|
| Sun, 02 Sep 2012 09:36:06 +0400 |
unc0rr |
Oops
|
changeset |
files
|
| Sat, 01 Sep 2012 17:11:39 -0400 |
unc0rr |
Rope fix without hacks.
|
changeset |
files
|
| Sat, 01 Sep 2012 15:46:22 -0400 |
nemo |
oops
|
changeset |
files
|
| Sat, 01 Sep 2012 15:44:59 -0400 |
nemo |
remove checks from c4272519b128, ed7fecd0f5fd just hides 'em instead.
|
changeset |
files
|
| Sat, 01 Sep 2012 21:36:57 +0200 |
unc0rr |
hide health bars of dead teams
|
changeset |
files
|
| Sat, 01 Sep 2012 12:09:59 -0400 |
nemo |
Differentiate videos from demos - navigating between them was too confusing. BTW, why is this on the front page, instead of next to the demos button?
|
changeset |
files
|
| Sat, 01 Sep 2012 10:40:22 +0200 |
sheepluva |
fix parsing of 'if': identifiers can also contain underscores
|
changeset |
files
|
| Fri, 31 Aug 2012 22:08:29 +0200 |
unc0rr |
fix parsing of 'if'
|
changeset |
files
|
| Fri, 31 Aug 2012 22:00:31 +0200 |
sheepluva |
clean up LoadImage and UserPathz/AltPath/etc related redundancy by introducing 3 new functions in uStore.pas
|
changeset |
files
|
| Fri, 31 Aug 2012 17:52:53 +0200 |
sheepluva |
* don't build moc for campaign.h
|
changeset |
files
|
| Fri, 31 Aug 2012 11:10:21 -0400 |
nemo |
oops
|
changeset |
files
|
| Fri, 31 Aug 2012 15:28:03 +0200 |
sheepluva |
use old approach for printing gl extentions for pas2c (less complex/no StrUtils dependencies)
|
changeset |
files
|
| Fri, 31 Aug 2012 13:36:00 +0200 |
sheepluva |
min -> qMin
|
changeset |
files
|
| Fri, 31 Aug 2012 12:06:48 +0200 |
sheepluva |
don't query/print GL_AUX_BUFFERS if video recording is disabled
|
changeset |
files
|
| Fri, 31 Aug 2012 11:24:57 +0200 |
sheepluva |
print all GL_EXTENSIONS properly to logfile (should a;sp fix build on systems with compiler/lib versions that can't implicity cast PGLubyte to PChar)
|
changeset |
files
|
| Thu, 30 Aug 2012 22:13:42 -0400 |
nemo |
Allow adjusting bitrate so that I can get a somewhat usable webm video. The audio is still tinny and unlistenable. Configuration option for that might be helpful, or just adjusting defaults in the wrapper.
|
changeset |
files
|
| Sat, 25 Aug 2012 22:55:47 +0200 |
sheepluva |
add 'a classic fairytale' campaign to cmake install
|
changeset |
files
|
| Thu, 30 Aug 2012 20:42:29 +0200 |
sheepluva |
dos2unix newline fixes on 7 (video recording-)merged files
|
changeset |
files
|
| Thu, 30 Aug 2012 22:41:22 +0400 |
unc0rr |
Move some options to the second page so first page doesn't look ugly on low resolution
|
changeset |
files
|
| Thu, 30 Aug 2012 14:26:05 -0400 |
nemo |
neglected stuff
|
changeset |
files
|
| Thu, 30 Aug 2012 13:02:19 -0400 |
nemo |
Checking merge against latest trunk
|
changeset |
files
|
| Wed, 29 Aug 2012 23:12:47 -0400 |
nemo |
preliminary creeper (not yet functional)
|
changeset |
files
|
| Wed, 29 Aug 2012 20:07:17 +0200 |
sheepluva |
new grave: dragonball (incl. svg) by Randy
|
changeset |
files
|
| Wed, 29 Aug 2012 11:48:10 -0400 |
nemo |
tiny (probably) optimisation
|
changeset |
files
|
| Wed, 29 Aug 2012 10:56:32 -0400 |
nemo |
A few more operators. Committing in case unc0rr wants to fiddle.
|
changeset |
files
|
| Wed, 29 Aug 2012 09:58:23 -0400 |
nemo |
isZero appears to be never used. Use it in a few obvious cases and add web variant.
|
changeset |
files
|
| Wed, 29 Aug 2012 16:42:22 +0400 |
unc0rr |
Fix library installation in win32
|
changeset |
files
|
| Wed, 29 Aug 2012 08:40:26 -0400 |
nemo |
disable snowball damage, by request of sheepluva
|
changeset |
files
|
| Wed, 29 Aug 2012 12:48:27 +0200 |
sheepluva |
remove a redundant assignment; whitespace fixes
|
changeset |
files
|
| Wed, 29 Aug 2012 11:35:38 +0400 |
unc0rr |
This should work better
|
changeset |
files
|
| Tue, 28 Aug 2012 21:59:49 +0200 |
sheepluva |
fix build for me
|
changeset |
files
|
| Tue, 28 Aug 2012 22:33:17 +0400 |
unc0rr |
Make ffmpeg optional for frontend
|
changeset |
files
|
| Tue, 28 Aug 2012 22:32:19 +0400 |
unc0rr |
Small fix
|
changeset |
files
|
| Tue, 28 Aug 2012 20:30:57 +0400 |
unc0rr |
Merge Stepik-777's video recording gsoc project
|
changeset |
files
|
| Mon, 27 Aug 2012 16:52:50 -0400 |
nemo |
Starting to rewrite uFloat routines to avoid QWordValue - in the interests of JS which may get uint64/int64 in the spec in the future but does not have it now.
|
changeset |
files
|
| Mon, 27 Aug 2012 17:40:16 +0200 |
Medo |
Merge
|
changeset |
files
|
| Mon, 27 Aug 2012 11:05:09 +0200 |
sheepluva |
shutting the windows/pas2c build bot up: pas2c seems to fail parsing 'not' after a logical 'and' or 'or' (if no parenthesis)
|
changeset |
files
|
| Sun, 26 Aug 2012 21:07:12 -0400 |
nemo |
Nerf X component a bit, allow knocks of nearby targets and upward kicks of overlapping
|
changeset |
files
|
| Sun, 26 Aug 2012 20:20:16 -0400 |
nemo |
so unc0rr might replace this all. but anyway. fix copypasta.
|
changeset |
files
|
| Sun, 26 Aug 2012 10:15:28 -0400 |
nemo |
shoppa hack, take... 4?
|
changeset |
files
|
| Sat, 25 Aug 2012 21:35:25 -0400 |
nemo |
another shot in the dark. still w/ no input from shoppa players
|
changeset |
files
|
| Sat, 25 Aug 2012 21:14:07 -0400 |
nemo |
shoppa hack guesses. continued. let's assume there's a small Y component.
|
changeset |
files
|
| Sat, 25 Aug 2012 21:05:27 -0400 |
nemo |
another shot in the dark. let's assume they expect to control their direction as well. this might be the *wrong* direction...
|
changeset |
files
|
| Sat, 25 Aug 2012 20:54:23 -0400 |
nemo |
hack for shoppa players, take 2. take into account sides, and a guess that a "slide" involves no upward movement
|
changeset |
files
|
| Sat, 25 Aug 2012 20:15:19 -0400 |
nemo |
Hack to try and appease the shoppa players
|
changeset |
files
|
| Sat, 25 Aug 2012 18:35:59 -0400 |
nemo |
reducing this value is sufficient to ensure crates drop just below top border or a girder
|
changeset |
files
|
| Sat, 25 Aug 2012 18:22:15 -0400 |
nemo |
Fix throwing things off rope, also make throwing things a bit more generic and gear density dependent (so you can throw mines further, and also throw dynamite a little).
|
changeset |
files
|
| Sat, 25 Aug 2012 15:04:24 -0400 |
nemo |
Allow escaping from tight spots
|
changeset |
files
|
| Sat, 25 Aug 2012 23:00:19 +0400 |
unc0rr |
Disable workaround, as it still makes server crash and hung clients are hidden from players anyway
|
changeset |
files
|
| Sat, 25 Aug 2012 13:06:28 -0400 |
nemo |
Ensure crates can spawn just below the border on a bordered map.
|
changeset |
files
|
| Sat, 25 Aug 2012 09:17:42 -0400 |
nemo |
let's see if mikade will still accept this at least
|
changeset |
files
|
| Sat, 25 Aug 2012 08:39:52 -0400 |
nemo |
make cheating a bit easier (mikade insisted). Also, try flipping dust for a bit more variety.
|
changeset |
files
|
| Fri, 24 Aug 2012 20:43:44 -0400 |
nemo |
oops
|
changeset |
files
|
| Fri, 24 Aug 2012 19:55:43 -0400 |
nemo |
Hey. How's this? It makes it harder to get stuck in the vertical rope position, prevents the wall trick, and also I think makes it easier to unglue a horizontal rope?
|
changeset |
files
|
| Fri, 24 Aug 2012 18:51:29 -0400 |
nemo |
fromdos + fix end of turn velocity
|
changeset |
files
|
| Fri, 24 Aug 2012 14:51:12 +0400 |
unc0rr |
An attempt to run main rope code only every 8th tick:
|
changeset |
files
|
| Fri, 24 Aug 2012 14:01:07 +0400 |
unc0rr |
Move rope code to separate unit
|
changeset |
files
|
| Thu, 23 Aug 2012 20:43:39 -0400 |
nemo |
Fix formatting, reduce border sensitivity
|
changeset |
files
|
| Thu, 23 Aug 2012 19:47:38 +0200 |
Medo |
Hedgeroid: Fixed map preview again (might be a JNA bug)
|
changeset |
files
|
| Thu, 23 Aug 2012 19:45:36 -0400 |
nemo |
also needs exclusion here
|
changeset |
files
|
| Thu, 23 Aug 2012 18:28:33 +0200 |
Medo |
Hedgeroid improvements:
|
changeset |
files
|
| Thu, 23 Aug 2012 23:21:31 +0400 |
unc0rr |
Don't leave frontend in engine waiting state when there's error occured on attempt to start engine
|
changeset |
files
|
| Wed, 22 Aug 2012 01:30:56 +0200 |
Medo |
Hedgeroid: Some code cleanup, adding a forgotten file
|
changeset |
files
|
| Thu, 23 Aug 2012 23:18:06 +0400 |
unc0rr |
Slightly faster and slightly better templates #41 and #43
|
changeset |
files
|
| Mon, 20 Aug 2012 21:05:57 +0200 |
Medo |
License change: With the agreement of Xeli, I changed the Hedgeroid license to
|
changeset |
files
|
| Thu, 23 Aug 2012 14:16:08 -0400 |
nemo |
drawn maps have a fixed 4096x2048 area right now
|
changeset |
files
|
| Mon, 20 Aug 2012 20:19:35 +0200 |
Medo |
Hedgeroid: Final sprint to the deadline
|
changeset |
files
|
| Wed, 22 Aug 2012 22:10:47 -0400 |
nemo |
move this section back to the connection code, and add an exclusion for air attack. probably should play a few portal games just in case
|
changeset |
files
|
| Mon, 20 Aug 2012 20:16:37 +0200 |
Medo |
frontlib: Improved documentation of netconn, unified naming of a callback
|
changeset |
files
|
| Wed, 22 Aug 2012 13:03:09 -0400 |
nemo |
*sigh*
|
changeset |
files
|
| Mon, 20 Aug 2012 17:08:52 +0200 |
Medo |
engine: Don't overwrite isTerminated if it's already true
|
changeset |
files
|
| Wed, 22 Aug 2012 12:35:46 -0400 |
nemo |
initModule really not needed for uRandom
|
changeset |
files
|
| Sun, 19 Aug 2012 15:05:23 +0200 |
Medo |
Fix engine crashes on game end
|
changeset |
files
|
| Wed, 22 Aug 2012 11:42:42 -0400 |
nemo |
Burn a random number in the override. Make sure cirbuf is reset.
|
changeset |
files
|
| Sat, 18 Aug 2012 21:05:30 +0200 |
Medo |
Merge
|
changeset |
files
|
| Tue, 21 Aug 2012 21:46:05 -0400 |
nemo |
extra nil check for lua hog switch
|
changeset |
files
|
| Sat, 18 Aug 2012 21:04:37 +0200 |
Medo |
Hedgeroid: Don't change the template when clicking the map.
|
changeset |
files
|
| Wed, 22 Aug 2012 10:27:26 +0400 |
unc0rr |
now really avoid
|
changeset |
files
|
| Sat, 18 Aug 2012 18:11:47 +0200 |
Medo |
Hedgeroid: Increased assetsversion (d'oh)
|
changeset |
files
|
| Tue, 21 Aug 2012 21:02:52 -0400 |
nemo |
avoid overflow on templates
|
changeset |
files
|
| Sat, 18 Aug 2012 18:11:04 +0200 |
Medo |
Hedgeroid:
|
changeset |
files
|
| Tue, 21 Aug 2012 19:40:02 -0400 |
nemo |
allow lua to specify template by number
|
changeset |
files
|
| Sat, 18 Aug 2012 18:08:37 +0200 |
Medo |
frontlib: Return more filled-in team objects
|
changeset |
files
|
| Sun, 19 Aug 2012 22:13:41 +0400 |
Stepan777 |
merge
|
changeset |
files
|
| Tue, 21 Aug 2012 13:26:26 +0400 |
unc0rr |
Cancel shotgun shot if hedgehog is moved moved (by explosion)
|
changeset |
files
|
| Sat, 18 Aug 2012 13:45:00 +0200 |
Medo |
engine: Fixed indentation regression
|
changeset |
files
|
| Sat, 18 Aug 2012 18:58:41 -0400 |
nemo |
koda changed the CMake flag w/o updating the wiki or INSTALL file :(
|
changeset |
files
|
| Sat, 18 Aug 2012 13:40:21 +0200 |
Medo |
Merge
|
changeset |
files
|
| Sat, 18 Aug 2012 13:39:24 +0200 |
Medo |
Hedgeroid: Don't update the map preview just for a theme change
|
changeset |
files
|
| Sat, 18 Aug 2012 15:01:27 -0400 |
nemo |
oops
|
changeset |
files
|
| Sat, 18 Aug 2012 13:39:05 +0200 |
Medo |
Hedgeroid: Fixed JNA mapping of size_t
|
changeset |
files
|
| Sat, 18 Aug 2012 18:48:34 +0200 |
Xeli |
fix the touchUI on android, ignore device dpi for now
|
changeset |
files
|
| Sat, 18 Aug 2012 13:21:37 +0200 |
Medo |
engine: Fixed sigsegv on android caused by modifying Template.FillPoints constants
|
changeset |
files
|
| Sat, 18 Aug 2012 09:29:40 -0400 |
nemo |
byte order
|
changeset |
files
|
| Sat, 18 Aug 2012 01:20:29 +0200 |
Medo |
Hedgeroid: Fixed memory handling issues
|
changeset |
files
|
| Sat, 18 Aug 2012 14:08:16 +0400 |
unc0rr |
Simplify code a bit
|
changeset |
files
|
| Sat, 18 Aug 2012 01:12:03 +0200 |
Medo |
Hedgeroid: Fixed the restructuring-induced breakage
|
changeset |
files
|
| Sat, 18 Aug 2012 13:59:45 +0400 |
unc0rr |
GoBack() here is not needed anymore
|
changeset |
files
|
| Sat, 18 Aug 2012 00:48:09 +0200 |
Medo |
Merge
|
changeset |
files
|
| Sat, 18 Aug 2012 02:01:50 -0400 |
nemo |
Avoid a bit of a memory spike on small maps
|
changeset |
files
|
| Fri, 17 Aug 2012 10:39:23 -0400 |
nemo |
This one gets called a lot when drawing rotated sprites
|
changeset |
files
|
| Fri, 17 Aug 2012 10:28:42 -0400 |
nemo |
Consistency
|
changeset |
files
|
| Fri, 17 Aug 2012 07:49:54 -0400 |
nemo |
This union hasn't been needed for 5 years, and makes using other headers harder.
|
changeset |
files
|
| Thu, 16 Aug 2012 21:58:57 +0400 |
unc0rr |
Forgot this state
|
changeset |
files
|
| Sun, 12 Aug 2012 23:05:15 +0400 |
Stepan777 |
minor changes in list of codecs
|
changeset |
files
|
| Wed, 15 Aug 2012 16:54:49 -0400 |
nemo |
Poor visual gear value in theme now bears little resemblance to the number of gears actually spawned. But, it certainly shouldn't be related to LAND_WIDTH.
|
changeset |
files
|
| Sun, 12 Aug 2012 03:35:18 +0400 |
Stepan777 |
Insert license in avwrapper.c
|
changeset |
files
|
| Wed, 15 Aug 2012 23:30:23 +0400 |
unc0rr |
Allow customization of colors in ui, store custom colors in config
|
changeset |
files
|
| Sat, 11 Aug 2012 21:25:57 +0400 |
Stepan777 |
cmake scripts
|
changeset |
files
|
| Wed, 15 Aug 2012 16:25:24 +0400 |
unc0rr |
Check if hedgehog is still active instead
|
changeset |
files
|
| Fri, 10 Aug 2012 17:35:48 +0400 |
Stepan777 |
better cmake script
|
changeset |
files
|
| Mon, 13 Aug 2012 23:17:09 +0400 |
unc0rr |
Room bans. They're more simple, than the global ones: if you ban someone, he is banned by ip in this room for the rest of the room lifetime. Not tested.
|
changeset |
files
|
| Fri, 10 Aug 2012 17:25:22 +0400 |
Stepan777 |
merge
|
changeset |
files
|
| Mon, 13 Aug 2012 23:04:42 +0400 |
unc0rr |
Allow JOINED message in lobby
|
changeset |
files
|
| Thu, 09 Aug 2012 19:52:21 +0400 |
Stepan777 |
fix FindFFMPEG
|
changeset |
files
|
| Thu, 30 Aug 2012 12:47:41 -0400 |
nemo |
I shouldn'tve tracked this really, I should have just rejected that part of the transplant
|
changeset |
files
|
| Mon, 13 Aug 2012 21:07:28 +0400 |
Jie Luo |
Simplified Chinese Translation update
|
changeset |
files
|
| Thu, 09 Aug 2012 03:00:24 +0400 |
Stepan777 |
improve html links + small bugfixes
|
changeset |
files
|
| Thu, 30 Aug 2012 12:46:57 -0400 |
nemo |
Final checkpoint w/ campaign.
|
changeset |
files
|
| Thu, 09 Aug 2012 19:35:52 +0400 |
unc0rr |
Check if 'for' cycle body is executed at least once
|
changeset |
files
|
| Thu, 09 Aug 2012 01:24:38 +0400 |
Stepan777 |
FindFFMPEG.cmake (used only for frontend for now).
|
changeset |
files
|
| Sun, 26 Aug 2012 01:31:38 +0300 |
belphegorr |
All missions: switched blood needers with meatbags in dialogues
|
changeset |
files
|
| Thu, 09 Aug 2012 15:32:49 +0400 |
unc0rr |
Don't accept room messages when not in room state. Not tested even if it builds.
|
changeset |
files
|
| Thu, 09 Aug 2012 01:01:06 +0400 |
Stepan777 |
merge
|
changeset |
files
|
| Sun, 26 Aug 2012 01:22:55 +0300 |
belphegorr |
Mission 3: Added initial FirePunch
|
changeset |
files
|
| Wed, 08 Aug 2012 20:32:27 -0400 |
nemo |
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)
|
changeset |
files
|
| Sun, 26 Aug 2012 01:21:59 +0300 |
belphegorr |
Mission 2: fixed ammo menu bug
|
changeset |
files
|
| Wed, 08 Aug 2012 22:08:23 +0400 |
unc0rr |
Keep room till last player quits
|
changeset |
files
|
| Sun, 26 Aug 2012 01:19:43 +0300 |
belphegorr |
Mission 7: increased distance between Leaks and the princess, fixed EmitDenseClouds typo
|
changeset |
files
|
| Wed, 08 Aug 2012 11:07:59 -0400 |
nemo |
er. more like this.
|
changeset |
files
|
| Sun, 26 Aug 2012 01:18:35 +0300 |
belphegorr |
Mission 5: fixed a few bugs that came with the update (ammo menu bug and initial gear elimination bug)
|
changeset |
files
|
| Wed, 08 Aug 2012 10:26:10 -0400 |
nemo |
Allow scripting to delete gears
|
changeset |
files
|
| Sat, 25 Aug 2012 23:25:18 +0300 |
belphegorr |
Changed a line in Mission 2 dialogue...
|
changeset |
files
|
| Tue, 07 Aug 2012 13:21:15 -0400 |
nemo |
oops
|
changeset |
files
|
| Sat, 25 Aug 2012 23:20:40 +0300 |
belphegorr |
Fixed crashes in mission 3 after RestoreHog
|
changeset |
files
|
| Tue, 07 Aug 2012 21:18:33 +0400 |
unc0rr |
Keep inlining
|
changeset |
files
|
| Wed, 22 Aug 2012 19:13:13 +0300 |
belphegorr |
Modified missions to be compatible with the merge
|
changeset |
files
|
| Mon, 06 Aug 2012 23:30:58 +0400 |
unc0rr |
More mess in pas2c:
|
changeset |
files
|
| Sun, 19 Aug 2012 23:26:12 +0300 |
belphegorr |
Mission 3: Modified onPrecise (added out-commented debug code)
|
changeset |
files
|
| Mon, 06 Aug 2012 10:18:57 -0400 |
nemo |
revert 3188794b9d87. does not do what I'd like.
|
changeset |
files
|
| Sat, 18 Aug 2012 00:47:51 +0200 |
Medo |
Hedgeroid: Frantic scrabbling toward the deadline
|
changeset |
files
|
| Mon, 06 Aug 2012 00:44:32 +0400 |
Stepan777 |
improve video uploading
|
changeset |
files
|
| Sun, 19 Aug 2012 23:20:43 +0300 |
belphegorr |
Mission 3: reduced enemy turn time, fixed other HideHog problems
|
changeset |
files
|
| Sun, 05 Aug 2012 20:18:16 -0400 |
nemo |
oops
|
changeset |
files
|
| Sat, 18 Aug 2012 00:22:33 +0200 |
Medo |
frontlib: Moved mapname sending to the end of flib_netconn_send_map
|
changeset |
files
|
| Mon, 06 Aug 2012 00:40:26 +0400 |
Stepan777 |
merge
|
changeset |
files
|
| Sun, 19 Aug 2012 23:05:41 +0300 |
belphegorr |
Solved issues with HideHog in mission 2 and 3
|
changeset |
files
|
| Sun, 05 Aug 2012 19:38:16 -0400 |
nemo |
no cake for youuuuu
|
changeset |
files
|
| Sat, 18 Aug 2012 00:18:43 +0200 |
Medo |
engine: Added JNI-compatible function to start map generation
|
changeset |
files
|
| Sun, 19 Aug 2012 22:38:20 +0300 |
belphegorr |
Modified AddAmmo()-s in consideration of gfPerHogAmmo in mission 2
|
changeset |
files
|
| Sun, 05 Aug 2012 23:03:49 +0400 |
unc0rr |
Introduce 'a' and 'u' client flags to mark admins and authenticated users
|
changeset |
files
|
| Wed, 15 Aug 2012 23:40:10 +0200 |
Medo |
frontlib:
|
changeset |
files
|
| Sun, 19 Aug 2012 17:11:38 +0300 |
belphegorr |
Removed debug code.
|
changeset |
files
|
| Sun, 05 Aug 2012 15:00:59 -0400 |
nemo |
Add bot level to CPU flag
|
changeset |
files
|
| Sun, 12 Aug 2012 23:51:36 +0200 |
Medo |
frontlib/Hedgeroid: Modified frontlib build in Hedgeroid so it works without having to copy the source dir.
|
changeset |
files
|
| Sun, 19 Aug 2012 17:08:34 +0300 |
belphegorr |
Mission 7: Added a visual gear to mark height, changed ShowMission to be more precise.
|
changeset |
files
|
| Sat, 04 Aug 2012 22:51:41 -0400 |
nemo |
Perf opt for the c conversion. Use downto instead to avoid repeated function calls in the loop
|
changeset |
files
|
| Sun, 12 Aug 2012 23:20:34 +0200 |
Medo |
Hedgeroid: fix wrong filenames due to windows not treating files case sensitive
|
changeset |
files
|
| Sun, 19 Aug 2012 12:50:34 +0300 |
belphegorr |
Fixed a typo, frontend is now working properly
|
changeset |
files
|
| Sat, 04 Aug 2012 22:26:51 -0400 |
nemo |
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.
|
changeset |
files
|
| Sun, 12 Aug 2012 22:46:53 +0200 |
Medo |
Removed useless cast in cmdlineClient
|
changeset |
files
|
| Thu, 30 Aug 2012 12:31:54 -0400 |
nemo |
Silly add to facilitate transplant
|
changeset |
files
|
| Sat, 04 Aug 2012 21:49:24 -0400 |
nemo |
oops
|
changeset |
files
|
| Sun, 12 Aug 2012 22:46:23 +0200 |
Medo |
Hedgeroid:
|
changeset |
files
|
| Sun, 19 Aug 2012 12:31:04 +0300 |
belphegorr |
Mission 7: changed enemy health, ammos, fixed crashes, princess no longer hidden
|
changeset |
files
|
| Sat, 04 Aug 2012 21:36:31 -0400 |
nemo |
unbreak AI. remove inits from uLand
|
changeset |
files
|
| Sun, 12 Aug 2012 22:37:57 +0200 |
Medo |
frontlib improvements:
|
changeset |
files
|
| Sun, 19 Aug 2012 03:10:57 +0300 |
belphegorr |
Forgot to add mission 10
|
changeset |
files
|
| Sat, 04 Aug 2012 21:08:46 -0400 |
nemo |
An experimental template to abuse this ability. A quick doubling of the "Islands" crazy template
|
changeset |
files
|
| Sun, 12 Aug 2012 22:21:09 +0200 |
Medo |
frontlib: Added functions to query important constants from the library
|
changeset |
files
|
| Sun, 19 Aug 2012 02:51:05 +0300 |
belphegorr |
Added a story ending mission/cut-scene
|
changeset |
files
|
| Sat, 04 Aug 2012 20:47:13 -0400 |
nemo |
First pass at variable land size. For playing a small map (forced on rqLowRes), this should save 42MiB of RAM.
|
changeset |
files
|
| Mon, 06 Aug 2012 22:39:36 +0200 |
Medo |
Hedgeroid: Start using the frontlib for more operations
|
changeset |
files
|
| Sat, 18 Aug 2012 14:26:19 +0300 |
belphegorr |
Added a FollowGear to the leaderDead animation in mission 9
|
changeset |
files
|
| Sat, 04 Aug 2012 18:01:46 -0400 |
nemo |
Fix kamikaze crasher. Handle overlapping hogs case.
|
changeset |
files
|
| Mon, 06 Aug 2012 22:33:07 +0200 |
Medo |
frontlib: Brought commandline client (almost) up to date with the frontlib changes
|
changeset |
files
|
| Sat, 18 Aug 2012 14:24:27 +0300 |
belphegorr |
Fixed a few bugs in mission 7
|
changeset |
files
|
| Fri, 03 Aug 2012 16:58:49 +0400 |
unc0rr |
TestKamikaze, needs polishing
|
changeset |
files
|
| Mon, 06 Aug 2012 22:32:46 +0200 |
Medo |
frontlib: prevent writing a "binds" section of the team file when there are no binds
|
changeset |
files
|
| Sat, 18 Aug 2012 14:22:54 +0300 |
belphegorr |
Fixed a typo in mission 6
|
changeset |
files
|
| Wed, 01 Aug 2012 18:35:09 -0400 |
nemo |
Toggle autoCameraOn in Findhh instead of checking FollowGear which could be set in a variety of places. Issue #404
|
changeset |
files
|
| Mon, 06 Aug 2012 22:32:05 +0200 |
Medo |
frontlib: fixed ini writing failing because of an inverted condition
|
changeset |
files
|
| Sat, 18 Aug 2012 12:22:35 +0300 |
belphegorr |
Fixed bug in mission 5 with invisible obstacles
|
changeset |
files
|
| Tue, 31 Jul 2012 23:29:00 +0400 |
unc0rr |
Okay, this is workaround over ping timeouts problem on the server. Could make server crash if recieve thread wakes up after second ping timeout event.
|
changeset |
files
|
| Mon, 06 Aug 2012 22:31:02 +0200 |
Medo |
frontlib: Removed reference counting from schemelist
|
changeset |
files
|
| Sat, 18 Aug 2012 12:17:26 +0300 |
belphegorr |
Crashfix, healthfix in mission 5
|
changeset |
files
|
| Fri, 27 Jul 2012 23:16:30 -0400 |
nemo |
oops
|
changeset |
files
|
| Thu, 02 Aug 2012 16:36:11 +0200 |
Medo |
Hedgeroid: Started to implement RoomActivity
|
changeset |
files
|
| Sat, 18 Aug 2012 11:34:49 +0300 |
belphegorr |
Forgot to add mission 9 -.-'
|
changeset |
files
|
| Fri, 27 Jul 2012 19:27:39 -0400 |
nemo |
Allow AfterAttack to proceed even if the Hedgehog is dead. They could be resurrected after all.
|
changeset |
files
|
| Thu, 02 Aug 2012 16:35:12 +0200 |
Medo |
frontlib: Fixed flib_netconn_send_leaveRoom returning -1 even though there was no error.
|
changeset |
files
|