Sun, 17 May 2009 22:48:06 +0000 add Firefox to creds
nemo [Sun, 17 May 2009 22:48:06 +0000] rev 2075
add Firefox to creds
Sun, 17 May 2009 22:15:09 +0000 remove 0 damage tag, easter hat fix, pink sun hat
nemo [Sun, 17 May 2009 22:15:09 +0000] rev 2074
remove 0 damage tag, easter hat fix, pink sun hat
Sun, 17 May 2009 18:02:21 +0000 I suck at pascal booleans
nemo [Sun, 17 May 2009 18:02:21 +0000] rev 2073
I suck at pascal booleans
Sun, 17 May 2009 14:25:45 +0000 Custom controls implementing paintEvent play poorly with stars, especially SquareLabel
nemo [Sun, 17 May 2009 14:25:45 +0000] rev 2072
Custom controls implementing paintEvent play poorly with stars, especially SquareLabel Setting PaintOnScreen seems safe with current layout
Sun, 17 May 2009 13:04:58 +0000 Still trying to improve perf of stars - this seems to help a little bit
nemo [Sun, 17 May 2009 13:04:58 +0000] rev 2071
Still trying to improve perf of stars - this seems to help a little bit
Sun, 17 May 2009 13:03:56 +0000 Silence useless warning
unc0rr [Sun, 17 May 2009 13:03:56 +0000] rev 2070
Silence useless warning
Sun, 17 May 2009 00:44:30 +0000 update only the stars - cuts CPU useage in half on my machine
nemo [Sun, 17 May 2009 00:44:30 +0000] rev 2069
update only the stars - cuts CPU useage in half on my machine
Sat, 16 May 2009 20:54:43 +0000 Fix rope disappearing bug
unc0rr [Sat, 16 May 2009 20:54:43 +0000] rev 2068
Fix rope disappearing bug
Sat, 16 May 2009 19:03:08 +0000 use separate variable for vamp/karma calcs, move karma damage tag from point of damage origin to originating hedgehog at unc0rr's request
nemo [Sat, 16 May 2009 19:03:08 +0000] rev 2067
use separate variable for vamp/karma calcs, move karma damage tag from point of damage origin to originating hedgehog at unc0rr's request
Sat, 16 May 2009 18:33:21 +0000 Final fix
unc0rr [Sat, 16 May 2009 18:33:21 +0000] rev 2066
Final fix
Sat, 16 May 2009 17:02:25 +0000 Now should be okay
unc0rr [Sat, 16 May 2009 17:02:25 +0000] rev 2065
Now should be okay
Sat, 16 May 2009 16:58:54 +0000 Fix for teh fix
unc0rr [Sat, 16 May 2009 16:58:54 +0000] rev 2064
Fix for teh fix
Sat, 16 May 2009 16:57:38 +0000 Fix queue error caused by previous fix for queue error
unc0rr [Sat, 16 May 2009 16:57:38 +0000] rev 2063
Fix queue error caused by previous fix for queue error
Sat, 16 May 2009 16:43:36 +0000 - Update finnish translation
unc0rr [Sat, 16 May 2009 16:43:36 +0000] rev 2062
- Update finnish translation - lupdate-qt4 && lrelease-qt4
Sat, 16 May 2009 14:51:04 +0000 Should disable construction in the shoppa hack, I think. Construction is annoying
nemo [Sat, 16 May 2009 14:51:04 +0000] rev 2061
Should disable construction in the shoppa hack, I think. Construction is annoying
Fri, 15 May 2009 17:15:37 +0000 fix crash in parachute/rope if drowning with active girder/teleport
nemo [Fri, 15 May 2009 17:15:37 +0000] rev 2060
fix crash in parachute/rope if drowning with active girder/teleport
Fri, 15 May 2009 12:56:32 +0000 oops. forgot to reset turn time
nemo [Fri, 15 May 2009 12:56:32 +0000] rev 2059
oops. forgot to reset turn time
Fri, 15 May 2009 02:14:13 +0000 Neglected to delete gear at end of turn
nemo [Fri, 15 May 2009 02:14:13 +0000] rev 2058
Neglected to delete gear at end of turn
Fri, 15 May 2009 00:51:37 +0000 Prevent gaining more health than hedgehog actually has
nemo [Fri, 15 May 2009 00:51:37 +0000] rev 2057
Prevent gaining more health than hedgehog actually has
Fri, 15 May 2009 00:38:49 +0000 Two new wavez - Juggle requires a different frame rate. using 38 instead of 125
nemo [Fri, 15 May 2009 00:38:49 +0000] rev 2056
Two new wavez - Juggle requires a different frame rate. using 38 instead of 125
Thu, 14 May 2009 14:55:38 +0000 ogg q4 encodings of these themes. Saves 6 megabytes.
nemo [Thu, 14 May 2009 14:55:38 +0000] rev 2055
ogg q4 encodings of these themes. Saves 6 megabytes.
Thu, 14 May 2009 14:54:15 +0000 new grave
nemo [Thu, 14 May 2009 14:54:15 +0000] rev 2054
new grave
Thu, 14 May 2009 14:47:08 +0000 Use shrug frame for injuring yourself/team-mate, add custom theme music to Sheep theme
nemo [Thu, 14 May 2009 14:47:08 +0000] rev 2053
Use shrug frame for injuring yourself/team-mate, add custom theme music to Sheep theme
Thu, 14 May 2009 03:41:34 +0000 constrain angle, decrement turn time
nemo [Thu, 14 May 2009 03:41:34 +0000] rev 2052
constrain angle, decrement turn time
Wed, 13 May 2009 19:53:45 +0000 Fix engine crash due to screwing up visual gears list in speechbubbles handler
unc0rr [Wed, 13 May 2009 19:53:45 +0000] rev 2051
Fix engine crash due to screwing up visual gears list in speechbubbles handler
Wed, 13 May 2009 01:30:08 +0000 only init music on use. workaround for audio bug.
nemo [Wed, 13 May 2009 01:30:08 +0000] rev 2050
only init music on use. workaround for audio bug.
Tue, 12 May 2009 15:17:49 +0000 Fix team name in training (broken by ttsmj's random teams patch)
unc0rr [Tue, 12 May 2009 15:17:49 +0000] rev 2049
Fix team name in training (broken by ttsmj's random teams patch)
Tue, 12 May 2009 15:15:46 +0000 Fix training
unc0rr [Tue, 12 May 2009 15:15:46 +0000] rev 2048
Fix training
Mon, 11 May 2009 21:27:31 +0000 Allow speech bubble/small damage tags in "reduced quality"
nemo [Mon, 11 May 2009 21:27:31 +0000] rev 2047
Allow speech bubble/small damage tags in "reduced quality" First is needed for game context, 2nd has little impact on framerate
Mon, 11 May 2009 21:20:21 +0000 Oops, some debug stuff left
unc0rr [Mon, 11 May 2009 21:20:21 +0000] rev 2046
Oops, some debug stuff left
Mon, 11 May 2009 21:19:47 +0000 - Fix network (my crappy fault, triggered by nemo's patch)
unc0rr [Mon, 11 May 2009 21:19:47 +0000] rev 2045
- Fix network (my crappy fault, triggered by nemo's patch) - Do some good things for engine
Mon, 11 May 2009 19:42:29 +0000 Remove unnecessary loop in speechbubble code, thus removing use-after-freeing bug
unc0rr [Mon, 11 May 2009 19:42:29 +0000] rev 2044
Remove unnecessary loop in speechbubble code, thus removing use-after-freeing bug
Mon, 11 May 2009 18:57:39 +0000 Don't accept 'team gone' command right after 'next turn' cmd
unc0rr [Mon, 11 May 2009 18:57:39 +0000] rev 2043
Don't accept 'team gone' command right after 'next turn' cmd
Mon, 11 May 2009 18:56:55 +0000 Move Speech to visual gears. This checkin CRASHES on deletion of visual gear outside the doStep
nemo [Mon, 11 May 2009 18:56:55 +0000] rev 2042
Move Speech to visual gears. This checkin CRASHES on deletion of visual gear outside the doStep
Sat, 09 May 2009 11:57:47 +0000 - Fix previous commit
unc0rr [Sat, 09 May 2009 11:57:47 +0000] rev 2041
- Fix previous commit - Allow up to 48 hedgehogs on bamboo plinko map
Sat, 09 May 2009 11:56:46 +0000 - Fix for desyncs when player exits
unc0rr [Sat, 09 May 2009 11:56:46 +0000] rev 2040
- Fix for desyncs when player exits - Effect for gone team: all hedgehogs assume damage == health, then die not tested
Fri, 08 May 2009 18:20:06 +0000 Try to prevent locale problems:
unc0rr [Fri, 08 May 2009 18:20:06 +0000] rev 2039
Try to prevent locale problems: - Consider only strings starting from numbers - Fill strings with en locale first
Fri, 08 May 2009 18:18:39 +0000 English stubs for new weps
nemo [Fri, 08 May 2009 18:18:39 +0000] rev 2038
English stubs for new weps
Fri, 08 May 2009 18:17:08 +0000 Missing swedish weapon names
nemo [Fri, 08 May 2009 18:17:08 +0000] rev 2037
Missing swedish weapon names
Fri, 08 May 2009 18:15:39 +0000 Mine icon for game scheme mine count
nemo [Fri, 08 May 2009 18:15:39 +0000] rev 2036
Mine icon for game scheme mine count
Fri, 08 May 2009 01:56:20 +0000 patch to prior checkin
nemo [Fri, 08 May 2009 01:56:20 +0000] rev 2035
patch to prior checkin
Fri, 08 May 2009 01:49:11 +0000 david_ac adding a commandline parameter for the data dir, as requested by svenstaro
nemo [Fri, 08 May 2009 01:49:11 +0000] rev 2034
david_ac adding a commandline parameter for the data dir, as requested by svenstaro
Thu, 07 May 2009 23:57:39 +0000 allow adjusting angle during sniping
nemo [Thu, 07 May 2009 23:57:39 +0000] rev 2033
allow adjusting angle during sniping
Thu, 07 May 2009 14:03:55 +0000 Updated polish translation by szczur
nemo [Thu, 07 May 2009 14:03:55 +0000] rev 2032
Updated polish translation by szczur
Thu, 07 May 2009 02:04:07 +0000 david_ac's game scheme options for mine delay/quantity, tweaks to sniper rifle
nemo [Thu, 07 May 2009 02:04:07 +0000] rev 2031
david_ac's game scheme options for mine delay/quantity, tweaks to sniper rifle
Wed, 06 May 2009 22:35:31 +0000 Update translation files
nemo [Wed, 06 May 2009 22:35:31 +0000] rev 2030
Update translation files
Wed, 06 May 2009 16:56:01 +0000 Add a tracing message to help debug rope bugs
unc0rr [Wed, 06 May 2009 16:56:01 +0000] rev 2029
Add a tracing message to help debug rope bugs
Mon, 04 May 2009 01:36:39 +0000 Move laser behind weapon
nemo [Mon, 04 May 2009 01:36:39 +0000] rev 2028
Move laser behind weapon
Sun, 03 May 2009 21:39:45 +0000 oops - checked in my disabling of frontend sound/animation
nemo [Sun, 03 May 2009 21:39:45 +0000] rev 2027
oops - checked in my disabling of frontend sound/animation
Sun, 03 May 2009 21:38:56 +0000 Descriptions for the tooltip buttons. Rename btnInvurnable to btnInvulnerable
nemo [Sun, 03 May 2009 21:38:56 +0000] rev 2026
Descriptions for the tooltip buttons. Rename btnInvurnable to btnInvulnerable
Sun, 03 May 2009 21:28:15 +0000 Adjust routines impacted by DrawRotatedF modification, clear gstHHHJump in rope to avoid crosshair/hat drawing bug.
nemo [Sun, 03 May 2009 21:28:15 +0000] rev 2025
Adjust routines impacted by DrawRotatedF modification, clear gstHHHJump in rope to avoid crosshair/hat drawing bug.
Sun, 03 May 2009 21:12:34 +0000 Disable long jump in artillery mode, make snipre rifle single shot
nemo [Sun, 03 May 2009 21:12:34 +0000] rev 2024
Disable long jump in artillery mode, make snipre rifle single shot
Sun, 03 May 2009 17:35:10 +0000 Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
nemo [Sun, 03 May 2009 17:35:10 +0000] rev 2023
Artillery mode, sniper rifle, speech bubble tweaks, fix of rope bug introduced by enabling hats in jump
Fri, 01 May 2009 11:58:22 +0000 nemo's tweaks to bubbles
unc0rr [Fri, 01 May 2009 11:58:22 +0000] rev 2022
nemo's tweaks to bubbles
Fri, 01 May 2009 09:01:44 +0000 Some changes in try to fix issue when you enter
unc0rr [Fri, 01 May 2009 09:01:44 +0000] rev 2021
Some changes in try to fix issue when you enter room with painted map, but frontend shows generated one (most probably bug is triggered by template filters) Untested.
Thu, 30 Apr 2009 20:20:01 +0000 nemo:
unc0rr [Thu, 30 Apr 2009 20:20:01 +0000] rev 2020
nemo: - Hedgehogs don't take hat off when jumping
Thu, 30 Apr 2009 20:16:58 +0000 Oops, remove debug stuff
unc0rr [Thu, 30 Apr 2009 20:16:58 +0000] rev 2019
Oops, remove debug stuff
Thu, 30 Apr 2009 20:14:41 +0000 Some forgotten sprites
unc0rr [Thu, 30 Apr 2009 20:14:41 +0000] rev 2018
Some forgotten sprites
Thu, 30 Apr 2009 20:13:44 +0000 nemo's great patch:
unc0rr [Thu, 30 Apr 2009 20:13:44 +0000] rev 2017
nemo's great patch: - Speech bubbles - Vampirism + karma
Sun, 26 Apr 2009 15:47:03 +0000 lost pieces of previous patch
unc0rr [Sun, 26 Apr 2009 15:47:03 +0000] rev 2016
lost pieces of previous patch
Sun, 26 Apr 2009 15:45:06 +0000 koda's patch
unc0rr [Sun, 26 Apr 2009 15:45:06 +0000] rev 2015
koda's patch
Fri, 24 Apr 2009 16:53:38 +0000 Fix health widget in reduced quality mode
unc0rr [Fri, 24 Apr 2009 16:53:38 +0000] rev 2014
Fix health widget in reduced quality mode
Fri, 24 Apr 2009 16:50:26 +0000 - set svn:eol-style to native on text files
unc0rr [Fri, 24 Apr 2009 16:50:26 +0000] rev 2013
- set svn:eol-style to native on text files - two more cues
Thu, 23 Apr 2009 13:54:25 +0000 TheXception's patch:
unc0rr [Thu, 23 Apr 2009 13:54:25 +0000] rev 2012
TheXception's patch: - Animated stars in frontend's background
Mon, 20 Apr 2009 17:45:01 +0000 Update some sprites
unc0rr [Mon, 20 Apr 2009 17:45:01 +0000] rev 2011
Update some sprites
Mon, 20 Apr 2009 15:36:36 +0000 Fix team lists reset when editing weapon sets
unc0rr [Mon, 20 Apr 2009 15:36:36 +0000] rev 2010
Fix team lists reset when editing weapon sets
Sun, 19 Apr 2009 15:44:47 +0000 TheXception's patch:
unc0rr [Sun, 19 Apr 2009 15:44:47 +0000] rev 2009
TheXception's patch: - Add weapons button to game options widget
Sun, 19 Apr 2009 13:36:51 +0000 Patch by koda:
unc0rr [Sun, 19 Apr 2009 13:36:51 +0000] rev 2008
Patch by koda: - Variable commands to the commandline version of hwengine
Sun, 19 Apr 2009 13:22:17 +0000 Chef hat
unc0rr [Sun, 19 Apr 2009 13:22:17 +0000] rev 2007
Chef hat
Sun, 19 Apr 2009 13:20:33 +0000 Please koda with console output
unc0rr [Sun, 19 Apr 2009 13:20:33 +0000] rev 2006
Please koda with console output
Sun, 19 Apr 2009 11:59:23 +0000 Move health sorter to visual gears:
unc0rr [Sun, 19 Apr 2009 11:59:23 +0000] rev 2005
Move health sorter to visual gears: - Should fix or at least help with problems when one of players quits (needs testing) - Breaks 0.9.10 compatibility, so increase protocol number and set version to 0.9.11-dev
Sun, 19 Apr 2009 11:40:41 +0000 Some work to try prevent stack memory leak
unc0rr [Sun, 19 Apr 2009 11:40:41 +0000] rev 2004
Some work to try prevent stack memory leak
Sat, 18 Apr 2009 12:46:56 +0000 Patch by koda:
unc0rr [Sat, 18 Apr 2009 12:46:56 +0000] rev 2003
Patch by koda: - support for universal binaries - support for Tiger and Leopard systesms - small fix in chat
Fri, 17 Apr 2009 20:13:46 +0000 patch by koda:
unc0rr [Fri, 17 Apr 2009 20:13:46 +0000] rev 2002
patch by koda: - Part of previous patch - Some flags for Mac OS X compilation
Fri, 17 Apr 2009 19:58:21 +0000 - More verbose output
unc0rr [Fri, 17 Apr 2009 19:58:21 +0000] rev 2001
- More verbose output - Fix one way of crashing server
Fri, 17 Apr 2009 17:02:24 +0000 Don't crash engine after round in reduced quality mode
unc0rr [Fri, 17 Apr 2009 17:02:24 +0000] rev 2000
Don't crash engine after round in reduced quality mode
Fri, 17 Apr 2009 17:01:58 +0000 Commit part of koda's patch which applies cleanly:
unc0rr [Fri, 17 Apr 2009 17:01:58 +0000] rev 1999
Commit part of koda's patch which applies cleanly: - added libSDLmain.a in library generation - Info.plist now is automatically generated - completed iphone variant
Fri, 17 Apr 2009 12:20:19 +0000 Fix disconnection from server
unc0rr [Fri, 17 Apr 2009 12:20:19 +0000] rev 1998
Fix disconnection from server
Tue, 14 Apr 2009 19:05:23 +0000 koda's patch
unc0rr [Tue, 14 Apr 2009 19:05:23 +0000] rev 1997
koda's patch
Mon, 13 Apr 2009 19:42:07 +0000 Add two more maps to build system
unc0rr [Mon, 13 Apr 2009 19:42:07 +0000] rev 1996
Add two more maps to build system
Mon, 13 Apr 2009 19:01:45 +0000 Add basketball to build system
unc0rr [Mon, 13 Apr 2009 19:01:45 +0000] rev 1995
Add basketball to build system
Mon, 13 Apr 2009 15:52:31 +0000 Fix message being sent to users of 0.9.10 0.9.10-release
unc0rr [Mon, 13 Apr 2009 15:52:31 +0000] rev 1994
Fix message being sent to users of 0.9.10
Mon, 13 Apr 2009 15:35:35 +0000 Fix some locale files installation
unc0rr [Mon, 13 Apr 2009 15:35:35 +0000] rev 1993
Fix some locale files installation
Mon, 13 Apr 2009 15:33:40 +0000 Add castle and halloween to install
unc0rr [Mon, 13 Apr 2009 15:33:40 +0000] rev 1992
Add castle and halloween to install
Mon, 13 Apr 2009 13:03:57 +0000 Update release doc
unc0rr [Mon, 13 Apr 2009 13:03:57 +0000] rev 1991
Update release doc
Mon, 13 Apr 2009 13:00:51 +0000 Silence net debug messages
unc0rr [Mon, 13 Apr 2009 13:00:51 +0000] rev 1990
Silence net debug messages
Mon, 13 Apr 2009 12:59:48 +0000 - Fix training
unc0rr [Mon, 13 Apr 2009 12:59:48 +0000] rev 1989
- Fix training - Workaround 'Text has zero width' crash
Mon, 13 Apr 2009 12:53:52 +0000 Set version to 0.9.10, protocol to 25
unc0rr [Mon, 13 Apr 2009 12:53:52 +0000] rev 1988
Set version to 0.9.10, protocol to 25
Mon, 13 Apr 2009 12:53:30 +0000 Three more hats
unc0rr [Mon, 13 Apr 2009 12:53:30 +0000] rev 1987
Three more hats
Mon, 13 Apr 2009 12:28:51 +0000 Update changelog in server
unc0rr [Mon, 13 Apr 2009 12:28:51 +0000] rev 1986
Update changelog in server
Mon, 13 Apr 2009 12:27:59 +0000 Less verbose server output
unc0rr [Mon, 13 Apr 2009 12:27:59 +0000] rev 1985
Less verbose server output
Mon, 13 Apr 2009 12:23:29 +0000 Disable feel of editing for built-in schemes
unc0rr [Mon, 13 Apr 2009 12:23:29 +0000] rev 1984
Disable feel of editing for built-in schemes
Mon, 13 Apr 2009 12:17:40 +0000 update about page
unc0rr [Mon, 13 Apr 2009 12:17:40 +0000] rev 1983
update about page
Mon, 13 Apr 2009 12:14:13 +0000 Update changelog
unc0rr [Mon, 13 Apr 2009 12:14:13 +0000] rev 1982
Update changelog
Mon, 13 Apr 2009 10:00:32 +0000 Russian voicepack
unc0rr [Mon, 13 Apr 2009 10:00:32 +0000] rev 1981
Russian voicepack
Mon, 13 Apr 2009 09:43:31 +0000 Update translation from patches tracker on fireforge
unc0rr [Mon, 13 Apr 2009 09:43:31 +0000] rev 1980
Update translation from patches tracker on fireforge
Mon, 13 Apr 2009 09:36:25 +0000 - Add gameServer to build system
unc0rr [Mon, 13 Apr 2009 09:36:25 +0000] rev 1979
- Add gameServer to build system - Label schemes combobox
Mon, 13 Apr 2009 09:27:21 +0000 Update russian translation
unc0rr [Mon, 13 Apr 2009 09:27:21 +0000] rev 1978
Update russian translation
Mon, 13 Apr 2009 09:24:56 +0000 Some polishing
unc0rr [Mon, 13 Apr 2009 09:24:56 +0000] rev 1977
Some polishing
Sun, 12 Apr 2009 20:34:11 +0000 - One more hat
unc0rr [Sun, 12 Apr 2009 20:34:11 +0000] rev 1976
- One more hat - Basketball ammo scheme
Sun, 12 Apr 2009 20:29:39 +0000 make use of bath.ogg
unc0rr [Sun, 12 Apr 2009 20:29:39 +0000] rev 1975
make use of bath.ogg
Sun, 12 Apr 2009 18:55:35 +0000 nemo's schemes patch
unc0rr [Sun, 12 Apr 2009 18:55:35 +0000] rev 1974
nemo's schemes patch
Sun, 12 Apr 2009 18:52:06 +0000 Fix previous commit
unc0rr [Sun, 12 Apr 2009 18:52:06 +0000] rev 1973
Fix previous commit
Sun, 12 Apr 2009 18:51:35 +0000 New hat + 2 soundtracks
unc0rr [Sun, 12 Apr 2009 18:51:35 +0000] rev 1972
New hat + 2 soundtracks
Sun, 12 Apr 2009 15:53:56 +0000 More contrasting lightbulb
unc0rr [Sun, 12 Apr 2009 15:53:56 +0000] rev 1971
More contrasting lightbulb
Sun, 12 Apr 2009 15:35:22 +0000 Prevent server from crashing when get SqlNull value
unc0rr [Sun, 12 Apr 2009 15:35:22 +0000] rev 1970
Prevent server from crashing when get SqlNull value
Sun, 12 Apr 2009 15:33:59 +0000 koda's fix
unc0rr [Sun, 12 Apr 2009 15:33:59 +0000] rev 1969
koda's fix
Sun, 12 Apr 2009 15:33:46 +0000 Add Shoppa game scheme
unc0rr [Sun, 12 Apr 2009 15:33:46 +0000] rev 1968
Add Shoppa game scheme
Sun, 12 Apr 2009 15:30:41 +0000 Predefine some ammo schemes
unc0rr [Sun, 12 Apr 2009 15:30:41 +0000] rev 1967
Predefine some ammo schemes
Sun, 12 Apr 2009 15:24:08 +0000 nemo's patch + ropes ammo scheme hack
unc0rr [Sun, 12 Apr 2009 15:24:08 +0000] rev 1966
nemo's patch + ropes ammo scheme hack
Sun, 12 Apr 2009 12:51:25 +0000 - Apply koda's patch
unc0rr [Sun, 12 Apr 2009 12:51:25 +0000] rev 1965
- Apply koda's patch - Remove old game server
Sun, 12 Apr 2009 12:50:43 +0000 - Another way of defining official server
unc0rr [Sun, 12 Apr 2009 12:50:43 +0000] rev 1964
- Another way of defining official server - Rope has walking bug fixed, and works similar for the last rope too
(0) -1000 -112 +112 +1000 +3000 +10000 tip