2011-06-22 Changed back DARWINN typo, removed 3 commented functions hedgeroid
Xeli [Wed, 22 Jun 2011 12:54:30 +0200] rev 5288
Changed back DARWINN typo, removed 3 commented functions
2011-06-21 fixed gfInfAttack preventing ending of turn while placing hedgehogs
Henek [Wed, 22 Jun 2011 01:04:38 +0200] rev 5287
fixed gfInfAttack preventing ending of turn while placing hedgehogs
2011-06-21 First commit.. hedgeroid
Xeli [Wed, 22 Jun 2011 00:38:31 +0200] rev 5286
First commit..
2011-06-21 Make sky, horizon, flakes and clouds optional, replace repeated strips of skyL/skyR with 2x2 transparent PNGs instead of larger images of variable dimensions, remove a number of empty unused images
nemo [Tue, 21 Jun 2011 18:28:34 -0400] rev 5285
Make sky, horizon, flakes and clouds optional, replace repeated strips of skyL/skyR with 2x2 transparent PNGs instead of larger images of variable dimensions, remove a number of empty unused images
2011-06-21 Remove default transparent chunks. Chunk will only be added if theme defined.
nemo [Tue, 21 Jun 2011 17:28:53 -0400] rev 5284
Remove default transparent chunks. Chunk will only be added if theme defined.
2011-06-21 oops
koda [Tue, 21 Jun 2011 23:24:50 +0200] rev 5283
oops
2011-06-21 whitelist Island theme on ios (with Tiy approval)
koda [Tue, 21 Jun 2011 23:23:21 +0200] rev 5282
whitelist Island theme on ios (with Tiy approval)
2011-06-21 update theme listing for ios
koda [Tue, 21 Jun 2011 22:57:46 +0200] rev 5281
update theme listing for ios
2011-06-21 remove/rename icons for dummy themes
koda [Tue, 21 Jun 2011 22:57:10 +0200] rev 5280
remove/rename icons for dummy themes
2011-06-21 remove theme.cfg from CMakeLists too
Henek [Tue, 21 Jun 2011 22:47:12 +0200] rev 5279
remove theme.cfg from CMakeLists too
2011-06-21 New User Mission: That Sinking Feeling
mikade [Tue, 21 Jun 2011 20:51:51 +0200] rev 5278
New User Mission: That Sinking Feeling
2011-06-21 PianoStrike exploit fix for Capture The Flag.
mikade [Tue, 21 Jun 2011 20:49:47 +0200] rev 5277
PianoStrike exploit fix for Capture The Flag. New Gameplay Mode: The Specialists
2011-06-21 Derive themes list from list of dirs in Themes folder which have icon.png inside
unc0rr [Tue, 21 Jun 2011 22:43:55 +0400] rev 5276
Derive themes list from list of dirs in Themes folder which have icon.png inside
2011-06-21 restore logging on mac
koda [Tue, 21 Jun 2011 16:55:34 +0200] rev 5275
restore logging on mac
2011-06-21 Avoid desyncing on blurry land
nemo [Mon, 20 Jun 2011 20:46:27 -0400] rev 5274
Avoid desyncing on blurry land
2011-06-20 oops
nemo [Mon, 20 Jun 2011 19:00:19 -0400] rev 5273
oops
2011-06-20 Allow scripting to set arbitrary weapon counts
nemo [Mon, 20 Jun 2011 18:58:26 -0400] rev 5272
Allow scripting to set arbitrary weapon counts
2011-06-20 ack. forgot to add my stub files
nemo [Mon, 20 Jun 2011 15:21:27 -0400] rev 5271
ack. forgot to add my stub files
2011-06-20 merge
mikade [Mon, 20 Jun 2011 20:43:11 +0200] rev 5270
merge
2011-06-20 Implement testing for illegal characters
unc0rr [Mon, 20 Jun 2011 21:40:08 +0400] rev 5269
Implement testing for illegal characters
2011-06-20 Small stub web view that I'm hoping to use in conjunction with ~/.hedgewars/Data - I'd like to link to a page on hedgewars.org, intercept linkClicked, fetch zip files, then unpack the structure under Data. Just checking this in so it doesn't clutter up project. Also tidied up the .pro a bit, even though we aren't really using it for much anymore. Should in theory be able to do a build now.
nemo [Mon, 20 Jun 2011 12:57:44 -0400] rev 5268
Small stub web view that I'm hoping to use in conjunction with ~/.hedgewars/Data - I'd like to link to a page on hedgewars.org, intercept linkClicked, fetch zip files, then unpack the structure under Data. Just checking this in so it doesn't clutter up project. Also tidied up the .pro a bit, even though we aren't really using it for much anymore. Should in theory be able to do a build now.
2011-06-20 move smoothing into separate function, adjust call order
nemo [Mon, 20 Jun 2011 09:32:31 -0400] rev 5267
move smoothing into separate function, adjust call order
2011-06-20 25%, not 50%
nemo [Mon, 20 Jun 2011 09:15:24 -0400] rev 5266
25%, not 50%
2011-06-20 merge Zorg's changes
koda [Mon, 20 Jun 2011 10:36:20 +0200] rev 5265
merge Zorg's changes
2011-06-20 More AA - try smoothing explosions a bit
nemo [Mon, 20 Jun 2011 02:03:15 -0400] rev 5264
More AA - try smoothing explosions a bit
2011-06-19 display player count below and with label, just because it's funny to mess with unC0Rr's code and make him cry :P
sheepluva [Mon, 20 Jun 2011 01:28:21 +0200] rev 5263
display player count below and with label, just because it's funny to mess with unC0Rr's code and make him cry :P
2011-06-20 Oops, don't need this.
Zorg <zorgiepoo@gmail.com> [Sun, 19 Jun 2011 21:03:16 -0400] rev 5262
Oops, don't need this.
2011-06-20 More AA - try smoothing explosions a bit
nemo [Mon, 20 Jun 2011 02:03:15 -0400] rev 5261
More AA - try smoothing explosions a bit
2011-06-20 When the password field is filled with null characters and when the user tries to edit the field, clear it.
Zorg <zorgiepoo@gmail.com> [Sun, 19 Jun 2011 20:55:34 -0400] rev 5260
When the password field is filled with null characters and when the user tries to edit the field, clear it.
2011-06-19 display player count below and with label, just because it's funny to mess with unC0Rr's code and make him cry :P
sheepluva [Mon, 20 Jun 2011 01:28:21 +0200] rev 5259
display player count below and with label, just because it's funny to mess with unC0Rr's code and make him cry :P
2011-06-19 updated russian translation
tsleon [Sun, 19 Jun 2011 18:45:10 +0200] rev 5258
updated russian translation
2011-06-19 passing by reference... my darkest enemy
koda [Sun, 19 Jun 2011 12:34:54 +0200] rev 5257
passing by reference... my darkest enemy actual reason below: In your case (without reference) the compiler generates a temporary object (int) for the first argument of your MyApplication constructor. You pass this temporary int to QApplication’s constructor (with int reference), which saves the address of this reference. Once your MyApplication constructor is done the temporary int is destroyed but QApplication still has its address.
2011-06-18 fix water bubbles like sheepluva wanted (also code formatting)
koda [Sun, 19 Jun 2011 00:49:13 +0200] rev 5256
fix water bubbles like sheepluva wanted (also code formatting)
2011-06-18 under osx don't load a file in case a game is already running (also a little of code formatting)
koda [Sat, 18 Jun 2011 17:26:13 +0200] rev 5255
under osx don't load a file in case a game is already running (also a little of code formatting)
2011-06-18 updated polish translation
krdrt5367 [Sat, 18 Jun 2011 16:56:45 +0200] rev 5254
updated polish translation
2011-06-18 add the manual build server dir to .hgignore
koda [Sat, 18 Jun 2011 16:54:08 +0200] rev 5253
add the manual build server dir to .hgignore
2011-06-18 file association for mac!
koda [Sat, 18 Jun 2011 03:14:45 +0200] rev 5252
file association for mac! associating file is done automatically when you move the app in your system but there is also a button to set it manually i had to disable argument parsing and to subclass qapplication to make this work please test
2011-06-15 expose the available translations in the plist file
koda [Wed, 15 Jun 2011 23:59:44 +0200] rev 5251
expose the available translations in the plist file
2011-06-15 forgot to update this variable name
koda [Wed, 15 Jun 2011 23:11:06 +0200] rev 5250
forgot to update this variable name
2011-06-18 revert back to 512x512
nemo [Fri, 17 Jun 2011 20:53:36 -0400] rev 5249
revert back to 512x512
2011-06-17 okay...
mikade [Fri, 17 Jun 2011 18:03:12 +0200] rev 5248
okay...
2011-06-21 Ability to turn camera following gears off
unc0rr [Tue, 21 Jun 2011 16:43:05 +0400] rev 5247
Ability to turn camera following gears off
2011-06-17 merge of tsleon's updated russian. I assume unc0rr will vet the phrasing
nemo [Fri, 17 Jun 2011 11:58:27 -0400] rev 5246
merge of tsleon's updated russian. I assume unc0rr will vet the phrasing
2011-06-16 Fully playable version of Space Invasion (fingers crossed). No bugs known.
mikade [Thu, 16 Jun 2011 23:45:17 +0200] rev 5245
Fully playable version of Space Invasion (fingers crossed). No bugs known.
2011-06-21 Don't stick to enemies when there are more than 2 clans
unc0rr [Tue, 21 Jun 2011 16:42:04 +0400] rev 5244
Don't stick to enemies when there are more than 2 clans
2011-06-14 check alternate script loading path
nemo [Tue, 14 Jun 2011 16:50:41 -0400] rev 5243
check alternate script loading path
2011-06-14 corrected user ptData path
nemo [Tue, 14 Jun 2011 16:44:51 -0400] rev 5242
corrected user ptData path
2011-06-14 add missing user path check
nemo [Tue, 14 Jun 2011 14:00:29 -0400] rev 5241
add missing user path check
2011-06-14 Oops. Forgot an assignment.
nemo [Tue, 14 Jun 2011 11:29:15 -0400] rev 5240
Oops. Forgot an assignment.
2011-06-13 Bit more reusability
nemo [Sun, 12 Jun 2011 22:34:38 -0400] rev 5239
Bit more reusability
2011-06-13 Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
nemo [Sun, 12 Jun 2011 21:06:48 -0400] rev 5238
Enable ~/.hedgewars/Data (or platform equivalent) to override/extend pretty much everything in system Data dir. Obviously desyncing can occur, so this is at user's own risk. Should simplify map etc install. Needs testing.
2011-06-12 If 2 or more resolutions are available, use the 2nd in the list. This should (usually) be smaller than the desktop resolution, which should reduce noob fail (not realising part of interface is obscured)
nemo [Sun, 12 Jun 2011 14:45:26 -0400] rev 5237
If 2 or more resolutions are available, use the 2nd in the list. This should (usually) be smaller than the desktop resolution, which should reduce noob fail (not realising part of interface is obscured)
2011-06-12 Make flakes respond to wind a bit more strongly
nemo [Sun, 12 Jun 2011 10:33:55 -0400] rev 5236
Make flakes respond to wind a bit more strongly
2011-06-12 Skip droplets if plain splash is enabled, add a sanity check just in case.
nemo [Sun, 12 Jun 2011 10:16:38 -0400] rev 5235
Skip droplets if plain splash is enabled, add a sanity check just in case.
2011-06-10 Update for ver. 0.9.15
ts.leon@mail.ru [Fri, 10 Jun 2011 17:28:53 +0000] rev 5234
Update for ver. 0.9.15
2011-06-11 Should reduce rope skip fail and unrealistic rope drownings
nemo [Sat, 11 Jun 2011 17:27:26 -0400] rev 5233
Should reduce rope skip fail and unrealistic rope drownings
2011-06-09 fix splash
nemo [Thu, 09 Jun 2011 00:22:57 -0400] rev 5232
fix splash
2011-06-09 tweak to avoid specks after damage
nemo [Thu, 09 Jun 2011 00:00:33 -0400] rev 5231
tweak to avoid specks after damage
2011-06-09 Set m_game_connected to false after emitting Disconnected(). This fixes a bug in a case such that when entering an invalid password, the game would bring you back to the main menu.
Zorg <zorgiepoo@gmail.com> [Wed, 08 Jun 2011 23:25:05 -0400] rev 5230
Set m_game_connected to false after emitting Disconnected(). This fixes a bug in a case such that when entering an invalid password, the game would bring you back to the main menu.
2011-06-08 Attempt to fix issue 125. The password pop-up doesn't appear every time when going into the official server anymore, now it only does it when the password is blank. If a user enters an invalid password, the password is set blank to avoid the user going back to the official server just to be rejected. When entering an invalid password, the unknown error dialog doesn't show up anymore, but the connection lost to server one still does. This fixes the bug where the user would be spammed with error messages. The user can also now change his password in the settings page.
Zorg <zorgiepoo@gmail.com> [Wed, 08 Jun 2011 03:36:54 -0400] rev 5229
Attempt to fix issue #125. The password pop-up doesn't appear every time when going into the official server anymore, now it only does it when the password is blank. If a user enters an invalid password, the password is set blank to avoid the user going back to the official server just to be rejected. When entering an invalid password, the unknown error dialog doesn't show up anymore, but the connection lost to server one still does. This fixes the bug where the user would be spammed with error messages. The user can also now change his password in the settings page.
2011-06-04 Nerf RC a bit
nemo [Sat, 04 Jun 2011 16:09:12 -0400] rev 5228
Nerf RC a bit
2011-06-02 oops.
nemo [Thu, 02 Jun 2011 18:39:35 -0400] rev 5227
oops.
2011-06-02 Don't need to check for this case
nemo [Thu, 02 Jun 2011 18:36:35 -0400] rev 5226
Don't need to check for this case
2011-06-02 Experiment in making the land less jagg-y
nemo [Thu, 02 Jun 2011 18:08:50 -0400] rev 5225
Experiment in making the land less jagg-y
2011-05-29 muuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuusic for the ios frontend finally
koda [Mon, 30 May 2011 01:14:25 +0200] rev 5224
muuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuusic for the ios frontend finally
2011-05-29 allow fpc to search through the user directory when linking frameworks
koda [Sun, 29 May 2011 23:58:28 +0200] rev 5223
allow fpc to search through the user directory when linking frameworks
2011-05-29 unbreak compiling frontend under osx
koda [Sun, 29 May 2011 23:21:59 +0200] rev 5222
unbreak compiling frontend under osx
2011-05-29 Tiny optimization
unc0rr [Sun, 29 May 2011 20:28:27 +0400] rev 5221
Tiny optimization
2011-05-28 when the match is not completed (eg out of memory or crash) the game asks for restoring it as soon as it is opened again
koda [Sat, 28 May 2011 23:40:42 +0200] rev 5220
when the match is not completed (eg out of memory or crash) the game asks for restoring it as soon as it is opened again
2011-05-28 this notification can be removed
koda [Sat, 28 May 2011 16:40:23 +0200] rev 5219
this notification can be removed
2011-05-28 Fix bug that made me lose my tournament match
nemo [Sat, 28 May 2011 16:59:09 -0400] rev 5218
Fix bug that made me lose my tournament match
2011-05-27 Don't allocate SDL_event structure on stack
unc0rr [Fri, 27 May 2011 23:18:23 +0400] rev 5217
Don't allocate SDL_event structure on stack
2011-05-25 small Korean update
TrevInc [Wed, 25 May 2011 14:21:40 +0200] rev 5216
small Korean update
2011-05-23 Try and avoid problem reported by users like RDChrisco with cards that only support 512 texture size, and disable backgrounds. Also, reorganise the rq flags sprite loading a bit. Needs testing to make sure it matches the sprite uses. It should though.
nemo [Mon, 23 May 2011 11:25:37 -0400] rev 5215
Try and avoid problem reported by users like RDChrisco with cards that only support 512 texture size, and disable backgrounds. Also, reorganise the rq flags sprite loading a bit. Needs testing to make sure it matches the sprite uses. It should though.
2011-05-22 60 seconds cooldown ban on kick
unc0rr [Sun, 22 May 2011 19:44:53 +0400] rev 5214
60 seconds cooldown ban on kick
2011-05-17 make the associate button use the user's settings for loading demos/saves
nemo [Tue, 17 May 2011 19:05:13 -0400] rev 5213
make the associate button use the user's settings for loading demos/saves
2011-05-16 Don't perform RestartServer action when already did it once
unc0rr [Mon, 16 May 2011 22:04:59 +0400] rev 5212
Don't perform RestartServer action when already did it once
2011-05-16 Don't send stats after spawning new server
unc0rr [Mon, 16 May 2011 22:03:14 +0400] rev 5211
Don't send stats after spawning new server
2011-05-15 Pass correct arguments on restart
unc0rr [Sun, 15 May 2011 18:16:13 +0400] rev 5210
Pass correct arguments on restart
2011-05-15 On restart command close server socket and spawn new server, keep running until last client quits
unc0rr [Sun, 15 May 2011 18:10:01 +0400] rev 5209
On restart command close server socket and spawn new server, keep running until last client quits
2011-05-12 all together now! releaseAndNil ftw
koda [Thu, 12 May 2011 23:29:31 +0200] rev 5208
all together now! releaseAndNil ftw
2011-05-12 some general tweaks (more intelligent use of macros and more caching)
koda [Thu, 12 May 2011 23:00:26 +0200] rev 5207
some general tweaks (more intelligent use of macros and more caching)
2011-05-10 settings.plist is no more, long live nsuserdefaults
koda [Wed, 11 May 2011 01:26:38 +0200] rev 5206
settings.plist is no more, long live nsuserdefaults
2011-05-09 some headers cleanup and rename of stats and playrecord pages for consistency
koda [Mon, 09 May 2011 18:00:39 +0200] rev 5205
some headers cleanup and rename of stats and playrecord pages for consistency
2011-05-09 split pages.h into several header files
koda [Mon, 09 May 2011 16:56:29 +0200] rev 5204
split pages.h into several header files
2011-05-08 Better tracking of damage source and target when scoring a turn
unc0rr [Sun, 08 May 2011 21:15:42 +0400] rev 5203
Better tracking of damage source and target when scoring a turn
2011-05-05 Some improvements on stats subsystem
unc0rr [Thu, 05 May 2011 17:08:29 +0400] rev 5202
Some improvements on stats subsystem
2011-05-03 * moved colours and default port from .cpp.in to .h
koda [Wed, 04 May 2011 01:19:39 +0200] rev 5201
* moved colours and default port from .cpp.in to .h * slight tweaks to existing colours (softer shades)
2011-05-03 * move ammo lines from .cpp.in to .h so that it is readable from the ios frontend (and who knows, maybe from other frontends as well)
koda [Tue, 03 May 2011 23:16:47 +0200] rev 5200
* move ammo lines from .cpp.in to .h so that it is readable from the ios frontend (and who knows, maybe from other frontends as well) * increase the max team number from 6 to 8 like engine supports * update ios project file for uCursor
2011-05-02 Oops, forgot to remove this
unc0rr [Mon, 02 May 2011 18:40:15 +0400] rev 5199
Oops, forgot to remove this
2011-05-02 Merge cursor_issues into default
unc0rr [Mon, 02 May 2011 18:39:11 +0400] rev 5198
Merge cursor_issues into default
2011-05-02 Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
nemo [Mon, 02 May 2011 01:55:14 -0400] rev 5197
Basic TARDIS implementation. Still needs proper animation, and probably a check to force reappearance on death of last team mate
2011-05-02 update hgtags
koda [Mon, 02 May 2011 02:07:28 +0200] rev 5196
update hgtags
2011-05-01 fix rotation and ammomenu on ios
koda [Sun, 01 May 2011 05:39:52 +0200] rev 5195
fix rotation and ammomenu on ios
2011-04-30 small fix for starting the ios game
koda [Sat, 30 Apr 2011 20:06:05 +0200] rev 5194
small fix for starting the ios game
2011-05-16 Close branch cursor_issues
unc0rr [Mon, 16 May 2011 22:08:28 +0400] rev 5193
Close branch
2011-04-29 Optimize hwFloat2Float a bit
unc0rr [Fri, 29 Apr 2011 17:11:08 +0400] rev 5192
Optimize hwFloat2Float a bit
2011-05-02 - Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window cursor_issues
unc0rr [Mon, 02 May 2011 18:37:57 +0400] rev 5191
- Implement a thin wrapper over real cursor, which eliminates need in SDL_WarpMouse outside game window - Fixes pointing target near water when zooming
2011-04-29 Call statistics routine after setting the damage
unc0rr [Fri, 29 Apr 2011 17:05:10 +0400] rev 5190
Call statistics routine after setting the damage
2011-04-29 Merge with default tip cursor_issues
unc0rr [Fri, 29 Apr 2011 13:56:38 +0400] rev 5189
Merge with default tip
2011-04-29 some updates to the crossbuild system for mac
koda [Fri, 29 Apr 2011 03:31:50 +0200] rev 5188
some updates to the crossbuild system for mac most notably it chooses a single default architecture with more precision
2011-04-29 make sdl1.3 window creation code more readable
koda [Fri, 29 Apr 2011 02:42:46 +0200] rev 5187
make sdl1.3 window creation code more readable
2011-04-27 fix some more warnings
koda [Thu, 28 Apr 2011 01:01:07 +0200] rev 5186
fix some more warnings
2011-04-27 remove the trailing _en from scheme data and use the macros available instead of creating a string every time
koda [Thu, 28 Apr 2011 00:16:36 +0200] rev 5185
remove the trailing _en from scheme data and use the macros available instead of creating a string every time
2011-04-27 update iphone too
nemo [Wed, 27 Apr 2011 11:11:45 -0400] rev 5184
update iphone too
2011-04-27 Oops. Forgot Hello (frontend) and "First Blood"
nemo [Wed, 27 Apr 2011 11:05:56 -0400] rev 5183
Oops. Forgot Hello (frontend) and "First Blood"
2011-04-27 merge
unc0rr [Wed, 27 Apr 2011 16:01:27 +0400] rev 5182
merge
2011-04-27 add getawaytime and tagteam mode to ios
koda [Wed, 27 Apr 2011 02:34:38 +0200] rev 5181
add getawaytime and tagteam mode to ios some tweaks to scheme creation
2011-04-27 small cosmetics
koda [Wed, 27 Apr 2011 02:10:22 +0200] rev 5180
small cosmetics
2011-04-27 Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
unc0rr [Wed, 27 Apr 2011 15:57:23 +0400] rev 5179
Fix "Mixing signed expressions and longwords gives a 64bit result" warnings
2011-04-26 ooops
vittorio.giovara@gmail.com [Tue, 26 Apr 2011 13:13:07 +0200] rev 5178
ooops
2011-04-26 remove unusued voices also for ios
koda [Tue, 26 Apr 2011 02:36:40 +0200] rev 5177
remove unusued voices also for ios small tweak that allows us to avoid modifying sdl sourcecode to work
2011-04-25 Skip installation of unused sounds to save space
nemo [Mon, 25 Apr 2011 17:56:26 -0400] rev 5176
Skip installation of unused sounds to save space
2011-04-25 finish overlay refactoring and some leak annihilation
koda [Mon, 25 Apr 2011 07:53:06 +0200] rev 5175
finish overlay refactoring and some leak annihilation
2011-04-25 initial refactoring of ObjcExports and OverlayViewController
koda [Mon, 25 Apr 2011 06:38:59 +0200] rev 5174
initial refactoring of ObjcExports and OverlayViewController
2011-04-25 small trailing changes
koda [Mon, 25 Apr 2011 02:25:25 +0200] rev 5173
small trailing changes
2011-04-24 aaand let's add freetype as well while we are at it
koda [Mon, 25 Apr 2011 01:46:54 +0200] rev 5172
aaand let's add freetype as well while we are at it other smaller changes
2011-04-24 add ios project files for lua sources
koda [Sun, 24 Apr 2011 23:13:45 +0200] rev 5171
add ios project files for lua sources
2011-04-24 add libTremor sources (integer-only libvorbis implementation) to repo and ios project
koda [Sun, 24 Apr 2011 22:57:57 +0200] rev 5170
add libTremor sources (integer-only libvorbis implementation) to repo and ios project
2011-04-24 some comments and simplifications for cmake files
koda [Sun, 24 Apr 2011 21:35:23 +0200] rev 5169
some comments and simplifications for cmake files
2011-04-21 small tweak to autogenerate the config.inc file in the ios project
koda [Thu, 21 Apr 2011 08:22:34 +0200] rev 5168
small tweak to autogenerate the config.inc file in the ios project
2011-04-21 Clean Augean stables 2 (pascal has classnames available)
koda [Thu, 21 Apr 2011 07:41:24 +0200] rev 5167
Clean Augean stables 2 (pascal has classnames available)
2011-04-20 and now for something completely different, overlay refactoring!
koda [Wed, 20 Apr 2011 05:26:47 +0200] rev 5166
and now for something completely different, overlay refactoring! updated project files with new certificate info removed some warnings
2011-04-19 Disable Digital/Beach since Tiy's made clear he feels the problems are too extensive to fix.
nemo [Tue, 19 Apr 2011 15:34:21 -0400] rev 5165
Disable Digital/Beach since Tiy's made clear he feels the problems are too extensive to fix. Remove Chunk from Beach theme due copyright violation
2011-04-19 Use cWaterLine instead of LAND_HEIGHT, fix mortar handler aswell
unc0rr [Tue, 19 Apr 2011 14:39:55 +0400] rev 5164
Use cWaterLine instead of LAND_HEIGHT, fix mortar handler aswell
2011-04-19 Fix test for water in airstrike handler
unc0rr [Tue, 19 Apr 2011 14:20:52 +0400] rev 5163
Fix test for water in airstrike handler
2011-04-19 Fix AI trying to turn around in targeting mode
unc0rr [Tue, 19 Apr 2011 12:35:43 +0400] rev 5162
Fix AI trying to turn around in targeting mode
2011-04-19 oops
nemo [Mon, 18 Apr 2011 23:35:44 -0400] rev 5161
oops
2011-04-19 trying to make the umbrella and beachball seem a bit less cut out with a bit of beach sun/shade
nemo [Mon, 18 Apr 2011 23:26:28 -0400] rev 5160
trying to make the umbrella and beachball seem a bit less cut out with a bit of beach sun/shade
2011-04-18 merge
koda [Tue, 19 Apr 2011 00:43:39 +0200] rev 5159
merge
2011-04-18 stats implemented once again! refactoring complete \o/
koda [Tue, 19 Apr 2011 00:43:14 +0200] rev 5158
stats implemented once again! refactoring complete \o/
2011-04-18 things are a little sanier
koda [Tue, 19 Apr 2011 00:19:01 +0200] rev 5157
things are a little sanier
2011-04-18 work in progress yet again (can run some games now)
koda [Mon, 18 Apr 2011 02:45:51 +0200] rev 5156
work in progress yet again (can run some games now)
2011-04-17 more refactoring, less warnings, less stuff kept around
koda [Sun, 17 Apr 2011 22:38:24 +0200] rev 5155
more refactoring, less warnings, less stuff kept around
2011-04-17 initial refactoring for interfacing the game engine from the ios frontend (game doesn't run yet)
koda [Sun, 17 Apr 2011 20:52:56 +0200] rev 5154
initial refactoring for interfacing the game engine from the ios frontend (game doesn't run yet)
2011-04-18 I'm not saying this fixes anything, I'm just hoping it inspires Tiy to take an interest in the theme. (removes the background water effect that just wasn't working, puts in new spray objects including removing the copyrighted one, tries for a sand that doesn't look like sandpaper)
nemo [Sun, 17 Apr 2011 23:44:54 -0400] rev 5153
I'm not saying this fixes anything, I'm just hoping it inspires Tiy to take an interest in the theme. (removes the background water effect that just wasn't working, puts in new spray objects including removing the copyrighted one, tries for a sand that doesn't look like sandpaper)
2011-04-17 merge in japanese updates
nemo [Sun, 17 Apr 2011 13:33:46 -0400] rev 5152
merge in japanese updates
2011-04-17 An experiment - make bazooka AI use float instead of hwFloat - should be as accurate, but faster.
nemo [Sun, 17 Apr 2011 12:48:32 -0400] rev 5151
An experiment - make bazooka AI use float instead of hwFloat - should be as accurate, but faster.
2011-04-17 Allow head of rope to attach to hogs/barrels/crates again. Rope still does not, to avoid the bug.
nemo [Sun, 17 Apr 2011 11:57:46 -0400] rev 5150
Allow head of rope to attach to hogs/barrels/crates again. Rope still does not, to avoid the bug.
2011-04-17 Try to allow cursor to reach water when zooming out cursor_issues
unc0rr [Sun, 17 Apr 2011 22:16:36 +0400] rev 5149
Try to allow cursor to reach water when zooming out
2011-04-16 Make AI switch to amNothing before trying to walk if it holds weapon which needs targeting (not tested)
unc0rr [Sat, 16 Apr 2011 23:21:15 +0400] rev 5148
Make AI switch to amNothing before trying to walk if it holds weapon which needs targeting (not tested)
2011-04-15 Add 'Cancel connection' button. Fixes issue #162
unc0rr [Fri, 15 Apr 2011 22:38:50 +0400] rev 5147
Add 'Cancel connection' button. Fixes issue #162
2011-04-15 Send server's name in udp packet. Fixes issue #25
unc0rr [Fri, 15 Apr 2011 21:36:59 +0400] rev 5146
Send server's name in udp packet. Fixes issue #25
2011-04-14 adjust crosshair criteria again. this should take care of sniper rifle and crosshair after attacking
nemo [Thu, 14 Apr 2011 18:17:30 -0400] rev 5145
adjust crosshair criteria again. this should take care of sniper rifle and crosshair after attacking
2011-04-12 update dejavu - might possibly fix the german/brazillian/swedish crasher, who knows.
nemo [Tue, 12 Apr 2011 15:57:16 -0400] rev 5144
update dejavu - might possibly fix the german/brazillian/swedish crasher, who knows.
2011-04-12 Start implementation of archivements/ratings on server side: replay saving routine
unc0rr [Tue, 12 Apr 2011 22:31:48 +0400] rev 5143
Start implementation of archivements/ratings on server side: replay saving routine
2011-04-12 Show winners in console in a special form so this information could be easily parsed
unc0rr [Tue, 12 Apr 2011 21:28:37 +0400] rev 5142
Show winners in console in a special form so this information could be easily parsed
2011-04-11 cleared up Random Weapons and implemented remembering of weapons in Balanced Random Weapons too, also seems to work
Henek [Mon, 11 Apr 2011 18:23:43 +0200] rev 5141
cleared up Random Weapons and implemented remembering of weapons in Balanced Random Weapons too, also seems to work
2011-04-11 Change a few iterations over list to what is apparently a modification safe syntax, may fix issue #208 and #217 - needs testing of course.
nemo [Mon, 11 Apr 2011 11:22:10 -0400] rev 5140
Change a few iterations over list to what is apparently a modification safe syntax, may fix issue #208 and #217 - needs testing of course.
2011-04-10 grenade back to old damage, but from now on explosions assume they are not closer to a gear's center than the gear's radius
sheepluva [Mon, 11 Apr 2011 01:30:43 +0200] rev 5139
grenade back to old damage, but from now on explosions assume they are not closer to a gear's center than the gear's radius
2011-04-10 now Random Weapons will show the weapon you will get during the other players turns
Henek [Mon, 11 Apr 2011 00:35:53 +0200] rev 5138
now Random Weapons will show the weapon you will get during the other players turns not tested online yet, would be happy if someone could and report to me results
2011-04-10 rename gtBomb to gtGrenade, nerf grenade from 50 to 47 pending some flag to indicate pixels in Land[] belonging to current hog to avoid throwing grenades into hogs
nemo [Sun, 10 Apr 2011 17:25:34 -0400] rev 5137
rename gtBomb to gtGrenade, nerf grenade from 50 to 47 pending some flag to indicate pixels in Land[] belonging to current hog to avoid throwing grenades into hogs
2011-04-10 Fix a few crosshair bugs. Disable ShowCrosshair and just decide when drawing.
nemo [Sun, 10 Apr 2011 14:04:56 -0400] rev 5136
Fix a few crosshair bugs. Disable ShowCrosshair and just decide when drawing.
2011-04-11 typo
y2kbugxp90@gmail.com [Mon, 11 Apr 2011 20:53:55 +0000] rev 5135
typo
2011-04-10 //
sheepluva [Sun, 10 Apr 2011 20:02:25 +0200] rev 5134
//
2011-04-11 A bunch of Japanese edits
y2kbugxp90@gmail.com [Mon, 11 Apr 2011 00:42:06 +0000] rev 5133
A bunch of Japanese edits
2011-04-10 Make WriteLnToConsole write to stderr instead of stdout
unc0rr [Sun, 10 Apr 2011 20:36:09 +0400] rev 5132
Make WriteLnToConsole write to stderr instead of stdout
2011-04-10 Got a start on localizing all these strings.
y2kbugxp90@gmail.com [Sun, 10 Apr 2011 05:09:41 +0000] rev 5131
Got a start on localizing all these strings.
2011-04-10 Add a parameter for game simulation with no gui/sound enabled, just to get statistics
unc0rr [Sun, 10 Apr 2011 20:24:25 +0400] rev 5130
Add a parameter for game simulation with no gui/sound enabled, just to get statistics
2011-04-10 The first of several Japanese language localization patches.
y2kbugxp90@gmail.com [Sun, 10 Apr 2011 04:23:27 +0000] rev 5129
The first of several Japanese language localization patches.
2011-04-09 Check for 0 health to avoid div by 0. spotted by mikade.
nemo [Sat, 09 Apr 2011 15:54:28 -0400] rev 5128
Check for 0 health to avoid div by 0. spotted by mikade.
2011-04-08 added Balanced Random Weapon gameplay script
claymore [Fri, 08 Apr 2011 21:15:57 +0200] rev 5127
added Balanced Random Weapon gameplay script
2011-04-08 Frontend: room rename
claymore [Fri, 08 Apr 2011 18:50:12 +0200] rev 5126
Frontend: room rename
2011-04-08 //
sheepluva [Fri, 08 Apr 2011 13:42:25 +0200] rev 5125
//
2011-04-08 comments
sheepluva [Fri, 08 Apr 2011 11:40:18 +0200] rev 5124
comments
2011-04-08 guess what. comments. yay for burning commits
sheepluva [Fri, 08 Apr 2011 04:30:28 +0200] rev 5123
guess what. comments. yay for burning commits
2011-04-08 some more comments *yawns*
sheepluva [Fri, 08 Apr 2011 03:07:04 +0200] rev 5122
some more comments *yawns*
2011-04-07 added some comments in order to confuse the GSoC students as much as possible ;D
sheepluva [Thu, 07 Apr 2011 23:54:09 +0200] rev 5121
added some comments in order to confuse the GSoC students as much as possible ;D
2011-04-07 redundant now
nemo [Thu, 07 Apr 2011 14:13:11 -0400] rev 5120
redundant now
2011-04-07 Fix crash in server (accessing deleted room)
unc0rr [Thu, 07 Apr 2011 21:43:43 +0400] rev 5119
Fix crash in server (accessing deleted room)
2011-04-07 For mikade - bit more flexibility in script captions
nemo [Thu, 07 Apr 2011 11:30:56 -0400] rev 5118
For mikade - bit more flexibility in script captions
2011-04-07 mono version for ukranian voices
igorko [Thu, 07 Apr 2011 13:26:56 +0200] rev 5117
mono version for ukranian voices
2011-04-07 merge
koda [Thu, 07 Apr 2011 13:21:11 +0200] rev 5116
merge
2011-04-06 fix indentation and missing newline at end of file
sheepluva [Thu, 07 Apr 2011 01:45:38 +0200] rev 5115
fix indentation and missing newline at end of file
2011-04-06 Improved random name generation (now a random fort and random grave is choosen
Jonathan@Jonathan-PC.fritz.box [Wed, 06 Apr 2011 22:56:05 +0200] rev 5114
Improved random name generation (now a random fort and random grave is choosen from the available ones)
2011-04-06 background stars won't go all in the same direction anymore
Jonathan@Jonathan-PC.fritz.box [Wed, 06 Apr 2011 22:55:22 +0200] rev 5113
background stars won't go all in the same direction anymore
2011-04-06 avoided some ambiguous function calls
Jonathan@Jonathan-PC.fritz.box [Wed, 06 Apr 2011 11:51:23 +0200] rev 5112
avoided some ambiguous function calls
2011-04-05 merge
koda [Wed, 06 Apr 2011 00:30:02 +0200] rev 5111
merge
2011-04-05 set cLocale even for en
nemo [Tue, 05 Apr 2011 16:27:58 -0400] rev 5110
set cLocale even for en
2011-04-05 strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
koda [Wed, 06 Apr 2011 00:29:49 +0200] rev 5109
strangely enough, the new sdl rotation code is incompatible with our system... this is a workaround that should hold up until their code becomes more stable
2011-04-05 Fixing issue 211. Check to see if m_currPath is NULL before doing anything in mouseReleaseEvent. Multiple mouse release events can occur after a mouse press and before the next mouse press if you mouse-click really fast.
Zorg <zorgiepoo@gmail.com> [Tue, 05 Apr 2011 16:15:20 -0400] rev 5108
Fixing issue #211. Check to see if m_currPath is NULL before doing anything in mouseReleaseEvent. Multiple mouse release events can occur after a mouse press and before the next mouse press if you mouse-click really fast.
2011-04-05 Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
nemo [Tue, 05 Apr 2011 16:23:52 -0400] rev 5107
Allow override of voicepack with a locale voicepack. Untested, but should mean that a Default voice should use the Ukranian version if that is their locale.
2011-04-05 wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
koda [Tue, 05 Apr 2011 22:21:02 +0200] rev 5106
wow we're getting famous http://hg.libsdl.org/SDL/rev/8a04b596b472
2011-04-05 Testing a merge.
Zorg <zorgiepoo@gmail.com> [Tue, 05 Apr 2011 16:05:41 -0400] rev 5105
Testing a merge.
2011-04-05 Digital-Theme, converted+fixed as requested by koda, sorry I had no choice. He would had been all "couch" again if I hadn't done this for him :(
sheepluva [Tue, 05 Apr 2011 20:28:44 +0200] rev 5104
Digital-Theme, converted+fixed as requested by koda, sorry I had no choice. He would had been all "couch" again if I hadn't done this for him :( XD
2011-04-05 fix windows compilation
koda [Tue, 05 Apr 2011 17:10:48 +0200] rev 5103
fix windows compilation
2011-04-05 oops. forgot the parent cmakelist
nemo [Tue, 05 Apr 2011 11:00:18 -0400] rev 5102
oops. forgot the parent cmakelist
2011-04-05 Ukranian localisation of a voicepack. Still to be decided, if this should localised, and played as Default if a user is using the ukranian locale.
igorko [Tue, 05 Apr 2011 10:59:23 -0400] rev 5101
Ukranian localisation of a voicepack. Still to be decided, if this should localised, and played as Default if a user is using the ukranian locale.
2011-04-04 you can use esc to exit chat when input is empty
koda [Mon, 04 Apr 2011 16:27:27 +0200] rev 5100
you can use esc to exit chat when input is empty
2011-04-04 enable keyrepeat while chatting so you can keep backspace pressed to delete a line (fix issue 111)
koda [Mon, 04 Apr 2011 12:53:11 +0200] rev 5099
enable keyrepeat while chatting so you can keep backspace pressed to delete a line (fix issue #111)
2011-04-03 Allow to rename room
unc0rr [Sun, 03 Apr 2011 20:07:05 +0400] rev 5098
Allow to rename room
2011-04-03 dammit, merge
unc0rr [Sun, 03 Apr 2011 19:27:48 +0400] rev 5097
dammit, merge
2011-04-03 small tweak for bundle creation
koda [Sun, 03 Apr 2011 16:46:20 +0200] rev 5096
small tweak for bundle creation
2011-04-03 fix autorelease pools not being set (issue 209) and format code a little
koda [Sun, 03 Apr 2011 16:34:12 +0200] rev 5095
fix autorelease pools not being set (issue #209) and format code a little
2011-04-03 - Update .pro file
unc0rr [Sun, 03 Apr 2011 19:26:53 +0400] rev 5094
- Update .pro file - Add a label in chat widget with a number of nicks listed
2011-04-03 Some polishing
unc0rr [Sun, 03 Apr 2011 16:31:48 +0400] rev 5093
Some polishing
2011-04-03 Fix crash when old room admin becomes new room admin
unc0rr [Sun, 03 Apr 2011 16:31:40 +0400] rev 5092
Fix crash when old room admin becomes new room admin
2011-04-03 Show only logged-in clients quit messages
unc0rr [Sun, 03 Apr 2011 13:34:04 +0400] rev 5091
Show only logged-in clients quit messages
2011-04-03 Use readInt_
unc0rr [Sun, 03 Apr 2011 13:31:33 +0400] rev 5090
Use readInt_
2011-04-03 This better matches lua headers
nemo [Sat, 02 Apr 2011 22:17:08 -0400] rev 5089
This better matches lua headers
2011-04-03 use PtrInt to match lua's use of ptrdiff. Needs testing.
nemo [Sat, 02 Apr 2011 20:33:06 -0400] rev 5088
use PtrInt to match lua's use of ptrdiff. Needs testing.
2011-04-02 cmd+m should minimize the app as per apple human guidelines
koda [Sat, 02 Apr 2011 20:57:40 +0200] rev 5087
cmd+m should minimize the app as per apple human guidelines
2011-04-02 STM not needed too
unc0rr [Sat, 02 Apr 2011 21:20:18 +0400] rev 5086
STM not needed too
2011-04-05 Reverting..
Zorg <zorgiepoo@gmail.com> [Tue, 05 Apr 2011 16:02:26 -0400] rev 5085
Reverting..
2011-04-02 merge -- this time i tested
koda [Sat, 02 Apr 2011 18:55:46 +0200] rev 5084
merge -- this time i tested
2011-04-03 Fixed messages complaining about no autorelease pool being set up with objects leaking on the Mac. I simply initialized an autorelease pool in the couple of places that needed it.
Zorg <zorgiepoo@gmail.com> [Sun, 03 Apr 2011 00:13:38 -0400] rev 5083
Fixed messages complaining about no autorelease pool being set up with objects leaking on the Mac. I simply initialized an autorelease pool in the couple of places that needed it.
2011-04-02 Forgot to add this too..
Zorg <zorgiepoo@gmail.com> [Sat, 02 Apr 2011 12:52:19 -0400] rev 5082
Forgot to add this too..
2011-04-02 merge from zorg's clone
koda [Sat, 02 Apr 2011 18:31:58 +0200] rev 5081
merge from zorg's clone
2011-04-02 I forgot to add this file.
Zorg <zorgiepoo@gmail.com> [Sat, 02 Apr 2011 12:50:07 -0400] rev 5080
I forgot to add this file.
2011-04-02 merge
unc0rr [Sat, 02 Apr 2011 20:01:40 +0400] rev 5079
merge
2011-04-02 Removing pages.cpp and splitting it up into various files.
Zorg <zorgiepoo@gmail.com> [Sat, 02 Apr 2011 02:34:54 -0400] rev 5078
Removing pages.cpp and splitting it up into various files.
2011-04-02 Some fixes. Can't reproduce ghosts now.
unc0rr [Sat, 02 Apr 2011 20:01:20 +0400] rev 5077
Some fixes. Can't reproduce ghosts now.
2011-04-01 workaround. disable drawing shot after passing through portal. proper fix would need to use the portal position
nemo [Fri, 01 Apr 2011 16:22:49 -0400] rev 5076
workaround. disable drawing shot after passing through portal. proper fix would need to use the portal position
2011-03-30 not useful for visual gears, and apparently not helpful for consistency
nemo [Tue, 29 Mar 2011 20:10:56 -0400] rev 5075
not useful for visual gears, and apparently not helpful for consistency
2011-03-29 eh. 1,000,000 might be better...
nemo [Tue, 29 Mar 2011 18:06:39 -0400] rev 5074
eh. 1,000,000 might be better...
2011-03-29 oops. vg dX/dY - just for consistency
nemo [Tue, 29 Mar 2011 17:57:04 -0400] rev 5073
oops. vg dX/dY - just for consistency
2011-03-29 dX/dY will return int * 100,000
nemo [Tue, 29 Mar 2011 17:52:04 -0400] rev 5072
dX/dY will return int * 100,000
2011-03-29 Adding a hat test page to version control. Also kind of a test to see if it will be served with the right content type by google code
nemo [Tue, 29 Mar 2011 16:47:54 -0400] rev 5071
Adding a hat test page to version control. Also kind of a test to see if it will be served with the right content type by google code
2011-03-29 clipping fix for spidey
sheepluva [Tue, 29 Mar 2011 22:36:36 +0200] rev 5070
clipping fix for spidey
2011-03-29 fix clipping fails on 2 hats
sheepluva [Tue, 29 Mar 2011 22:05:18 +0200] rev 5069
fix clipping fails on 2 hats
2011-03-29 fix Jason hat animation and pngcrushed it and previously fixed/changed hats
sheepluva [Tue, 29 Mar 2011 21:42:40 +0200] rev 5068
fix Jason hat animation and pngcrushed it and previously fixed/changed hats
2011-03-29 fix for Issue 207: To far left for Napalm (and other weapons)
sheepluva [Tue, 29 Mar 2011 21:10:35 +0200] rev 5067
fix for issue #207: To far left for Napalm (and other weapons)
2011-03-29 fix leaking of hand-drawn maps
sheepluva [Tue, 29 Mar 2011 16:24:55 +0200] rev 5066
fix leaking of hand-drawn maps
2011-03-29 mikade really likes the snow dust
nemo [Mon, 28 Mar 2011 20:13:03 -0400] rev 5065
mikade really likes the snow dust
2011-03-28 merge
unc0rr [Mon, 28 Mar 2011 21:44:39 +0400] rev 5064
merge
2011-03-28 - Use LastDamage in CheckHHDamage
unc0rr [Mon, 28 Mar 2011 21:44:17 +0400] rev 5063
- Use LastDamage in CheckHHDamage - Clear hedgehog's LastDamage when switching to him
2011-03-28 Colin Rice
unc0rr [Mon, 28 Mar 2011 21:27:06 +0400] rev 5062
Colin Rice *Give correct credit for damage
2011-03-28 don't disable the light-bulb button when less than 3 teams
claymore [Mon, 28 Mar 2011 19:31:47 +0200] rev 5061
don't disable the light-bulb button when less than 3 teams
2011-03-28 Hide last two octets of IP address from usual users
unc0rr [Mon, 28 Mar 2011 20:31:01 +0400] rev 5060
Hide last two octets of IP address from usual users
2011-03-28 More creation of sender thread to the reciever thread
unc0rr [Mon, 28 Mar 2011 20:30:15 +0400] rev 5059
More creation of sender thread to the reciever thread
2011-03-28 Some improvements in test programs
unc0rr [Mon, 28 Mar 2011 20:28:59 +0400] rev 5058
Some improvements in test programs
2011-03-28 Beach-Theme: reduce visible square height for sand castle
sheepluva [Mon, 28 Mar 2011 16:30:44 +0200] rev 5057
Beach-Theme: reduce visible square height for sand castle
2011-03-28 Beach-Theme: fix+crop horizon and sky
sheepluva [Mon, 28 Mar 2011 16:24:42 +0200] rev 5056
Beach-Theme: fix+crop horizon and sky
2011-03-28 Beach-Theme: theme.cfg conversion+fix
sheepluva [Mon, 28 Mar 2011 16:07:27 +0200] rev 5055
Beach-Theme: theme.cfg conversion+fix
2011-03-28 Beach Theme (as for .15)
Miguelac [Mon, 28 Mar 2011 15:08:10 +0200] rev 5054
Beach Theme (as for .15)
2011-03-27 this should help people hacking the cmake files
koda [Sun, 27 Mar 2011 01:53:59 +0100] rev 5053
this should help people hacking the cmake files (removes old comments, BUNDLE and other macros, updates to INSTALL file)
2011-03-26 fix a couple of loose ends
koda [Sat, 26 Mar 2011 22:49:38 +0100] rev 5052
fix a couple of loose ends
2011-03-26 merge and remove QDebug
nemo [Fri, 25 Mar 2011 20:02:27 -0400] rev 5051
merge and remove QDebug
2011-03-25 unbreak SDL 1.2 build. Koda needs to look at this
nemo [Fri, 25 Mar 2011 19:42:00 -0400] rev 5050
unbreak SDL 1.2 build. Koda needs to look at this
2011-03-25 Delay portal gun a bit, reduce mudball
nemo [Fri, 25 Mar 2011 19:25:50 -0400] rev 5049
Delay portal gun a bit, reduce mudball
(0) -3000 -1000 -240 +240 +1000 +3000 +10000 tip