Sun, 14 Dec 2014 03:32:11 +0100 Issue 755: Lua API: Add ammo type parameter for onHogAttack
sheepluva [Sun, 14 Dec 2014 03:32:11 +0100] rev 10669
issue #755: Lua API: Add ammo type parameter for onHogAttack
Sun, 14 Dec 2014 03:16:40 +0100 lua API event: onGearWaterSkip
sheepluva [Sun, 14 Dec 2014 03:16:40 +0100] rev 10668
lua API event: onGearWaterSkip
Sun, 14 Dec 2014 02:37:30 +0100 remove links from doxygen project number as doxygen escapes them now
sheepluva [Sun, 14 Dec 2014 02:37:30 +0100] rev 10667
remove links from doxygen project number as doxygen escapes them now
Sat, 13 Dec 2014 20:12:55 +0300 Some ru l10n updates
unc0rr [Sat, 13 Dec 2014 20:12:55 +0300] rev 10666
Some ru l10n updates
Sat, 13 Dec 2014 10:05:50 -0500 use TeamsCount instead of cMaxTeams in a few loops
nemo [Sat, 13 Dec 2014 10:05:50 -0500] rev 10665
use TeamsCount instead of cMaxTeams in a few loops
Fri, 12 Dec 2014 09:51:58 +0100 Use notice and skip join on irc
Gianfranco Costamagna <costamagnagianfranco@yahoo.it> [Fri, 12 Dec 2014 09:51:58 +0100] rev 10664
Use notice and skip join on irc
Thu, 11 Dec 2014 21:32:24 -0500 remove a not that somehow magically appeared in a prior commit.
nemo [Thu, 11 Dec 2014 21:32:24 -0500] rev 10663
remove a not that somehow magically appeared in a prior commit.
Thu, 11 Dec 2014 22:22:40 +0100 make camera in wrap mode a bit smarter
sheepluva [Thu, 11 Dec 2014 22:22:40 +0100] rev 10662
make camera in wrap mode a bit smarter
Thu, 11 Dec 2014 20:46:45 +0100 world edge tweakes/fixes
sheepluva [Thu, 11 Dec 2014 20:46:45 +0100] rev 10661
world edge tweakes/fixes
Thu, 11 Dec 2014 17:50:05 +0100 fix size of PtrInt. enable tests for pas2c (all passing now)
sheepluva [Thu, 11 Dec 2014 17:50:05 +0100] rev 10660
fix size of PtrInt. enable tests for pas2c (all passing now)
Thu, 11 Dec 2014 15:20:23 +0100 pas2c doesn't like semi-colons after repeat
sheepluva [Thu, 11 Dec 2014 15:20:23 +0100] rev 10659
pas2c doesn't like semi-colons after repeat
Thu, 11 Dec 2014 07:52:51 -0500 fix copypasta
nemo [Thu, 11 Dec 2014 07:52:51 -0500] rev 10658
fix copypasta
Thu, 11 Dec 2014 13:35:35 +0100 let sinegun bounce on weBounce
sheepluva [Thu, 11 Dec 2014 13:35:35 +0100] rev 10657
let sinegun bounce on weBounce
Thu, 11 Dec 2014 21:00:42 +0900 Add (and slightly tweak) Wuzzy's Target Practice missions
mikade <redgrinner@gmail.com> [Thu, 11 Dec 2014 21:00:42 +0900] rev 10656
Add (and slightly tweak) Wuzzy's Target Practice missions
Thu, 11 Dec 2014 20:38:03 +0900 Wuzzy's changes to stats for some of the training missions.
mikade <redgrinner@gmail.com> [Thu, 11 Dec 2014 20:38:03 +0900] rev 10655
Wuzzy's changes to stats for some of the training missions.
Thu, 11 Dec 2014 10:33:49 +0100 cont.
sheepluva [Thu, 11 Dec 2014 10:33:49 +0100] rev 10654
cont.
Thu, 11 Dec 2014 10:22:51 +0100 wrap explosions!
sheepluva [Thu, 11 Dec 2014 10:22:51 +0100] rev 10653
wrap explosions!
Thu, 11 Dec 2014 09:50:31 +0100 wrap sinegun
sheepluva [Thu, 11 Dec 2014 09:50:31 +0100] rev 10652
wrap sinegun
Thu, 11 Dec 2014 01:39:29 +0100 Issue 848: Minor translation update for German (misc files)
wuzzy [Thu, 11 Dec 2014 01:39:29 +0100] rev 10651
issue #848: Minor translation update for German (misc files)
Thu, 11 Dec 2014 01:24:27 +0100 fix some old code that assumes that a bullet under water is always outside land array - which is wrong (e.g. during sudden-death in previous releases, also weSea now)
sheepluva [Thu, 11 Dec 2014 01:24:27 +0100] rev 10650
fix some old code that assumes that a bullet under water is always outside land array - which is wrong (e.g. during sudden-death in previous releases, also weSea now) also removed usage of Gear^.Damage after "if Gear^.Damage > 0 then Gear^.Damage:= 0;"
Wed, 10 Dec 2014 22:33:09 +0100 small shell script that accepts hedgewars git revisions as parameters and will try to find the respective mercurial revision
sheepluva [Wed, 10 Dec 2014 22:33:09 +0100] rev 10649
small shell script that accepts hedgewars git revisions as parameters and will try to find the respective mercurial revision
Wed, 10 Dec 2014 20:03:28 +0100 remove redundant check
sheepluva [Wed, 10 Dec 2014 20:03:28 +0100] rev 10648
remove redundant check
Wed, 10 Dec 2014 19:44:01 +0100 merge FreeTexture into FreeAndNilTexture
sheepluva [Wed, 10 Dec 2014 19:44:01 +0100] rev 10647
merge FreeTexture into FreeAndNilTexture
Wed, 10 Dec 2014 08:05:45 -0500 put back the old uteams cleanup, leaks and all, to worry about post-release since my attempt to use DeleteGear was running into the fact that that procedure does way more than just delete a gear. might need an explicit cleanup routine for both to call.
nemo [Wed, 10 Dec 2014 08:05:45 -0500] rev 10646
put back the old uteams cleanup, leaks and all, to worry about post-release since my attempt to use DeleteGear was running into the fact that that procedure does way more than just delete a gear. might need an explicit cleanup routine for both to call.
Tue, 09 Dec 2014 22:56:34 -0500 Fix in-flight colouring of land spray, make it use tint when added to land too (lua might find that handy), tweak climbhome cake delay slightly
nemo [Tue, 09 Dec 2014 22:56:34 -0500] rev 10645
Fix in-flight colouring of land spray, make it use tint when added to land too (lua might find that handy), tweak climbhome cake delay slightly
Mon, 08 Dec 2014 21:57:06 +0100 make sure view limits are updated at start of game
sheepluva [Mon, 08 Dec 2014 21:57:06 +0100] rev 10644
make sure view limits are updated at start of game
Mon, 08 Dec 2014 15:02:43 -0500 skip a bunch of stuff not applicable to cleanup
nemo [Mon, 08 Dec 2014 15:02:43 -0500] rev 10643
skip a bunch of stuff not applicable to cleanup
Mon, 08 Dec 2014 23:00:13 +0300 Normalize to length of _1_9 to avoid endless normalization leading to fire particles floating midair indefinitely
unc0rr [Mon, 08 Dec 2014 23:00:13 +0300] rev 10642
Normalize to length of _1_9 to avoid endless normalization leading to fire particles floating midair indefinitely
Mon, 08 Dec 2014 14:52:56 -0500 HedgehogDamaged calls CurrentHedgehog
nemo [Mon, 08 Dec 2014 14:52:56 -0500] rev 10641
HedgehogDamaged calls CurrentHedgehog
Mon, 08 Dec 2014 17:43:27 +0100 clean up fonts
sheepluva [Mon, 08 Dec 2014 17:43:27 +0100] rev 10640
clean up fonts
Mon, 08 Dec 2014 11:20:31 -0500 sheepluva is right
nemo [Mon, 08 Dec 2014 11:20:31 -0500] rev 10639
sheepluva is right
Mon, 08 Dec 2014 10:55:56 -0500 oh, probably need nil checks here too
nemo [Mon, 08 Dec 2014 10:55:56 -0500] rev 10638
oh, probably need nil checks here too
Mon, 08 Dec 2014 10:30:20 -0500 init timer to 0
nemo [Mon, 08 Dec 2014 10:30:20 -0500] rev 10637
init timer to 0
Mon, 08 Dec 2014 10:24:06 -0500 meh. will persevere. DeleteGear can't call that much stuff...
nemo [Mon, 08 Dec 2014 10:24:06 -0500] rev 10636
meh. will persevere. DeleteGear can't call that much stuff...
Mon, 08 Dec 2014 10:14:47 -0500 nil out CurrentHedgehog in FreeModule, add a test for nil'd CurrentHedgehog in DelCI since I'd still like to use DeleteGear for the other stuff it does. Move some variable initialiasations in AI Misc to hopefully avoid some uninit val errors.
nemo [Mon, 08 Dec 2014 10:14:47 -0500] rev 10635
nil out CurrentHedgehog in FreeModule, add a test for nil'd CurrentHedgehog in DelCI since I'd still like to use DeleteGear for the other stuff it does. Move some variable initialiasations in AI Misc to hopefully avoid some uninit val errors.
Mon, 08 Dec 2014 09:35:14 -0500 Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
nemo [Mon, 08 Dec 2014 09:35:14 -0500] rev 10634
Use FreeAndNil across the board. Even if we are immediately assigning after, probably avoids accidental mistakes. Also free neglected owner tex on shutdown, and delete hog gears using the normal deletion procedure if for any reason they still exist (EndGame call?).
Sun, 07 Dec 2014 14:36:28 -0500 Add that "make screenshots of Land/LandPixels" thing for map creators
nemo [Sun, 07 Dec 2014 14:36:28 -0500] rev 10633
Add that "make screenshots of Land/LandPixels" thing for map creators
Sat, 06 Dec 2014 10:41:33 -0500 pretty sure the other teams need stats at 0 for the graph to look right
nemo [Sat, 06 Dec 2014 10:41:33 -0500] rev 10632
pretty sure the other teams need stats at 0 for the graph to look right
Fri, 05 Dec 2014 15:30:34 +0100 make BasketballField available as regular map. maybe should make it destructable when not in mission mode *shrugs*
sheepluva [Fri, 05 Dec 2014 15:30:34 +0100] rev 10631
make BasketballField available as regular map. maybe should make it destructable when not in mission mode *shrugs*
Fri, 05 Dec 2014 23:01:27 +0900 Add another (test) map
mikade <redgrinner@gmail.com> [Fri, 05 Dec 2014 23:01:27 +0900] rev 10630
Add another (test) map
Fri, 05 Dec 2014 02:39:25 +0100 some translation tweaks
sheepluva [Fri, 05 Dec 2014 02:39:25 +0100] rev 10629
some translation tweaks
Fri, 05 Dec 2014 02:21:35 +0100 better initial camera position
sheepluva [Fri, 05 Dec 2014 02:21:35 +0100] rev 10628
better initial camera position
Fri, 05 Dec 2014 02:20:33 +0100 darken wrapped world etc. some more
sheepluva [Fri, 05 Dec 2014 02:20:33 +0100] rev 10627
darken wrapped world etc. some more
Fri, 05 Dec 2014 02:19:30 +0100 adjust position of world edges (at 150 px away from outmost land collision, or less if land array ends earlier)
sheepluva [Fri, 05 Dec 2014 02:19:30 +0100] rev 10626
adjust position of world edges (at 150 px away from outmost land collision, or less if land array ends earlier)
Thu, 04 Dec 2014 20:15:03 +0100 flake FrameTicks value of 0 now indicades that the frame should not be changed
sheepluva [Thu, 04 Dec 2014 20:15:03 +0100] rev 10625
flake FrameTicks value of 0 now indicades that the frame should not be changed
Thu, 04 Dec 2014 11:19:38 -0500
nemo [Thu, 04 Dec 2014 11:19:38 -0500] rev 10624
Thu, 04 Dec 2014 11:11:17 -0500 Skip frame increments if FrameTicks is over 1000 seconds per frame, probably indicating static at that point.
nemo [Thu, 04 Dec 2014 11:11:17 -0500] rev 10623
Skip frame increments if FrameTicks is over 1000 seconds per frame, probably indicating static at that point.
Wed, 03 Dec 2014 18:49:10 +0100 pas2c-whoops
sheepluva [Wed, 03 Dec 2014 18:49:10 +0100] rev 10622
pas2c-whoops
Wed, 03 Dec 2014 18:32:37 +0100 add warning to logs when tests terminates prematurely
sheepluva [Wed, 03 Dec 2014 18:32:37 +0100] rev 10621
add warning to logs when tests terminates prematurely
Wed, 03 Dec 2014 18:22:57 +0100 oops, didn't mean to commit that
sheepluva [Wed, 03 Dec 2014 18:22:57 +0100] rev 10620
oops, didn't mean to commit that
Wed, 03 Dec 2014 18:18:37 +0100 unexpected return from lua test should not return exit status 0
sheepluva [Wed, 03 Dec 2014 18:18:37 +0100] rev 10619
unexpected return from lua test should not return exit status 0
Wed, 03 Dec 2014 17:59:31 +0100 tweaking the lua test function thingy
sheepluva [Wed, 03 Dec 2014 17:59:31 +0100] rev 10618
tweaking the lua test function thingy
Wed, 03 Dec 2014 11:32:18 -0500 set globals in commandline lua
nemo [Wed, 03 Dec 2014 11:32:18 -0500] rev 10617
set globals in commandline lua
Thu, 18 Dec 2014 00:03:53 +0300 Schemes list combobox with their names qmlfrontend
unc0rr [Thu, 18 Dec 2014 00:03:53 +0300] rev 10616
Schemes list combobox with their names
Wed, 03 Dec 2014 17:09:04 +0100 fix some things I messed up with the drawing functions
sheepluva [Wed, 03 Dec 2014 17:09:04 +0100] rev 10615
fix some things I messed up with the drawing functions
Sun, 07 Dec 2014 22:22:39 +0300 More complete fix for FULLMAPCONFIG message, also add new known protocol versions qmlfrontend
unc0rr [Sun, 07 Dec 2014 22:22:39 +0300] rev 10614
More complete fix for FULLMAPCONFIG message, also add new known protocol versions
Tue, 02 Dec 2014 23:55:20 +0100 update changelog
sheepluva [Tue, 02 Dec 2014 23:55:20 +0100] rev 10613
update changelog
Thu, 04 Dec 2014 00:34:40 +0300 Script combobox.wiki qmlfrontend
unc0rr [Thu, 04 Dec 2014 00:34:40 +0300] rev 10612
Script combobox.wiki
Tue, 02 Dec 2014 23:33:28 +0100 move functionality of Draw.lua into engine
sheepluva [Tue, 02 Dec 2014 23:33:28 +0100] rev 10611
move functionality of Draw.lua into engine
Wed, 03 Dec 2014 23:36:18 +0300 Finish combobox implementation (except for visual part) qmlfrontend
unc0rr [Wed, 03 Dec 2014 23:36:18 +0300] rev 10610
Finish combobox implementation (except for visual part)
Tue, 02 Dec 2014 22:11:22 +0100 make tests use Draw.lua for now too
sheepluva [Tue, 02 Dec 2014 22:11:22 +0100] rev 10609
make tests use Draw.lua for now too
Wed, 03 Dec 2014 00:20:21 +0300 Some more progress at custom combobox qmlfrontend
unc0rr [Wed, 03 Dec 2014 00:20:21 +0300] rev 10608
Some more progress at custom combobox
Tue, 02 Dec 2014 16:45:26 -0500 forgot this one.
nemo [Tue, 02 Dec 2014 16:45:26 -0500] rev 10607
forgot this one.
Wed, 03 Dec 2014 00:07:33 +0300 merge default qmlfrontend
unc0rr [Wed, 03 Dec 2014 00:07:33 +0300] rev 10606
merge default
Tue, 02 Dec 2014 20:20:04 +0100 oops, IOResult is a function in pascal, but not in pas2c
sheepluva [Tue, 02 Dec 2014 20:20:04 +0100] rev 10605
oops, IOResult is a function in pascal, but not in pas2c
Tue, 02 Dec 2014 14:26:16 -0500 Sheepluva thought this was worth adding.
nemo [Tue, 02 Dec 2014 14:26:16 -0500] rev 10604
Sheepluva thought this was worth adding.
Tue, 02 Dec 2014 13:29:06 -0500 switch mapgen to enum. should still try and make sure the values are backwards compatible if possible.
nemo [Tue, 02 Dec 2014 13:29:06 -0500] rev 10603
switch mapgen to enum. should still try and make sure the values are backwards compatible if possible.
Tue, 02 Dec 2014 12:02:20 +0300 Fix FULLMAPCONFIG message
unC0Rr [Tue, 02 Dec 2014 12:02:20 +0300] rev 10602
Fix FULLMAPCONFIG message
Mon, 01 Dec 2014 23:09:35 +0100 update land texture /after/ smoothing
sheepluva [Mon, 01 Dec 2014 23:09:35 +0100] rev 10601
update land texture /after/ smoothing
Mon, 01 Dec 2014 19:24:40 +0100 fix despeckle
sheepluva [Mon, 01 Dec 2014 19:24:40 +0100] rev 10600
fix despeckle
Mon, 01 Dec 2014 17:55:09 +0100 weapon set: Shoppa Pro
sheepluva [Mon, 01 Dec 2014 17:55:09 +0100] rev 10599
weapon set: Shoppa Pro
Mon, 01 Dec 2014 11:11:19 -0500 This should probably fix multiplayer desync, but is the result of fiddling while pretty sick/feverish so, needs testing, and the water/scaling stuff is disabled.
nemo [Mon, 01 Dec 2014 11:11:19 -0500] rev 10598
This should probably fix multiplayer desync, but is the result of fiddling while pretty sick/feverish so, needs testing, and the water/scaling stuff is disabled.
Mon, 01 Dec 2014 13:07:42 +0300 oops
unC0Rr [Mon, 01 Dec 2014 13:07:42 +0300] rev 10597
oops
Mon, 01 Dec 2014 11:37:28 +0900 some friendly updates to TechRacer
mikade <redgrinner@gmail.com> [Mon, 01 Dec 2014 11:37:28 +0900] rev 10596
some friendly updates to TechRacer
Sun, 30 Nov 2014 23:32:55 +0100 turns out IOResult is actually IOResult() - a function that clears its result after each call
sheepluva [Sun, 30 Nov 2014 23:32:55 +0100] rev 10595
turns out IOResult is actually IOResult() - a function that clears its result after each call
Sun, 30 Nov 2014 22:48:28 +0100 oops, fix logging. had = instead of <> in an error check
sheepluva [Sun, 30 Nov 2014 22:48:28 +0100] rev 10594
oops, fix logging. had = instead of <> in an error check
Sun, 30 Nov 2014 16:18:19 -0500 *sigh*
nemo [Sun, 30 Nov 2014 16:18:19 -0500] rev 10593
*sigh*
Sun, 30 Nov 2014 16:06:39 -0500 stricter skip
nemo [Sun, 30 Nov 2014 16:06:39 -0500] rev 10592
stricter skip
Sun, 30 Nov 2014 23:36:22 +0300 Limit fire particles speed to 2
unc0rr [Sun, 30 Nov 2014 23:36:22 +0300] rev 10591
Limit fire particles speed to 2
Sun, 30 Nov 2014 21:32:24 +0100 fix for Issue 840: Basic Training - Grenade is failing to dismiss team
sheepluva [Sun, 30 Nov 2014 21:32:24 +0100] rev 10590
fix for issue #840: Basic Training - Grenade is failing to dismiss team
Sun, 30 Nov 2014 15:30:51 -0500 expose FlightTime to lua, disable in-air flame harming moving hogs ☹ aaaand override that in ClimbHome ☺
nemo [Sun, 30 Nov 2014 15:30:51 -0500] rev 10589
expose FlightTime to lua, disable in-air flame harming moving hogs ☹ aaaand override that in ClimbHome ☺
Sun, 30 Nov 2014 21:15:46 +0100 don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
sheepluva [Sun, 30 Nov 2014 21:15:46 +0100] rev 10588
don't forbid running regular chat commands during turns of other teams. that was probably only meant for emotes to begin with
Sun, 30 Nov 2014 15:12:59 -0500 delay cake boom until it has walked a little bit. also fix accidental drowning of watergods in last commit
nemo [Sun, 30 Nov 2014 15:12:59 -0500] rev 10587
delay cake boom until it has walked a little bit. also fix accidental drowning of watergods in last commit
Sun, 30 Nov 2014 15:07:01 -0500 add a half-second flighttime delay to flamethrower flames so they can leave the "barrel" of the flamethrower without burning the hog
nemo [Sun, 30 Nov 2014 15:07:01 -0500] rev 10586
add a half-second flighttime delay to flamethrower flames so they can leave the "barrel" of the flamethrower without burning the hog
Sun, 30 Nov 2014 14:41:40 -0500 Should prevent desync hopefully. Thanks unc0rr
nemo [Sun, 30 Nov 2014 14:41:40 -0500] rev 10585
Should prevent desync hopefully. Thanks unc0rr
Sun, 30 Nov 2014 17:20:37 +0100 fix copypasta-fail that would cause splashes to use invalid sprite data pointer. should fix issue 838
sheepluva [Sun, 30 Nov 2014 17:20:37 +0100] rev 10584
fix copypasta-fail that would cause splashes to use invalid sprite data pointer. should fix issue #838
Sat, 29 Nov 2014 21:29:32 -0500 oh right, forgot sheepluva had fixed ice
nemo [Sat, 29 Nov 2014 21:29:32 -0500] rev 10583
oh right, forgot sheepluva had fixed ice
Sun, 30 Nov 2014 02:41:49 +0100 give sea world edges some icegun love
sheepluva [Sun, 30 Nov 2014 02:41:49 +0100] rev 10582
give sea world edges some icegun love
Sat, 29 Nov 2014 21:29:11 -0500 Wuzzy's changes to climbhome w/ some tweaks by me
nemo [Sat, 29 Nov 2014 21:29:11 -0500] rev 10581
Wuzzy's changes to climbhome w/ some tweaks by me
Sat, 29 Nov 2014 15:30:33 -0500 Reset max team health after script may have screwed with it on start. Maybe a script max health reset function could be useful too. Set climbhome hogs to invulnerable while not their turn if needed to avoid accidental mine/dead hog damage. Tweak cake fire boom a bit.
nemo [Sat, 29 Nov 2014 15:30:33 -0500] rev 10580
Reset max team health after script may have screwed with it on start. Maybe a script max health reset function could be useful too. Set climbhome hogs to invulnerable while not their turn if needed to avoid accidental mine/dead hog damage. Tweak cake fire boom a bit.
Sat, 29 Nov 2014 14:57:07 -0500 Move cake FollowGear to Attack like most others, remove the gmAttack clearing which is also done in Attack.
nemo [Sat, 29 Nov 2014 14:57:07 -0500] rev 10579
Move cake FollowGear to Attack like most others, remove the gmAttack clearing which is also done in Attack.
Sat, 29 Nov 2014 14:00:40 -0500 duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
nemo [Sat, 29 Nov 2014 14:00:40 -0500] rev 10578
duplicate the ammoshove block into the falling fire area - this will make falling flames take out hogs in saucers, on rope, etc. no more dodging your own napalm strike by taking to the skies...
Sat, 29 Nov 2014 18:56:42 +0100 don't drown unplaced hedgehogs. thanks to zimmux and Wohlstand for reporting
sheepluva [Sat, 29 Nov 2014 18:56:42 +0100] rev 10577
don't drown unplaced hedgehogs. thanks to zimmux and Wohlstand for reporting
Sat, 29 Nov 2014 18:14:49 +0100 some moar mergin'
sheepluva [Sat, 29 Nov 2014 18:14:49 +0100] rev 10576
some moar mergin'
Sat, 29 Nov 2014 18:13:49 +0100 super-filthy hack to allow pas2c to fallback to writing to stderr.
sheepluva [Sat, 29 Nov 2014 18:13:49 +0100] rev 10575
super-filthy hack to allow pas2c to fallback to writing to stderr.
Sat, 29 Nov 2014 17:33:51 +0100 oops. no need to (re)open stderr I guess
sheepluva [Sat, 29 Nov 2014 17:33:51 +0100] rev 10574
oops. no need to (re)open stderr I guess
(0) -10000 -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 tip