Marc Zinnschlag
|
d205d5f0af
|
Merge branch 'cellselect'
|
2014-04-08 09:58:00 +02:00 |
|
Marc Zinnschlag
|
e0550ba336
|
allow multiple cell coordinates in c-type hint for scene subviews
|
2014-04-07 15:23:14 +02:00 |
|
Marc Zinnschlag
|
0d352cb883
|
replaced rectangular cell selection with a CellSelection object
|
2014-04-07 14:16:02 +02:00 |
|
Marc Zinnschlag
|
67965ec10c
|
added CellCoordinates and CellSelection classes
|
2014-04-07 13:44:43 +02:00 |
|
Marc Zinnschlag
|
324b2743d4
|
removed grid button (discarding the first attempt at a cell selector)
|
2014-04-07 10:21:26 +02:00 |
|
Marc Zinnschlag
|
03b3487f1b
|
minor cleanup
|
2014-04-07 09:56:36 +02:00 |
|
Marc Zinnschlag
|
fafb7501e3
|
Merge remote-tracking branch 'cc9cii/PathFinder-split'
|
2014-04-07 09:48:15 +02:00 |
|
Emanuel Guevel
|
ce7aa96371
|
Fix visual glitch happening when closing inventory while sneaking
(bug #1255)
|
2014-04-06 22:21:28 +02:00 |
|
Marc Zinnschlag
|
c7f2cfeca0
|
Merge remote-tracking branch 'gus/AIFix2'
|
2014-04-06 15:13:30 +02:00 |
|
Jeffrey Haines
|
a274b48f2f
|
States are saved. Crime is reacted to.
Issues where some crime is ignored. Needs a lot more work
|
2014-04-05 22:45:40 -04:00 |
|
Jeffrey Haines
|
940c88d2ec
|
Cleaned up code, implemented crime ids
There is a problem with my game freezing. ToggleAi stops my character
|
2014-04-05 10:26:14 -04:00 |
|
Marc Zinnschlag
|
0fe67b586a
|
increased scene toolbar button size
|
2014-04-05 13:16:13 +02:00 |
|
Jeffrey Haines
|
df5cbe5dec
|
Minor changes
|
2014-04-04 08:10:35 -04:00 |
|
cc9cii
|
28f7c42fb7
|
One more comment fix.
|
2014-04-04 18:17:42 +11:00 |
|
cc9cii
|
f59226265a
|
Remove redundant parameter from aStarSearch. Also update some comments.
|
2014-04-04 18:10:06 +11:00 |
|
Jeffrey Haines
|
70919ba60a
|
Removed witnesses and minor changes
|
2014-04-03 16:13:14 -04:00 |
|
cc9cii
|
5cf8e7e933
|
Remove logging.
|
2014-04-04 06:16:26 +11:00 |
|
cc9cii
|
040d4f8fc4
|
Move PathgridGraph into separate files.
|
2014-04-04 06:13:47 +11:00 |
|
Jeffrey Haines
|
0c957a3cde
|
Added witnesses to the mix
|
2014-04-03 14:53:31 -04:00 |
|
Marc Zinnschlag
|
baf30ba292
|
added grid tool (does not work yet)
|
2014-04-03 14:44:48 +02:00 |
|
cc9cii
|
a8b2eb1fe9
|
Make Travis happy.
|
2014-04-03 22:49:22 +11:00 |
|
Marc Zinnschlag
|
3a58da9ad7
|
size adjustment
|
2014-04-03 13:30:22 +02:00 |
|
cc9cii
|
325d0616bb
|
Cleanup debug statements.
|
2014-04-03 22:17:45 +11:00 |
|
Marc Zinnschlag
|
5d422fec8a
|
fixed scene toolbar layout problems
|
2014-04-03 13:00:19 +02:00 |
|
cc9cii
|
98f77714ce
|
Per-cell pathgrid data and calculation moved off PathFinder. Now the edge cost calculations and strongly connected component searches are done only once per cell. Per-actor data and methods still remain with PathFinder.
This version still has debugging statements and needs cleaning up.
|
2014-04-03 21:43:44 +11:00 |
|
Jeffrey Haines
|
b1abef7a38
|
Cleaned up code
|
2014-04-03 01:07:56 -04:00 |
|
Jeffrey Haines
|
58b135a2be
|
Crime is now checked every frame call
|
2014-04-03 00:50:09 -04:00 |
|
cc9cii
|
f597d3e88b
|
Use duration rather than frame counts. Stops false detection of being "stuck" with high frame rates (e.g. indoors).
|
2014-04-03 07:46:26 +11:00 |
|
Jeffrey Haines
|
510f2d10ac
|
Replaces broken code with todo
|
2014-04-02 14:20:33 -04:00 |
|
Jeffrey Haines
|
6f1211dd8d
|
Moved mWitnesses into Player. resetCrime for paying fine.
|
2014-04-02 12:23:38 -04:00 |
|
Jeffrey Haines
|
7c0b51fb7e
|
Ai pursue now controls guards pursuit of crimes
Should extend AiActivate in the future
|
2014-04-02 00:18:22 -04:00 |
|
Jeffrey Haines
|
50dac98a2b
|
Feature 1154 & 73: Crime and NPC reactions
|
2014-04-01 20:24:25 -04:00 |
|
Jeffrey Haines
|
4037f3705e
|
Feature 1154 & 73: NPCs react to crime
|
2014-04-01 14:15:55 -04:00 |
|
Marc Zinnschlag
|
c9f9566623
|
Merge remote-tracking branch 'origin/master'
|
2014-04-01 18:45:25 +02:00 |
|
Marc Zinnschlag
|
6ee998ac38
|
updated credits file
|
2014-04-01 18:44:55 +02:00 |
|
scrawl
|
78d322e6a5
|
Revert "Temporary added broken CMakeLists.txt - Travis IRC notification test."
This reverts commit 529d2436b5 .
|
2014-04-01 11:44:27 +02:00 |
|
Marc Zinnschlag
|
5b5069535e
|
keep track of active cells in PagedWorldspaceWidget and update SubView title accordingly
|
2014-04-01 10:04:14 +02:00 |
|
Lukasz Gromanowski
|
529d2436b5
|
Temporary added broken CMakeLists.txt - Travis IRC notification test.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-03-31 22:14:12 +02:00 |
|
Lukasz Gromanowski
|
db4975dab8
|
Changed IRC notifications for Travis CI from normal messages to IRC notices.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
|
2014-03-31 21:52:20 +02:00 |
|
Marc Zinnschlag
|
12e46c5dc7
|
Merge remote-tracking branch 'megaton/master'
|
2014-03-31 10:24:12 +02:00 |
|
Marc Zinnschlag
|
4ee1069baa
|
Merge remote-tracking branch 'scrawl/master'
|
2014-03-31 10:11:54 +02:00 |
|
scrawl
|
f5810b8e1c
|
Consider aspect ratio for loading screen background
More consistent with the main menu.
|
2014-03-30 23:07:49 +02:00 |
|
scrawl
|
1265131203
|
Set the selected index after all items are added (workaround for MyGUI bug)
|
2014-03-30 20:07:43 +02:00 |
|
megaton
|
50af9bc0d3
|
General perfomance optimizations.
|
2014-03-30 19:45:27 +04:00 |
|
cc9cii
|
d04bb3befb
|
MSVC uses C version of locale.
|
2014-03-30 17:23:22 +11:00 |
|
Jeffrey Haines
|
8ce938c6f1
|
Revert 6b28c06..98fd381
This rolls back to commit 6b28c06b2c .
|
2014-03-29 22:26:53 -04:00 |
|
Jeffrey Haines
|
98fd381564
|
Feature #1154 Not all NPCs get aggressive when one is attacked
Compiling fix
|
2014-03-29 21:25:20 -04:00 |
|
Jeffrey Haines
|
6c866deb1b
|
Feature #1154 Not all NPCs get aggressive when one is attacked
Partially implemented
|
2014-03-29 21:23:34 -04:00 |
|
scrawl
|
5eeed03f5b
|
Only exchange bribe gold if the bribe was accepted
|
2014-03-30 00:12:31 +01:00 |
|
scrawl
|
72df9e77c6
|
Don't show version text in the pause menu
|
2014-03-30 00:07:32 +01:00 |
|