Fri, 02 Apr 2010 18:36:14 +0000 nemo inu adds portugese translation
Fri, 02 Apr 2010 18:35:53 +0000 nemo Fix line endings. Again.
Fri, 02 Apr 2010 18:22:53 +0000 nemo Complete slovak locale by jose1711
Fri, 02 Apr 2010 16:04:37 +0000 nemo Rebalance Default to take into account reweighting of crates, remove redundant check
Fri, 02 Apr 2010 15:59:23 +0000 unc0rr Allow to set motd for old client versions (not used yet, as server needs some refactoring)
Fri, 02 Apr 2010 15:58:45 +0000 nemo This attempts to distribute crates based on their probabilities, while preserving 35% for health crates since that has no probability GUI yet
Fri, 02 Apr 2010 15:58:37 +0000 unc0rr Update russian translation a bit more
Fri, 02 Apr 2010 15:53:58 +0000 smxx Maps:
Fri, 02 Apr 2010 15:50:54 +0000 palewolf Spanish translation for new maze settings
Fri, 02 Apr 2010 15:41:39 +0000 nemo Alter distribution of probabilities from frontend, allow utility crates in shoppa if probabilities permit (still ban health crates)
Fri, 02 Apr 2010 15:33:11 +0000 nemo Call modify damage on poison damage
Fri, 02 Apr 2010 15:30:54 +0000 koda display team contents in the ifrontend
Fri, 02 Apr 2010 15:28:09 +0000 palewolf Retouched Pikachu hat
Fri, 02 Apr 2010 15:08:43 +0000 koda continue working for team support on the ifrontend
Fri, 02 Apr 2010 12:38:36 +0000 koda intial support for team configuration on the ifrontend
Fri, 02 Apr 2010 10:50:10 +0000 sheepluva * make positions of both sky and horizon dependent on the most remote waterwave by adjusting Palewolf's offset values
Fri, 02 Apr 2010 08:46:57 +0000 palewolf - Added SkyOffset, HorizontOffset as global vars
Fri, 02 Apr 2010 08:35:34 +0000 sheepluva Shotgun Training: * '["en"]' was supposed to be '["pl"]' (Mmmmh, copypasta :D)
Thu, 01 Apr 2010 23:37:28 +0000 sheepluva * fixing bug #156: Cancel button on password request works now.
Thu, 01 Apr 2010 21:57:03 +0000 koda fix an error in passing strings between ObjC and Pascal
Thu, 01 Apr 2010 17:01:04 +0000 smxx Lua:
Thu, 01 Apr 2010 16:59:10 +0000 nemo Sorry
Thu, 01 Apr 2010 16:55:42 +0000 nemo Suppress warning
Thu, 01 Apr 2010 16:48:55 +0000 koda sheepluva's name is finally revealed (watch out for fangirls)
Thu, 01 Apr 2010 16:46:44 +0000 smxx Maps:
Thu, 01 Apr 2010 16:44:56 +0000 nemo this was not checking all of Land[]
Thu, 01 Apr 2010 16:34:20 +0000 nemo Somehow, these files are not using local encoding
Thu, 01 Apr 2010 16:28:03 +0000 nemo Further updates by jose1711 - who knows, maybe he'll get it finished before release at this point
Thu, 01 Apr 2010 16:08:09 +0000 nemo Update (c) lines to 2010 as unc0rr requested - they all had varying values so I just took the first year mentioned, then tacked on -2010
Thu, 01 Apr 2010 10:47:04 +0000 smxx Trainings:
Thu, 01 Apr 2010 10:40:12 +0000 smxx Trainings:
Thu, 01 Apr 2010 10:33:29 +0000 smxx Misc:
Thu, 01 Apr 2010 09:04:42 +0000 sheepluva * make invul animations of different hogs run asynchronously
Thu, 01 Apr 2010 08:26:16 +0000 sheepluva * fix SmokeTrace and EvilTrace to be centered instead of 2 pixel off
Thu, 01 Apr 2010 05:33:32 +0000 sheepluva * check for valid TWave before starting/drawing them, prevents segfault
Thu, 01 Apr 2010 05:25:10 +0000 unc0rr Fix build
Thu, 01 Apr 2010 05:10:50 +0000 unc0rr - update russian translation a bit
Thu, 01 Apr 2010 00:56:38 +0000 sheepluva add fixed mission script files incl. inu's translation (portuguese I believe)
Thu, 01 Apr 2010 00:56:15 +0000 sheepluva removing corrupted mission scripts (diff can't handle them)
Thu, 01 Apr 2010 00:48:26 +0000 nemo another uninitialised value radz[k] for corresponding pa.ar of NTPX
Thu, 01 Apr 2010 00:38:02 +0000 sheepluva possible map gen desync "fix" -- test please
Thu, 01 Apr 2010 00:21:00 +0000 koda credits updated, adding Palewolf, sheepluva and prg as devs and replaced my previous openal stuff with something more current
Thu, 01 Apr 2010 00:16:23 +0000 nemo move this island further away from water too
Wed, 31 Mar 2010 22:54:28 +0000 koda koda's changelog turn
Wed, 31 Mar 2010 22:02:12 +0000 nemo Partial update by jose1711
Wed, 31 Mar 2010 20:54:50 +0000 nemo Partial translation by BeholdMyGlory
Wed, 31 Mar 2010 20:51:26 +0000 nemo Updated by FIQ
Wed, 31 Mar 2010 20:47:38 +0000 nemo Add inu to credits since he kept going on about it
Wed, 31 Mar 2010 20:44:38 +0000 nemo Only require a minimum speed if object is descending.
Wed, 31 Mar 2010 20:03:43 +0000 sheepluva YOUR AD HERE! (just fixed a typo)
Wed, 31 Mar 2010 17:56:24 +0000 smxx General:
Wed, 31 Mar 2010 17:52:55 +0000 smxx General:
Wed, 31 Mar 2010 17:51:36 +0000 sheepluva changin da changelog
Wed, 31 Mar 2010 17:48:23 +0000 nemo broken
Wed, 31 Mar 2010 17:40:46 +0000 unc0rr nemo's update to changelog
Wed, 31 Mar 2010 17:35:06 +0000 smxx General:
Wed, 31 Mar 2010 17:23:01 +0000 nemo pika pika
Wed, 31 Mar 2010 16:03:19 +0000 nemo Partial update from FIQ (those parts that didn't require correct encoding)
Wed, 31 Mar 2010 15:43:52 +0000 nemo 3 more pokemon
Wed, 31 Mar 2010 13:41:05 +0000 smxx CMake:
Wed, 31 Mar 2010 11:59:32 +0000 smxx Engine:
Wed, 31 Mar 2010 11:34:58 +0000 sheepluva make use of Smaxx latest commit(s) when playing ImpactSounds
Wed, 31 Mar 2010 11:00:30 +0000 smxx Engine:
Wed, 31 Mar 2010 10:59:30 +0000 smxx Engine:
Wed, 31 Mar 2010 02:33:05 +0000 nemo Minor tweak
Tue, 30 Mar 2010 23:29:30 +0000 koda fixes to the mac build system
Tue, 30 Mar 2010 23:20:07 +0000 smxx CMake:
Tue, 30 Mar 2010 23:13:12 +0000 smxx Maps:
Tue, 30 Mar 2010 23:03:51 +0000 smxx Engine:
Tue, 30 Mar 2010 20:51:25 +0000 smxx Frontend:
Tue, 30 Mar 2010 20:39:34 +0000 palewolf Updated as for version 3225 to translate the tunnel things by Renato Gelmini
Tue, 30 Mar 2010 20:36:52 +0000 koda hopefully set the correct property...
Tue, 30 Mar 2010 20:34:16 +0000 palewolf Insert commit message here about deleting hats
Tue, 30 Mar 2010 20:33:20 +0000 smxx Maps:
Tue, 30 Mar 2010 20:31:28 +0000 palewolf Bad Palewolf, don't commit flags as hats
Tue, 30 Mar 2010 20:30:51 +0000 koda inu and szczur locale files
Tue, 30 Mar 2010 20:30:28 +0000 smxx Maps:
Tue, 30 Mar 2010 20:27:26 +0000 palewolf Pokemon hats
Tue, 30 Mar 2010 20:18:54 +0000 palewolf Blox theme Sky.png was ¿white?
Tue, 30 Mar 2010 20:18:04 +0000 smxx Frontend:
Tue, 30 Mar 2010 20:17:12 +0000 palewolf - Birdy is no longer translated
Tue, 30 Mar 2010 17:50:58 +0000 nemo typo in template 41 definition. using FPoints from 40
Tue, 30 Mar 2010 17:44:02 +0000 smxx Engine:
Tue, 30 Mar 2010 17:17:15 +0000 smxx Engine/Frontend:
Tue, 30 Mar 2010 16:01:12 +0000 sheepluva fix fpc 2.2.4 type related warning with unclear origin
Tue, 30 Mar 2010 15:46:33 +0000 nemo recompress pngs
Tue, 30 Mar 2010 13:51:19 +0000 smxx Themes:
Tue, 30 Mar 2010 13:49:32 +0000 nemo move RSR to reserved for this release
Tue, 30 Mar 2010 13:45:41 +0000 nemo bustamove flag. Thanks Tiy
Tue, 30 Mar 2010 13:41:06 +0000 nemo New hat
Tue, 30 Mar 2010 13:35:26 +0000 smxx Engine:
Tue, 30 Mar 2010 13:33:01 +0000 nemo This map has always been broken. This variant makes it slightly less broken (although something changed on the ceiling might prevent hiding on pixels on the slope). What will finally fix it is either moving nets closer together or adding angle bounce to hedgehogs or some other layout that prevents hiding.
Tue, 30 Mar 2010 13:20:04 +0000 smxx Engine:
Tue, 30 Mar 2010 02:45:31 +0000 nemo crank up r a bit
Tue, 30 Mar 2010 00:03:58 +0000 koda ifrontend: predispone teams in a proper data structure
Tue, 30 Mar 2010 00:02:40 +0000 nemo prophylactic removal of some Integer references, raise a few of the template islands up a bit so they work inverted without triggering border
Mon, 29 Mar 2010 23:47:38 +0000 palewolf Fix a small glitch due to scaling down in mines and airplaine pixmaps
Mon, 29 Mar 2010 23:39:31 +0000 palewolf Finish fixing pngs gray border when zooming
Mon, 29 Mar 2010 23:27:35 +0000 koda properties for everyone!!!
Mon, 29 Mar 2010 23:20:34 +0000 koda just some very sane stuff for the iphone port (plus some macro on pascal files)
Mon, 29 Mar 2010 20:49:36 +0000 palewolf Updated spanish translation
Mon, 29 Mar 2010 20:43:57 +0000 smxx Frontend:
Mon, 29 Mar 2010 20:40:33 +0000 smxx Engine:
Mon, 29 Mar 2010 20:32:35 +0000 palewolf - Add HH dX/dY to Birdy disappearing animation
Mon, 29 Mar 2010 20:27:54 +0000 smxx Frontend:
Mon, 29 Mar 2010 18:50:22 +0000 smxx Frontend:
Mon, 29 Mar 2010 16:43:47 +0000 nemo Add birdy.
Mon, 29 Mar 2010 16:39:08 +0000 smxx Frontend:
Mon, 29 Mar 2010 13:58:21 +0000 unc0rr Update Italian translation by Renato Gelmini
Mon, 29 Mar 2010 13:41:10 +0000 sheepluva fix typo in team name: possesed -> possessed
Mon, 29 Mar 2010 13:37:52 +0000 smxx Engine:
Mon, 29 Mar 2010 13:35:15 +0000 smxx Engine:
Mon, 29 Mar 2010 09:52:10 +0000 smxx Engine:
Sun, 28 Mar 2010 23:41:58 +0000 palewolf AfterAttack was issued twice
Sun, 28 Mar 2010 23:40:49 +0000 palewolf Return control as soon as Birdy begins to disappear
Sun, 28 Mar 2010 23:37:28 +0000 palewolf Birdy appears from off-screen
Sun, 28 Mar 2010 23:21:07 +0000 mbait Feather: sprites was moved to another layer
Sun, 28 Mar 2010 23:14:54 +0000 mbait Feather: sprite size fix
Sun, 28 Mar 2010 23:11:16 +0000 mbait Feather: wrong constant fix
Sun, 28 Mar 2010 23:10:33 +0000 mbait Birdy's falling feathers
Sun, 28 Mar 2010 23:05:33 +0000 nemo Adding small to these has never been useful
Sun, 28 Mar 2010 21:53:03 +0000 sheepluva * tweaked some random stuff in GSHandlers.inc
Sun, 28 Mar 2010 20:53:36 +0000 nemo claymore_ would like rearranged as so. hearing no objections...
Sun, 28 Mar 2010 18:47:35 +0000 nemo prg adds option to toggle girders in maze, adjusts some frontend strings
Sun, 28 Mar 2010 18:28:46 +0000 smxx Engine:
Sun, 28 Mar 2010 18:26:31 +0000 smxx Engine:
Sun, 28 Mar 2010 16:46:26 +0000 nemo prg tweaks maze
Sun, 28 Mar 2010 16:42:03 +0000 nemo One more wacky generated map. bunch of islands suitable for islands shoppa.
Sun, 28 Mar 2010 16:35:44 +0000 sheepluva * removed old hellishimpact.ogg
Sun, 28 Mar 2010 12:02:51 +0000 nemo another ban for gstLoser
Sun, 28 Mar 2010 11:34:06 +0000 smxx CMake:
Sun, 28 Mar 2010 02:49:39 +0000 nemo prg's maze generator
Sun, 28 Mar 2010 00:46:34 +0000 palewolf Add background color to translucent png to avoid gray borders when zooming
Sun, 28 Mar 2010 00:45:56 +0000 palewolf Updated spanish locale
Sat, 27 Mar 2010 22:37:39 +0000 smxx Themes:
Sat, 27 Mar 2010 22:25:18 +0000 smxx Engine:
Sat, 27 Mar 2010 22:10:33 +0000 smxx Sometimes you should just check to see if syntax highlighting is kicking in ...
Sat, 27 Mar 2010 21:04:38 +0000 smxx CMake
Sat, 27 Mar 2010 21:03:29 +0000 smxx Engine:
Sat, 27 Mar 2010 21:02:41 +0000 smxx CMake:
Sat, 27 Mar 2010 20:55:55 +0000 smxx General:
Sat, 27 Mar 2010 20:51:53 +0000 smxx Engine:
Sat, 27 Mar 2010 17:45:51 +0000 koda hide the background gl context that remains active (might be worth freeing ithide the background gl context that remains active (might be worth freeing it))
Sat, 27 Mar 2010 17:45:26 +0000 nemo Restore this for now until I figure out why ShowCrosshair is being cleared on last rope
Sat, 27 Mar 2010 17:40:42 +0000 palewolf Fix mortar grey border
Sat, 27 Mar 2010 17:32:46 +0000 smxx Engine:
Sat, 27 Mar 2010 17:32:04 +0000 nemo New impact sounds for HHG
Sat, 27 Mar 2010 17:31:01 +0000 koda complete previous commit (which broken my local copy as well)
Sat, 27 Mar 2010 17:27:15 +0000 koda branch ipad/iphone files to keep compatibility between versions
Sat, 27 Mar 2010 17:22:33 +0000 smxx Engine:
Sat, 27 Mar 2010 17:03:27 +0000 nemo Tidier way to handle crosshair drawing. show/hide based on CurAmmoGear for alt attack weps
Sat, 27 Mar 2010 16:57:18 +0000 koda * port fadeout to opengles
Sat, 27 Mar 2010 15:48:59 +0000 smxx Engine:
Sat, 27 Mar 2010 15:41:21 +0000 nemo Keep crosshair active when using rope, regardless of alt wep
Sat, 27 Mar 2010 14:57:41 +0000 smxx Engine:
Sat, 27 Mar 2010 14:55:59 +0000 nemo Reduce turns to -1 to allow processing health machine on first turn. Needs testing with Sudden Death set to 0
Sat, 27 Mar 2010 14:49:04 +0000 nemo 4 new hats, 2 reserved
Sat, 27 Mar 2010 14:03:30 +0000 smxx Engine:
Sat, 27 Mar 2010 12:05:01 +0000 smxx CMake:
Sat, 27 Mar 2010 12:01:40 +0000 smxx CMake:
Sat, 27 Mar 2010 11:59:03 +0000 palewolf - Bee sprites for target and HH hand
Sat, 27 Mar 2010 11:53:37 +0000 mbait Forgotten sprite
Sat, 27 Mar 2010 11:48:02 +0000 mbait Added egg sprite
Sat, 27 Mar 2010 08:59:42 +0000 mbait Wind does not affect of eggs
Sat, 27 Mar 2010 08:59:10 +0000 mbait Added poisoned eggs
Sat, 27 Mar 2010 05:45:45 +0000 nemo Add Wood forts
Sat, 27 Mar 2010 05:15:52 +0000 nemo Specifically check for current hedgehog being on rope, the tricky bastard.
Sat, 27 Mar 2010 04:02:02 +0000 nemo Try to reduce expensive Distance() call until sure it is needed
Sat, 27 Mar 2010 03:55:12 +0000 nemo Remove Distance from flake kick, reduce calls to Random() in flame replacing w/ checks on game tick and a little randomness.
Sat, 27 Mar 2010 03:39:35 +0000 sheepluva tweaked hellish impact sound a bit. and yeah, we really need to limit how frequently impact sounds can be triggered on bounce >.<
Sat, 27 Mar 2010 02:55:35 +0000 sheepluva making collision/impact sounds a gear property + adding random melon+hellish sound, feel free to hate me :D
Sat, 27 Mar 2010 00:48:59 +0000 palewolf Tweaking water depth with Tiy
Sat, 27 Mar 2010 00:03:29 +0000 sheepluva doStepBomb: cache rounded values of Gear^.X/Y instead of recalculating the exact same values up to 512 times
Sat, 27 Mar 2010 00:03:25 +0000 koda some code polish for the ifrontend
Fri, 26 Mar 2010 23:47:12 +0000 koda restore compilation
Fri, 26 Mar 2010 22:53:42 +0000 palewolf First go at water depth
Fri, 26 Mar 2010 22:52:04 +0000 smxx General:
Fri, 26 Mar 2010 21:03:15 +0000 palewolf Bad nemo... uppercase theme names in themes.cfg too
Fri, 26 Mar 2010 19:59:15 +0000 nemo remove pointless code
Fri, 26 Mar 2010 17:43:21 +0000 smxx Engine:
Fri, 26 Mar 2010 17:34:58 +0000 smxx Engine:
Fri, 26 Mar 2010 17:22:52 +0000 nemo Eliminate flake kick on themes with no flakes, more than 200 flakes (city) or explosions of 25 or smaller
Fri, 26 Mar 2010 17:18:44 +0000 nemo Updated border colours from Tiy
Fri, 26 Mar 2010 16:02:47 +0000 smxx Engine:
Fri, 26 Mar 2010 15:59:21 +0000 smxx Engine:
Fri, 26 Mar 2010 15:56:26 +0000 nemo Horizontally flip background textures on all themes but Desert and City. Also reduce PNG sizes a bit
Fri, 26 Mar 2010 15:55:20 +0000 nemo Remove doubled call of freeEverything
Fri, 26 Mar 2010 15:52:47 +0000 nemo Uppercase all theme and map names
Fri, 26 Mar 2010 12:38:11 +0000 mbait New field in THedgehog for poisoning. New type of explosion- poisoned
Fri, 26 Mar 2010 12:34:18 +0000 smxx Engine:
Fri, 26 Mar 2010 12:16:12 +0000 smxx Frontend:
Fri, 26 Mar 2010 09:40:26 +0000 koda add another button to close the game and return to the iFrontend (untested)
Fri, 26 Mar 2010 03:04:19 +0000 nemo I don't know why I'm bothering. Sheepluva has a whole new approach in the works.
Fri, 26 Mar 2010 00:53:31 +0000 nemo Add more dY checks to allow greater 45 deg bouncing, simplify check for stopped gear in interests of perf.
Fri, 26 Mar 2010 00:49:02 +0000 nemo Change settings for birdy in default weapon sets
Fri, 26 Mar 2010 00:39:49 +0000 smxx CMake:
Fri, 26 Mar 2010 00:39:00 +0000 nemo remove utility flag
Fri, 26 Mar 2010 00:37:36 +0000 smxx CMake:
Fri, 26 Mar 2010 00:26:32 +0000 nemo Enable birdy. Has egg bombing. Eggs should possibly have a dX component. No poison yet, no egg sprite.
Thu, 25 Mar 2010 23:03:21 +0000 mbait Birdy egg added
Thu, 25 Mar 2010 23:02:55 +0000 koda testing ftw
Thu, 25 Mar 2010 23:01:50 +0000 koda reworked interaction of engine/frontend when closing
Thu, 25 Mar 2010 02:02:53 +0000 nemo tweak kick in case of wrapping
Wed, 24 Mar 2010 23:31:13 +0000 smxx Frontend:
Wed, 24 Mar 2010 18:01:49 +0000 nemo Android hat
Wed, 24 Mar 2010 15:36:46 +0000 nemo Tiy redraws random order button
Wed, 24 Mar 2010 14:03:03 +0000 smxx Engine:
Wed, 24 Mar 2010 11:01:21 +0000 nemo Use MAXTHEMEOBJECTS instead of Count which appears to be 0 at this point.
Tue, 23 Mar 2010 23:08:57 +0000 palewolf - Avoid gaps between land and grass in mushroom2
Tue, 23 Mar 2010 21:58:23 +0000 koda fix a build error on 10.5, LandPixels properly initialized
Tue, 23 Mar 2010 21:50:26 +0000 palewolf Make UFO rotate while flying
Tue, 23 Mar 2010 19:06:43 +0000 nemo Free land object SDL surfaces.
Tue, 23 Mar 2010 16:53:45 +0000 unc0rr wtf
Tue, 23 Mar 2010 16:50:13 +0000 unc0rr Ok, this part is ok
Mon, 22 Mar 2010 20:57:49 +0000 smxx Maps:
Mon, 22 Mar 2010 20:19:06 +0000 nemo I can't read.
Mon, 22 Mar 2010 18:04:18 +0000 nemo oh. I missed the fact he moved it to uLandTexture
Mon, 22 Mar 2010 18:02:39 +0000 nemo Oops. More like this. (initEverything was being called for Game() and preview in non-iphone already)
Mon, 22 Mar 2010 17:59:59 +0000 nemo Remove doubled call of freeEverything. restore freeing of LandBackSurface pending unc0rr explaining why 'sactly he took it out (assuming an error right now)
Mon, 22 Mar 2010 17:48:19 +0000 unc0rr Clean Augean stables
Mon, 22 Mar 2010 13:44:35 +0000 smxx Engine:
Mon, 22 Mar 2010 11:52:16 +0000 nemo Just tidying up a bit. Comments, moving uMisc to end of frees in case ones above it need logging
Sun, 21 Mar 2010 22:26:12 +0000 palewolf Fix 16px offset on previous commit
Sun, 21 Mar 2010 20:55:45 +0000 koda fix a small leak
Sun, 21 Mar 2010 20:54:18 +0000 koda Insert commit message here (to get along with palewolf)
Sun, 21 Mar 2010 20:53:34 +0000 palewolf Insert commit message here
Sun, 21 Mar 2010 19:02:03 +0000 unc0rr In pascal unit is a namespace
Sun, 21 Mar 2010 18:42:34 +0000 nemo Rename current things called utilities to Effects (since they impact game state / flags w/o using a gear) and add a bunch of things that don't cause damage and are just used to move to Utility crate.
Sun, 21 Mar 2010 16:51:33 +0000 nemo Make barrels a little more likely to blow up. 25% more damage in fall
Sun, 21 Mar 2010 16:45:46 +0000 palewolf - Updated snail, added mushrooms to nature theme
Sun, 21 Mar 2010 16:42:41 +0000 koda fix a rotation glitch
Sun, 21 Mar 2010 16:04:57 +0000 nemo FillAmmoStore is reused - check for before start of play.
Sun, 21 Mar 2010 15:50:38 +0000 palewolf Insert commit message here
Sun, 21 Mar 2010 13:53:47 +0000 nemo Fix indexed flags
Sun, 21 Mar 2010 13:41:11 +0000 nemo Remove Timer2 from Gear, add a Timer to Hedgehog
Sun, 21 Mar 2010 03:51:58 +0000 koda a couple of smaller cleanups that didn't get in previous commit
Sun, 21 Mar 2010 03:51:53 +0000 nemo Add a 2nd timer variable due to conflicts. This could perhaps use renaming
Sun, 21 Mar 2010 01:54:57 +0000 koda lotsa optimizations and redraws for the iFrontend
Sat, 20 Mar 2010 23:33:37 +0000 koda move interface files around to use standard names in different versions
Sat, 20 Mar 2010 15:16:59 +0000 koda update project for ipad target
(0) -3000 -1000 -240 +240 +1000 +3000 +10000 tip