Mon, 14 Jan 2013 21:37:04 +0400 - Fix another ton of bugs and misbehavior
unc0rr [Mon, 14 Jan 2013 21:37:04 +0400] rev 8386
- Fix another ton of bugs and misbehavior - Try my fix to grey colors problem
Mon, 14 Jan 2013 21:17:42 +0400 Convert feedback page to dialog (+some fixes from unC0Rr)
dag10 [Mon, 14 Jan 2013 21:17:42 +0400] rev 8385
Convert feedback page to dialog (+some fixes from unC0Rr)
Mon, 14 Jan 2013 13:28:03 +0100 GCI2012: Abstract Page Load
dag10 [Mon, 14 Jan 2013 13:28:03 +0100] rev 8384
GCI2012: Abstract Page Load
Mon, 14 Jan 2013 13:19:47 +0100 GCI2012: Abstract Hedgewars Dialogs
dag10 [Mon, 14 Jan 2013 13:19:47 +0100] rev 8383
GCI2012: Abstract Hedgewars Dialogs
Mon, 14 Jan 2013 12:45:01 +0100 GCI2012: No More Hovering
dag10 [Mon, 14 Jan 2013 12:45:01 +0100] rev 8382
GCI2012: No More Hovering
Mon, 14 Jan 2013 12:35:01 +0100 move platform code around, based off a gci task by dag10
koda [Mon, 14 Jan 2013 12:35:01 +0100] rev 8381
move platform code around, based off a gci task by dag10
Mon, 14 Jan 2013 12:07:51 +0100 GCI2012: Subscribe for Network
koda [Mon, 14 Jan 2013 12:07:51 +0100] rev 8380
GCI2012: Subscribe for Network
Mon, 14 Jan 2013 11:52:19 +0100 keep engine target name consistent across platforms
koda [Mon, 14 Jan 2013 11:52:19 +0100] rev 8379
keep engine target name consistent across platforms
Mon, 14 Jan 2013 11:28:19 +0100 provide a nice mission description, feel free to improve
koda [Mon, 14 Jan 2013 11:28:19 +0100] rev 8378
provide a nice mission description, feel free to improve
Mon, 14 Jan 2013 11:19:59 +0100 GCI2012: Improve Game Configuration Widget
dag10 [Mon, 14 Jan 2013 11:19:59 +0100] rev 8377
GCI2012: Improve Game Configuration Widget - Refactored mapmodel+datamanager to have two separate map models for static and mission maps, and then three static MapInfos in MapModel for the three special maps (random, maze, drawn). - Created theme selector dialog. - Created seed view/edit dialog. - Enlarged start icon on pagemultiplayer and pagenetgame, and added Start.png. - Moved "Settings" button on pagemultiplayer and pagenetgame from middle of page to page footer. - Added "load drawing" button to mapcontainer widget. - Map preview is no longer the randomize button; The randomize functionality is now in a button of its own. - Map preview no longer grays out (isn't disabled) when in slave mode. - Seed is now viewable and copyable when in slave mode -- but not editable. - You should now use the property master (isMaster() and setMaster()) on gamecfgwidget and mapcontainer instead of the enabled property. This is because some widgets (e.g. "view/edit seed" button and map preview) shouldn't be disabled, when all other widgets should be. - Added mission map descriptions w/ locale support in INI format in mapname/desc.txt if applicable. Use '|' for line break.
Mon, 14 Jan 2013 12:07:06 +0400 Merge
unc0rr [Mon, 14 Jan 2013 12:07:06 +0400] rev 8376
Merge
Sun, 13 Jan 2013 11:14:50 +0400 Fix build
unc0rr [Sun, 13 Jan 2013 11:14:50 +0400] rev 8375
Fix build
Sun, 13 Jan 2013 10:46:01 +0400 Hat selection reworked
dag10 [Sun, 13 Jan 2013 10:46:01 +0400] rev 8374
Hat selection reworked
Sat, 12 Jan 2013 18:37:10 -0500 Prevent camera from moving with auto camera disabled when remote teams are targetting
nemo [Sat, 12 Jan 2013 18:37:10 -0500] rev 8373
Prevent camera from moving with auto camera disabled when remote teams are targetting
Sun, 13 Jan 2013 01:02:08 +0400 Logon procedure for checkers, introduce invisible clients
unc0rr [Sun, 13 Jan 2013 01:02:08 +0400] rev 8372
Logon procedure for checkers, introduce invisible clients
Sat, 12 Jan 2013 01:18:50 +0400 - Start work on checker
unc0rr [Sat, 12 Jan 2013 01:18:50 +0400] rev 8371
- Start work on checker - Various small fixes
Thu, 10 Jan 2013 22:59:46 +0400 Fix tons of warnings
martin_bede [Thu, 10 Jan 2013 22:59:46 +0400] rev 8370
Fix tons of warnings
Thu, 10 Jan 2013 22:54:55 +0400 Throw away stupid Data.Seq
unc0rr [Thu, 10 Jan 2013 22:54:55 +0400] rev 8369
Throw away stupid Data.Seq
Wed, 09 Jan 2013 10:16:10 +0400 Fix build
unc0rr [Wed, 09 Jan 2013 10:16:10 +0400] rev 8368
Fix build
Tue, 08 Jan 2013 21:29:37 +0200 Merged default
vitiv <nikita.utiu@gmail.com> [Tue, 08 Jan 2013 21:29:37 +0200] rev 8367
Merged default
Tue, 08 Jan 2013 00:40:20 +0400 lua API functions to enable or disable game flags
martin_bede [Tue, 08 Jan 2013 00:40:20 +0400] rev 8366
lua API functions to enable or disable game flags
Mon, 07 Jan 2013 08:35:29 -0500 correct rope tip
nemo [Mon, 07 Jan 2013 08:35:29 -0500] rev 8365
correct rope tip
Tue, 08 Jan 2013 21:27:35 +0200 Added "New account" button when connectiong to the official server
vitiv <nikita.utiu@gmail.com> [Tue, 08 Jan 2013 21:27:35 +0200] rev 8364
Added "New account" button when connectiong to the official server
Fri, 04 Jan 2013 21:44:40 +0400 Merge from default flibqtfrontend
unc0rr [Fri, 04 Jan 2013 21:44:40 +0400] rev 8363
Merge from default
Fri, 04 Jan 2013 19:42:49 +0400 - Unbreak build with .pro file
unc0rr [Fri, 04 Jan 2013 19:42:49 +0400] rev 8362
- Unbreak build with .pro file - Cosmetic fixes to video recording stuff
Wed, 02 Jan 2013 18:32:19 +0100 Tips are now loaded from an xml file.
martin_bede [Wed, 02 Jan 2013 18:32:19 +0100] rev 8361
Tips are now loaded from an xml file.
Thu, 03 Jan 2013 10:43:40 +0100 simplified physfs cmake
koda [Thu, 03 Jan 2013 10:43:40 +0100] rev 8360
simplified physfs cmake
Thu, 03 Jan 2013 19:57:17 +0100 Removed wiggle 3D mode, reorder the list of 3D modes.
martin_bede [Thu, 03 Jan 2013 19:57:17 +0100] rev 8359
Removed wiggle 3D mode, reorder the list of 3D modes.
Fri, 04 Jan 2013 03:13:21 +0100 have the default window size to 5/6, save fullscreen resolution on 'fullscreenResolution' instead of 'resolution', make sure cFullscreenStuff is initialised
koda [Fri, 04 Jan 2013 03:13:21 +0100] rev 8358
have the default window size to 5/6, save fullscreen resolution on 'fullscreenResolution' instead of 'resolution', make sure cFullscreenStuff is initialised
Fri, 04 Jan 2013 02:58:19 +0100 GCI2012: Resolution Freedom
koda [Fri, 04 Jan 2013 02:58:19 +0100] rev 8357
GCI2012: Resolution Freedom
Thu, 03 Jan 2013 17:14:14 +0200 Tweaked the resolution option layout.
vitiv <nikita.utiu@gmail.com> [Thu, 03 Jan 2013 17:14:14 +0200] rev 8356
Tweaked the resolution option layout.
Wed, 02 Jan 2013 23:13:14 +0100 GCI2012: Unix Qt Signals
martin_bede [Wed, 02 Jan 2013 23:13:14 +0100] rev 8355
GCI2012: Unix Qt Signals
Thu, 03 Jan 2013 15:59:30 +0200 Separated fullscreen and windowed hwengine resolution parameters.
vitiv <nikita.utiu@gmail.com> [Thu, 03 Jan 2013 15:59:30 +0200] rev 8354
Separated fullscreen and windowed hwengine resolution parameters.
Wed, 02 Jan 2013 12:39:50 +0100 simplify entering/leaving pages debug
koda [Wed, 02 Jan 2013 12:39:50 +0100] rev 8353
simplify entering/leaving pages debug
Thu, 03 Jan 2013 15:58:23 +0200 Changed resolution labels on options page.
vitiv <nikita.utiu@gmail.com> [Thu, 03 Jan 2013 15:58:23 +0200] rev 8352
Changed resolution labels on options page.
Wed, 02 Jan 2013 10:11:42 +0100 also have uTouch follow the new NewTurn policy
koda [Wed, 02 Jan 2013 10:11:42 +0100] rev 8351
also have uTouch follow the new NewTurn policy
Mon, 31 Dec 2012 12:12:23 +0200 merged changes
vitiv <nikita.utiu@gmail.com> [Mon, 31 Dec 2012 12:12:23 +0200] rev 8350
merged changes
Tue, 01 Jan 2013 14:21:51 -0500 move onNewTurn, onGameTick and onGameTick20 to try and avoid ParseCommand breakage after nextturn call. Needs testing, but should be safe for most scripts. Also fix locale loading.
nemo [Tue, 01 Jan 2013 14:21:51 -0500] rev 8349
move onNewTurn, onGameTick and onGameTick20 to try and avoid ParseCommand breakage after nextturn call. Needs testing, but should be safe for most scripts. Also fix locale loading.
Sun, 30 Dec 2012 03:00:51 +0100 don't discard older cmake_c_flags
koda [Sun, 30 Dec 2012 03:00:51 +0100] rev 8348
don't discard older cmake_c_flags
Sun, 30 Dec 2012 02:43:24 +0100 GCI2012: CMake List Append
Willie Zhu [Sun, 30 Dec 2012 02:43:24 +0100] rev 8347
GCI2012: CMake List Append
Sat, 29 Dec 2012 22:50:10 +0100 GCI2012: Advanced Keyboard Configuration
dag10 [Sat, 29 Dec 2012 22:50:10 +0100] rev 8346
GCI2012: Advanced Keyboard Configuration - Added "Controls" tab to settings, where you can set master game-wide controls. - Can revert master key bindings to game's default key bind. - Per-team binds now default to "Use my default", but you can override those binds if you want to. - New key binding interface. - Removed redundant second confirmation prompt for deleting a team. - Added "reset all binds" button to the binding interface in both the main settings and team settings. - I discovered that the reason keyboard camera controls were "broken" is because they were never implemented! But don't worry - I took care of that for you, too. :) (this also closes bug #120)
Sun, 30 Dec 2012 16:04:28 +0200 Preserve windowed resolution after manual resize
vitiv <nikita.utiu@gmail.com> [Sun, 30 Dec 2012 16:04:28 +0200] rev 8345
Preserve windowed resolution after manual resize
Fri, 28 Dec 2012 23:54:42 +0100 ok, enable the splashscreen for win only
koda [Fri, 28 Dec 2012 23:54:42 +0100] rev 8344
ok, enable the splashscreen for win only
Sat, 29 Dec 2012 14:40:20 +0200 Added Support for variable windowed resolution.
vitiv <nikita.utiu@gmail.com> [Sat, 29 Dec 2012 14:40:20 +0200] rev 8343
Added Support for variable windowed resolution.
Fri, 28 Dec 2012 11:00:12 +0100 restore compatibility with cmake 2.6
koda [Fri, 28 Dec 2012 11:00:12 +0100] rev 8342
restore compatibility with cmake 2.6
Thu, 27 Dec 2012 18:16:50 +0100 NSIS workaround no longer necessary
koda [Thu, 27 Dec 2012 18:16:50 +0100] rev 8341
NSIS workaround no longer necessary
Wed, 02 Jan 2013 11:11:49 +0100 install shaders only when needed, find clang only when needed, fix building on windows, better cmake boolean vars webgl
koda [Wed, 02 Jan 2013 11:11:49 +0100] rev 8340
install shaders only when needed, find clang only when needed, fix building on windows, better cmake boolean vars
Thu, 27 Dec 2012 17:08:58 +0100 disable splash on linux
koda [Thu, 27 Dec 2012 17:08:58 +0100] rev 8339
disable splash on linux
Sun, 30 Dec 2012 09:48:52 -0500 Small GL message webgl
Michael Hartman <omh1280@gmail.com> [Sun, 30 Dec 2012 09:48:52 -0500] rev 8338
Small GL message
Thu, 27 Dec 2012 17:01:02 +0100 add a splashscreen while the main interface is loading (enabled on all platforms, disable if it doesn'n't look good
koda [Thu, 27 Dec 2012 17:01:02 +0100] rev 8337
add a splashscreen while the main interface is loading (enabled on all platforms, disable if it doesn'n't look good
Sun, 30 Dec 2012 09:24:30 -0500 uStore.pas: Correctly point to shaders webgl
Michael Hartman <omh1280@gmail.com> [Sun, 30 Dec 2012 09:24:30 -0500] rev 8336
uStore.pas: Correctly point to shaders
Thu, 27 Dec 2012 15:56:02 +0100 oops, forgot that data absolute path only applies to linux
koda [Thu, 27 Dec 2012 15:56:02 +0100] rev 8335
oops, forgot that data absolute path only applies to linux
Sun, 30 Dec 2012 09:23:30 -0500 Added shaders and -GL2 option webgl
Michael Hartman <omh1280@gmail.com> [Sun, 30 Dec 2012 09:23:30 -0500] rev 8334
Added shaders and -GL2 option
Thu, 27 Dec 2012 15:32:48 +0100 move DATA_INSTALL_DIR to the configurable options section
koda [Thu, 27 Dec 2012 15:32:48 +0100] rev 8333
move DATA_INSTALL_DIR to the configurable options section
Tue, 25 Dec 2012 05:15:49 +0100 fix hwc install and pas2c preprocessing (but not total conversion) webgl
koda [Tue, 25 Dec 2012 05:15:49 +0100] rev 8332
fix hwc install and pas2c preprocessing (but not total conversion)
Thu, 27 Dec 2012 13:24:57 +0100 typo when using DATA_INSTALL_DIR
koda [Thu, 27 Dec 2012 13:24:57 +0100] rev 8331
typo when using DATA_INSTALL_DIR
Tue, 25 Dec 2012 04:45:22 +0100 update branch with default webgl
koda [Tue, 25 Dec 2012 04:45:22 +0100] rev 8330
update branch with default
Thu, 27 Dec 2012 12:31:23 +0400 Fix build
unc0rr [Thu, 27 Dec 2012 12:31:23 +0400] rev 8329
Fix build
Tue, 25 Dec 2012 02:30:00 +0100 GCI2012: Feedback Redo
dag10 [Tue, 25 Dec 2012 02:30:00 +0100] rev 8328
GCI2012: Feedback Redo
Tue, 25 Dec 2012 01:13:07 +0100 convert Game() library call to argc,argv format so that we can use the new parsing functions
koda [Tue, 25 Dec 2012 01:13:07 +0100] rev 8327
convert Game() library call to argc,argv format so that we can use the new parsing functions
Mon, 24 Dec 2012 12:52:14 -0500 Don't play sounds in chat if sound is disabled, try to prevent sound crashes by checking for audio init failure.
nemo [Mon, 24 Dec 2012 12:52:14 -0500] rev 8326
Don't play sounds in chat if sound is disabled, try to prevent sound crashes by checking for audio init failure.
Mon, 24 Dec 2012 17:07:12 +0100 GCI2012: Change Argument Passing Between Frontend and Engine
RowanD [Mon, 24 Dec 2012 17:07:12 +0100] rev 8325
GCI2012: Change Argument Passing Between Frontend and Engine
Mon, 24 Dec 2012 16:23:55 +0100 merge
koda [Mon, 24 Dec 2012 16:23:55 +0100] rev 8324
merge
Mon, 24 Dec 2012 15:41:45 +0100 get executable directory at runtime rather than configure time
koda [Mon, 24 Dec 2012 15:41:45 +0100] rev 8323
get executable directory at runtime rather than configure time
Mon, 24 Dec 2012 03:00:18 +0100 adjust rpath on osx too for libengine
koda [Mon, 24 Dec 2012 03:00:18 +0100] rev 8322
adjust rpath on osx too for libengine
Mon, 24 Dec 2012 09:56:29 -0500 fix sky
nemo [Mon, 24 Dec 2012 09:56:29 -0500] rev 8321
fix sky
Sat, 22 Dec 2012 21:43:39 -0500 Shoppa tournament 2012 winners
nemo [Sat, 22 Dec 2012 21:43:39 -0500] rev 8320
Shoppa tournament 2012 winners
Sat, 22 Dec 2012 21:04:47 -0500 trophyrace with names removed
nemo [Sat, 22 Dec 2012 21:04:47 -0500] rev 8319
trophyrace with names removed
Thu, 20 Dec 2012 23:54:41 +0100 GCI2012: Beautify Network Page
dag10 [Thu, 20 Dec 2012 23:54:41 +0100] rev 8318
GCI2012: Beautify Network Page
Thu, 20 Dec 2012 23:14:54 +0100 remove the CROSSAPPLE option until a better solution is found
koda [Thu, 20 Dec 2012 23:14:54 +0100] rev 8317
remove the CROSSAPPLE option until a better solution is found
Thu, 20 Dec 2012 23:12:18 +0100 cmake rework, cleanup a lot of redundant sections, separate library and binary install location, unify osx and win handling of the data directory (tested on win, lin and mac)
koda [Thu, 20 Dec 2012 23:12:18 +0100] rev 8316
cmake rework, cleanup a lot of redundant sections, separate library and binary install location, unify osx and win handling of the data directory (tested on win, lin and mac)
Wed, 19 Dec 2012 19:33:49 +0100 edit rpath manually, allowing frontend+libengine to run on linux too
koda [Wed, 19 Dec 2012 19:33:49 +0100] rev 8315
edit rpath manually, allowing frontend+libengine to run on linux too
Wed, 19 Dec 2012 19:28:13 +0100 can change library name and compile it on windows again
koda [Wed, 19 Dec 2012 19:28:13 +0100] rev 8314
can change library name and compile it on windows again
Wed, 19 Dec 2012 18:23:29 +0100 remove FPFLAGS and GHFLAGS from cache every time
koda [Wed, 19 Dec 2012 18:23:29 +0100] rev 8313
remove FPFLAGS and GHFLAGS from cache every time
Wed, 19 Dec 2012 18:17:23 +0100 can compile engine as library on linux but not run the executable (automatically), most likely breaking other platforms (wrt engine-as-library)
koda [Wed, 19 Dec 2012 18:17:23 +0100] rev 8312
can compile engine as library on linux but not run the executable (automatically), most likely breaking other platforms (wrt engine-as-library)
Tue, 18 Dec 2012 12:04:17 +0100 can use engine as library on windows too
koda [Tue, 18 Dec 2012 12:04:17 +0100] rev 8311
can use engine as library on windows too
Tue, 18 Dec 2012 03:07:45 +0100 minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
koda [Tue, 18 Dec 2012 03:07:45 +0100] rev 8310
minor adjustments to libengine, moc is correctly created as definitions are set before calling it, params are better numbered and we don't subclass qthread but rather use moveToThread()
Mon, 17 Dec 2012 00:43:52 +0100 bye bye cBits
koda [Mon, 17 Dec 2012 00:43:52 +0100] rev 8309
bye bye cBits
Mon, 17 Dec 2012 00:34:49 +0100 move GetParams in ArgParser, print a warning when using a deprecated command, pascalisation of +1s
koda [Mon, 17 Dec 2012 00:34:49 +0100] rev 8308
move GetParams in ArgParser, print a warning when using a deprecated command, pascalisation of +1s
Mon, 17 Dec 2012 00:18:18 +0100 GCI2012: Optional Second Argument
RowanD [Mon, 17 Dec 2012 00:18:18 +0100] rev 8307
GCI2012: Optional Second Argument
Tue, 18 Dec 2012 20:48:37 +0400 Use physfs here too flibqtfrontend
unc0rr [Tue, 18 Dec 2012 20:48:37 +0400] rev 8306
Use physfs here too
Sun, 16 Dec 2012 18:50:00 +0100 add hwengine.desktop to hgignore
sheepluva [Sun, 16 Dec 2012 18:50:00 +0100] rev 8305
add hwengine.desktop to hgignore
Sun, 16 Dec 2012 12:25:13 +0400 Merge from default flibqtfrontend
unc0rr [Sun, 16 Dec 2012 12:25:13 +0400] rev 8304
Merge from default
Sun, 16 Dec 2012 12:16:21 +0400 Pass ROUND_FINISHED to engine so it could stop syncing
unc0rr [Sun, 16 Dec 2012 12:16:21 +0400] rev 8303
Pass ROUND_FINISHED to engine so it could stop syncing
Sun, 16 Dec 2012 01:25:11 +0100 improve engine cmd line parsing and its documentation
RowanD [Sun, 16 Dec 2012 01:25:11 +0100] rev 8302
improve engine cmd line parsing and its documentation
Sat, 15 Dec 2012 23:00:07 +0100 Documented an unclear method call
Ondrej Skopek <skopekondrej@gmail.com> [Sat, 15 Dec 2012 23:00:07 +0100] rev 8301
Documented an unclear method call
Sat, 15 Dec 2012 22:42:21 +0100 Reloads PAGE_SETUP values after clearing passwordhash
Ondrej Skopek <skopekondrej@gmail.com> [Sat, 15 Dec 2012 22:42:21 +0100] rev 8300
Reloads PAGE_SETUP values after clearing passwordhash
Fri, 14 Dec 2012 21:09:07 +0100 Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Ondrej Skopek <skopekondrej@gmail.com> [Fri, 14 Dec 2012 21:09:07 +0100] rev 8299
Added handling of not registered nicks (no change-server side tho), clearPasswordHash() also now sets the savepassword setting to false
Fri, 14 Dec 2012 18:57:31 +0100 Merge from parent
Ondrej Skopek <skopekondrej@gmail.com> [Fri, 14 Dec 2012 18:57:31 +0100] rev 8298
Merge from parent
Fri, 14 Dec 2012 18:49:25 +0100 Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog
Ondrej Skopek <skopekondrej@gmail.com> [Fri, 14 Dec 2012 18:49:25 +0100] rev 8297
Reverted password loading in PAGE_SETUP, changed the value of passwordlength to save, added clearing of hashes after a 'Wrong password' RetryDialog
Thu, 13 Dec 2012 20:34:44 +0100 Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Ondrej Skopek <skopekondrej@gmail.com> [Thu, 13 Dec 2012 20:34:44 +0100] rev 8296
Added a hack that activates a RetryDialog in case the user is banned for 'Reconnect too fast'. Set all string used in RetryDialog to be translated
Wed, 12 Dec 2012 16:17:32 +0100 fixed minor problem with saving hash
Ondrej Skopek <skopekondrej@gmail.com> [Wed, 12 Dec 2012 16:17:32 +0100] rev 8295
fixed minor problem with saving hash
Wed, 12 Dec 2012 15:57:01 +0100 Removed whitespaces, refactored hash setting getting and clearing
Ondrej Skopek <skopekondrej@gmail.com> [Wed, 12 Dec 2012 15:57:01 +0100] rev 8294
Removed whitespaces, refactored hash setting getting and clearing
Tue, 11 Dec 2012 15:45:20 +0100 Removed commented-out unused code
Ondrej Skopek <skopekondrej@gmail.com> [Tue, 11 Dec 2012 15:45:20 +0100] rev 8293
Removed commented-out unused code
Fri, 14 Dec 2012 09:58:26 -0500 *sigh*
nemo [Fri, 14 Dec 2012 09:58:26 -0500] rev 8292
*sigh*
Mon, 10 Dec 2012 22:09:54 +0100 Patched login dialog bugs, added retry dialogs
Ondrej Skopek <skopekondrej@gmail.com> [Mon, 10 Dec 2012 22:09:54 +0100] rev 8291
Patched login dialog bugs, added retry dialogs
(0) -3000 -1000 -300 -100 -96 +96 +100 +300 +1000 +3000 tip