scrawl
d2fbb11475
temp commit
2012-07-13 11:26:36 +02:00
Marc Zinnschlag
29b4a5e5f7
Issue #314 : added apply actions
2012-07-13 09:41:38 +02:00
Marc Zinnschlag
84d846cf07
Issue #314 : implemented apply and skillUsageSucceeded functions for MWClass::Npc
2012-07-13 09:16:27 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
Marc Zinnschlag
805b81bf6e
Issue #314 : added skillUsageSucceeded function to Class
2012-07-13 09:03:17 +02:00
Marc Zinnschlag
7a2d613043
Issue #314 : extended Class::apply function to cover the actor
2012-07-13 08:50:46 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
Chris Robinson
ecdd4ee23f
Load NiMorphData and NiKeyframeData using proper key lists
2012-07-12 20:56:47 -07:00
Chris Robinson
386ac56bda
Remove the NIF loader and code to manually transform the vertices
...
This currently breaks just about everything. They should come back as it's all
reimplemented, though.
2012-07-12 20:12:18 -07:00
scrawl
ad7383be43
sky
2012-07-11 09:08:55 +02:00
scrawl
e0a99f104b
settings tab "shadows"
2012-07-11 04:28:45 +02:00
scrawl
485adc8bdc
shader mode button in settingswindow
2012-07-11 03:19:51 +02:00
scrawl
865bfc6f47
sync mrt_output setting
2012-07-11 02:31:03 +02:00
Marc Zinnschlag
ec9ebe6b58
Merge branch 'skillgain' into potions
...
Conflicts:
apps/openmw/mwmechanics/activespells.cpp
2012-07-10 14:08:30 +02:00
Marc Zinnschlag
f11bf49a90
cmake fix; silenced some warnings
2012-07-10 13:23:41 +02:00
gugus
164a5c8fe4
rotation now also work with the physic representation
2012-07-10 12:10:50 +02:00
gugus
70c74ede05
changed rotation order
2012-07-10 11:53:12 +02:00
gugus
410b693555
setAngle improvement
2012-07-10 11:15:46 +02:00
scrawl
3537af051d
removed the old shader helper
2012-07-10 00:17:52 +02:00
scrawl
5d1e6b6bf6
remove cg profile check
2012-07-10 00:09:47 +02:00
scrawl
1a9f59d5d4
shadows
2012-07-10 00:07:33 +02:00
Marc Zinnschlag
0d8150f4bd
Issue #324 : added useSkill function to NpcStats (adjust skill level according to use)
2012-07-09 21:15:52 +02:00
Marc Zinnschlag
a207c86fd1
Issue #324 : added some range checks
2012-07-09 21:14:11 +02:00
Marc Zinnschlag
67c1c5ce18
Issue #324 : adjusted setSkill script instructions according to the recent research
2012-07-09 20:42:45 +02:00
Marc Zinnschlag
25a5657d80
Issue #324 : Modified the interface for modified stats
2012-07-09 20:34:12 +02:00
scrawl
07fd9986ef
accidently removed the map.
2012-07-09 20:14:07 +02:00
scrawl
b803d0e949
converted shadow caster shader
2012-07-09 19:46:36 +02:00
gugus
557e114992
clean-up + getScale/Angle script instructions
2012-07-09 19:28:44 +02:00
scrawl
81d30ff63a
temp commit
2012-07-09 19:20:41 +02:00
gugus
0a67f60a6e
Clean-up
2012-07-09 18:47:59 +02:00
gugus
e6716c25c3
little correction.
2012-07-09 15:41:19 +02:00
gugus
feec67094f
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwworld/physicssystem.cpp
2012-07-09 15:23:26 +02:00
gugus
03f7740474
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/worldimp.hpp
2012-07-09 10:39:57 +02:00
Jason Hooks
b5edad790d
merge
2012-07-07 15:27:04 -04:00
Marc Zinnschlag
fe86ce5a2c
DrawState workaround
2012-07-07 20:53:19 +02:00
Marc Zinnschlag
6277e39216
Merge branch 'master' into skillgain
2012-07-07 20:27:56 +02:00
Alexander "Ace" Olofsson
113457d934
Fixed some windows issues and got rid of a few tiny warnings while at it.
2012-07-07 01:14:18 +02:00
Marc Zinnschlag
0f41cc499d
Issue #324 : Added skill gain calculation function
2012-07-06 21:07:04 +02:00
Marc Zinnschlag
10723a149b
Issue #324 : Change a forward declartion to avoid potential problems with pesky MSVC
2012-07-06 18:25:16 +02:00
Marc Zinnschlag
d30ba14a17
Issue #324 : Finished turning NpcStats into a proper class
2012-07-06 18:23:48 +02:00
Marc Zinnschlag
771863e73b
Issue #324 : Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
2012-07-06 15:50:26 +02:00
scrawl
a095572205
fixed some textures, started with sky
2012-07-06 10:31:48 +02:00
scrawl
33c48b9481
update
2012-07-06 04:28:08 +02:00
scrawl
1a5203749f
fix "error in framelistener" when trying to pick up lights that can't be picked up
2012-07-05 17:13:23 +02:00
scrawl
4ea6530772
hello world.
2012-07-04 00:26:57 +02:00
scrawl
a1e48b0feb
builds now
2012-07-03 22:48:16 +02:00
scrawl
78efc31641
different default coordinates for container window to prevent it from going invsible when changing resolution (bug #308 ), fixed some windows not centering when resolution change
2012-07-03 16:51:29 +02:00
scrawl
085891879c
fixed another resolution change bug introduced recently
2012-07-03 16:44:20 +02:00
Marc Zinnschlag
205ed0ce5b
post merge fix
2012-07-03 15:53:42 +02:00
Marc Zinnschlag
cc7c6aa0ad
Merge branch 'decouple'
2012-07-03 15:47:57 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e
Issue #107 : Ptr related include cleanup
2012-07-03 13:55:53 +02:00
Marc Zinnschlag
5a7b95bf7a
Issue #107 : cleaned up includes in apps/openmw/mwworld/class.hpp
2012-07-03 13:15:20 +02:00
Marc Zinnschlag
4c39fefd1e
Issue #107 : World is accessed only through the interface class from now on; some include cleanup
2012-07-03 12:30:50 +02:00
scrawl
d27863bf8e
rename layout files to .layout to get them recognized by layout editor
2012-07-03 11:34:20 +02:00
Marc Zinnschlag
035c1c4b6e
added World interface class; cleanup of World interface
2012-07-03 01:06:38 +02:00
Marc Zinnschlag
efb95e2f83
Issue #317 : check if spell actually exist in AddSpell
2012-07-02 14:25:46 +02:00
Marc Zinnschlag
7fcd41c69d
Issue #107 : Detemplateised CellStore; some include cleanup
2012-06-29 18:54:23 +02:00
Marc Zinnschlag
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
2012-06-29 16:48:50 +02:00
Marc Zinnschlag
70ac1c818d
Merge remote branch 'scrawl/settingswindow'
2012-06-27 09:02:29 +02:00
scrawl
232fe0be8c
fix for the directx crash
2012-06-26 18:03:52 +02:00
scrawl
30e86e1b9d
settings window resolution sorting, aspect ratio
2012-06-26 15:41:13 +02:00
Marc Zinnschlag
83c3972a89
Issue #314 : added return value to addSpell function
2012-06-24 16:23:43 +02:00
Marc Zinnschlag
aa827442e8
Issue #314 : Generalised ActiveSpells class so that it can handle lasting effects from potions too
2012-06-24 11:39:21 +02:00
scrawl
797c2c538d
fix some settings bugs
2012-06-23 12:25:28 +02:00
Marc Zinnschlag
2b68e4d489
Merge remote branch 'scrawl/trianglebatchcount'
2012-06-22 14:30:00 +02:00
scrawl
63ce143a04
fix triangle / batch counts with compositors
2012-06-22 12:56:04 +02:00
scrawl
98f13ebcc0
Merge branch 'misc' of github.com:scrawl/openmw into misc
2012-06-21 12:15:43 +02:00
Marc Zinnschlag
ad251065f4
removed more cout spam
2012-06-21 12:00:56 +02:00
Marc Zinnschlag
89ac0fa232
Issue #312 : Implemented ID-search caching to speed up some badly written scripts
2012-06-21 11:43:18 +02:00
Jason Hooks
5c51674070
update
2012-06-20 13:14:27 -04:00
Jason Hooks
86d8a07fc7
Switching back to old scaling
2012-06-19 13:28:06 -04:00
Marc Zinnschlag
1f0efa9f7d
Merge remote branch 'scrawl/guifixes'
2012-06-19 19:06:18 +02:00
scrawl
15e959868c
make some of the gui mode changes a bit safer
2012-06-19 17:07:00 +02:00
Marc Zinnschlag
590dfe8d63
fixed the container fill problem on cell load
2012-06-19 16:42:10 +02:00
scrawl
ff278ab4ec
chargen generate class: fix result not being shown in review dialog
2012-06-19 15:25:04 +02:00
scrawl
0aa01b93e2
don't put blue color on actions that are in the topic list, but are not topics (e.g. Barter)
2012-06-19 15:24:52 +02:00
Marc Zinnschlag
9a6f012578
Merge branch 'script'
2012-06-19 11:07:47 +02:00
Jason Hooks
4d55ecfdbe
Deleting scaled shapes; scaleObject()
2012-06-18 13:03:00 -04:00
Marc Zinnschlag
09057daac5
Merge remote branch 'scrawl/containerunlocking'
2012-06-18 09:57:22 +02:00
Jason Hooks
33fe80723c
btScaledBvhTriangleMeshShapes
2012-06-17 20:56:10 -04:00
scrawl
de3daf3dc1
allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind
2012-06-18 00:21:55 +02:00
Marc Zinnschlag
3c42a71dae
removed some cout spam
2012-06-16 16:42:35 +02:00
Marc Zinnschlag
e2a77037eb
fixed a type in a script instruction
2012-06-16 16:38:54 +02:00
Marc Zinnschlag
8283f5f135
added setHello/Fight/Flee/Alarm instructions
2012-06-16 16:31:32 +02:00
Marc Zinnschlag
ea29b74bb4
added per NPC/creature basic AI-settings (hello, fight, flee, alarm)
2012-06-16 16:17:42 +02:00
Marc Zinnschlag
7454713a9b
addet provisional implementation of AiWander (doesn't do anything yet)
2012-06-16 16:06:15 +02:00
Marc Zinnschlag
b16157a618
documentation fix
2012-06-16 15:49:39 +02:00
Marc Zinnschlag
3167ae9473
added force/clearforce instructions for run and sneak
2012-06-16 15:49:03 +02:00
Marc Zinnschlag
0795730a19
Merge branch 'xdoty' into script
2012-06-16 14:57:13 +02:00
Marc Zinnschlag
10b27e582b
Issue #181 : various fixed to member variable access
2012-06-16 13:51:13 +02:00
Marc Zinnschlag
6c5b21fa42
Issue #181 : Member variable access in expressions; error reporting fix for the previous commit
2012-06-16 13:06:23 +02:00
Marc Zinnschlag
6a89d76321
Issue #181 : Improved script error reporting for local and global scripts
2012-06-16 11:52:35 +02:00
gugus
5397b9dba6
Merge branch 'physicsaedra3' of https://github.com/jhooks1/openmw.git into objectRotationScaling
2012-06-16 11:38:07 +02:00
gugus
974585d357
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
2012-06-15 14:53:58 +02:00
gugus
01fefca0a3
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-06-15 14:53:19 +02:00
scrawl
584ae30213
don't show diseases and curses in the spell list
2012-06-15 10:09:46 +02:00
Marc Zinnschlag
0f71439991
Merge remote branch 'garvek/master'
2012-06-15 08:22:56 +02:00
Jason Hooks
897a331244
NPC activation
2012-06-13 12:21:51 -04:00
Jason Hooks
20288de685
Post merge
2012-06-11 15:39:57 -04:00
Jason Hooks
b14c132a31
Merging in the latest master
2012-06-11 13:25:06 -04:00
Jason Hooks
595b0729da
Few things changed
2012-06-10 21:08:58 -04:00
Mark Siewert
bef4bef5d2
- Add support for loading multiple esm/esp files. Selection in omwlauncher is recognized and applied.
...
- Quick hack for multiple terrain palettes. Prevents crashes and/or wrong textures in masters/plugins beyond the first.
- Support deleting parent entries from the list.
2012-06-10 11:14:46 +02:00
Jason Hooks
fb0a52809d
Changing transformation processing
2012-06-09 15:19:15 -04:00
scrawl
447158e9d6
shutdown crash fix
2012-06-09 19:15:11 +02:00
Sylvain THESNIERES
fc3a3fc173
MSVC build compliance:
...
- static const float member is not ISO
- callback do not match DLL signature
2012-06-08 19:55:39 +02:00
Marc Zinnschlag
eb0be10e80
Merge branch 'script' into xdoty
2012-06-07 13:00:01 +02:00
Marc Zinnschlag
ff84fbbfa7
Added DontSaveObject script instruction
...
We are ignoring it for now and unless users protest we will probably keep it that way.
2012-06-07 12:36:51 +02:00
Marc Zinnschlag
72fca40090
Issue #181 : member variable access in interpreter context
2012-06-07 11:59:45 +02:00
scrawl
42e44ac1b5
fixed some leaks
2012-06-06 21:08:20 +02:00
scrawl
c85c794c86
fixed some cppcheck issues
2012-06-06 20:29:30 +02:00
scrawl
dfac5f26c3
fixed some issues:
...
- probes were not showing up in inventory category "misc"
- lights, probes, lockpicks were not equippable
- weapons could not be picked up
2012-06-04 21:48:20 +02:00
scrawl
ea8e3ca1c8
fix item duplication bug when picking up object with the mouse and immediately dropping again
2012-06-04 21:09:51 +02:00
scrawl
1ecc6f97ed
alchemy effect fix
2012-06-04 20:56:13 +02:00
scrawl
d56defd4f4
set input focus to console after selecting objects in console mode
2012-06-03 21:19:48 +02:00
scrawl
8e96871acd
remove something unused
2012-06-03 18:40:10 +02:00
gugus
0012d7eb58
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
2012-06-03 12:53:23 +02:00
scrawl
b8464d4ce5
allow picking up objects from the gameworld with the mouse in inventory mode
2012-06-02 14:19:02 +02:00
scrawl
b886aea298
change console skin to MW_Window and set the selected object refID as window title
2012-06-02 12:31:23 +02:00
scrawl
0ba0b2122e
set the implicit object for script excution by clicking on it
2012-06-02 12:25:24 +02:00
scrawl
36d26e0681
set the camera orientation after using teleport doors
2012-05-30 15:52:39 +02:00
Marc Zinnschlag
2bbbff2b75
Merge remote branch 'scrawl/spellwindow'
2012-05-30 10:22:56 +02:00
scrawl
2c90654401
fix a typo that caused a crash when trying to disable an already disabled object
2012-05-30 09:21:41 +02:00
scrawl
72bb7a2d2c
fix a typo
2012-05-30 08:04:07 +02:00
Jason Hooks
fb4e7f02b9
code correction
2012-05-29 22:03:00 -04:00
scrawl
c5a685d11f
addition to last commit: show the selected weapon/spell names as inventory/spell window caption
2012-05-29 18:59:11 +02:00
scrawl
298ae4f7f8
HUD icons for selected weapon / selected spell / selected enchanted item
2012-05-29 18:33:01 +02:00
gugus
a711a3ebe1
Various fixes
2012-05-29 16:45:43 +02:00
gugus
f83ffecae5
SetAngle and SetScale script instruction
2012-05-29 15:57:13 +02:00
scrawl
8b7baa808e
fixed the hud icon positioning issues
2012-05-29 15:36:48 +02:00
scrawl
48ba293e88
added the success formula, and spell deleting (shift+click)
2012-05-29 15:13:44 +02:00
scrawl
30461438f6
still left: spell success formula
2012-05-29 12:35:03 +02:00
scrawl
5412d6ed9e
fixed a typo that prevented spells from getting added
2012-05-29 10:47:48 +02:00
gugus
d8051095d6
rotation are updated in the physis system
2012-05-29 10:36:12 +02:00
gugus
26d6c9453c
more work on rotation
2012-05-29 10:15:29 +02:00
scrawl
c7268233df
spell window layout & opening/closing/pinning logic
2012-05-29 09:02:22 +02:00
scrawl
1b561ce91f
Merge branch 'master' into next
2012-05-29 06:56:23 +02:00
scrawl
69e6bc6588
add water settings to settings window
2012-05-29 06:45:44 +02:00
scrawl
5d03e86613
added field of view and texture filtering to settings window
2012-05-29 04:54:54 +02:00
scrawl
6945afe95b
alchemy window layout
2012-05-29 02:57:19 +02:00
scrawl
8c7cb6909d
addition to c7010623fb
: apparently talking _is_ allowed during the starting sequence, it is only disabled via scripts for certain actors
2012-05-29 01:59:16 +02:00
scrawl
f75266e4ba
fixed race dialog bug
2012-05-29 01:47:49 +02:00
gugus
77084b27c0
some work for rotation/scaling
2012-05-28 16:01:35 +02:00
scrawl
0a17d6d710
more resolution switching fixes
2012-05-28 12:34:29 +02:00
Marc Zinnschlag
76b23ae864
Merge remote branch 'scrawl/buildplayerfix'
2012-05-28 11:44:43 +02:00
scrawl
a54623bcd2
reset attributes when building player
2012-05-28 11:37:56 +02:00
scrawl
e1ee45a6d6
Issue #297 : Make the stats review dialog show correct values for attributes/skills/health/magicka/fatigue
2012-05-28 10:50:00 +02:00
scrawl
6014a90002
added tooltip delay option
2012-05-28 09:46:05 +02:00
scrawl
14f4f09f83
proper resolution switching (reposition GUI & adjust mouse clipping region)
2012-05-28 09:19:25 +02:00
scrawl
3daf1ebc3f
small map tweak
2012-05-28 05:03:50 +02:00
scrawl
19c428e86c
delete fix
2012-05-28 02:04:00 +02:00
scrawl
8f667580bb
ogre 1.8 final release compability fixes
2012-05-27 23:12:45 +02:00
scrawl
f6a6684685
when the resolution changes, adjust camera aspect ratio and recreate compositors
2012-05-27 21:39:18 +02:00
scrawl
10cfe0f5bc
Issue #295 : Class creation dialogs tooltips; plus tons of other improvements
2012-05-27 06:39:10 +02:00
scrawl
f1d3978897
Issue #290 : Auto-Close MW-reference related GUI windows
2012-05-27 01:14:33 +02:00
scrawl
a7e6a142f9
blend fog of war into adjacent cells
2012-05-27 00:39:33 +02:00
scrawl
63213b36bf
Show a label on the HUD with the cell name when it changes (visible for a few seconds) - like Morrowind
2012-05-26 23:06:15 +02:00
scrawl
313a8e55b7
- Issue #296 : Clicking on HUD elements shows/hides the respective window
...
- Slightly redesigned the map window and minimap, the player arrow now isn't cut off at cell borders anymore
2012-05-26 21:09:21 +02:00
scrawl
3cba884f59
Issue #294 : show/hide HUD elements based on allowed windows
2012-05-26 05:46:46 +02:00
scrawl
738e107b52
Merge branch 'master' into next
2012-05-26 05:31:32 +02:00
scrawl
c7010623fb
Issue #294 : disallowed inventory prevents Talk, Open and Take actions
2012-05-25 18:45:17 +02:00
gugus
51b6d5cae0
Scale *should* work. (no script instruction yet)
2012-05-25 18:23:06 +02:00
Marc Zinnschlag
173820d29b
Merge branch 'enable'
2012-05-25 18:19:12 +02:00
scrawl
750259973e
potion creating works, most of the values are bogus
2012-05-25 18:00:13 +02:00
Marc Zinnschlag
6fe53aa320
Issue #277 : containers in cells were not filled up on cell load when the cell was preloaded before
2012-05-25 17:55:00 +02:00
Marc Zinnschlag
0131c53005
Issue #176 : removed enable/disable functions from MWWorld::Class
2012-05-25 17:28:27 +02:00
Marc Zinnschlag
36885b2e40
Issue #176 : removed enable/disable functions from Creature, Npc and Light
2012-05-25 17:04:33 +02:00
scrawl
63b3b82657
don't allow more than 4 potion effects
2012-05-25 16:23:49 +02:00
scrawl
1df1b521a4
show the list of potion effects
2012-05-25 16:20:57 +02:00
scrawl
6eb15f7680
auto-select the alchemy tools with highest quality
2012-05-25 15:24:33 +02:00
scrawl
3ba24aee0d
Merge branch 'alchemy' into next
2012-05-25 13:37:40 +02:00
scrawl
9b623a79ff
Merge branch 'master' into alchemy
2012-05-25 13:14:27 +02:00
scrawl
09c870ad68
first alchemy window layout (not pretty)
2012-05-25 12:58:28 +02:00
scrawl
51b8a76a68
merged by branches together, starting with alchemy window
...
Merge branch 'guimode_stacking' into next
Conflicts:
apps/openmw/mwgui/mode.hpp
2012-05-24 15:57:23 +02:00
scrawl
c2b818373e
adjust tooltip skin, now is never transparent
2012-05-24 15:11:45 +02:00
scrawl
a3a22e9096
ingredient tooltip shows possible effects
2012-05-24 14:47:57 +02:00
Chris Robinson
05fd8f0211
Update the actual sounds and music volume when settings change
2012-05-24 05:30:22 -07:00
Marc Zinnschlag
684208dfc9
Issue #176 : when deleting objects, don't go through disable to remove actors from the mechanics manager
2012-05-24 13:26:07 +02:00
Marc Zinnschlag
c0ee382c72
Issue #176 : made actor deregistration more robust
2012-05-24 13:21:52 +02:00
scrawl
57d834b14b
fixed an issue with interactive messagebox
2012-05-24 12:05:43 +02:00
scrawl
6ea7bdb224
vsync & fps buttons, sound volume apply fix
2012-05-24 11:50:48 +02:00
scrawl
cbe89f7e32
copy&paste mistake
2012-05-24 08:56:45 +02:00
scrawl
189b044392
small correction
2012-05-24 04:37:41 +02:00
scrawl
9b94edd561
audio tab with volume sliders
2012-05-24 04:34:53 +02:00
scrawl
cb35f4d208
some unrelated gui cleanup
2012-05-24 03:50:02 +02:00
scrawl
a1907e7b88
cleaning up mwgui/widgets part 1
2012-05-24 03:48:02 +02:00
scrawl
7ebbc099b3
allow stacking gui modes
2012-05-23 12:23:35 +02:00
scrawl
689cf7ce05
ConfirmationDialog
2012-05-23 05:28:25 +02:00
Jason Hooks
0066ef9b54
Some cleanup
2012-05-22 21:40:24 -04:00
scrawl
656a8f1be9
working menu transparency slider
2012-05-23 01:32:36 +02:00
scrawl
313294c522
settings window (hotkey F2) which does nothing. Yay!
2012-05-22 21:40:42 +02:00
scrawl
343bbaf0fd
integrated video settings in the settings file, the launcher is now useless
2012-05-22 03:36:03 +02:00
Marc Zinnschlag
7938566004
Merge remote branch 'scrawl/graphics'
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-05-21 11:24:36 +02:00
Marc Zinnschlag
76d733d2b3
Merge remote branch 'scrawl/inventoryGUI'
2012-05-21 11:17:11 +02:00
gugus
dac98b2213
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into objectRotationScaling
2012-05-21 11:02:10 +02:00
scrawl
bda90b77bc
oops, forgot something
2012-05-21 10:59:06 +02:00
gugus
ca9224ed7f
starting scale function
2012-05-21 10:58:04 +02:00
scrawl
157dd81524
removed script instruction, will be in the settings window later
2012-05-21 10:57:49 +02:00
scrawl
5f6e8224f4
skill progress
2012-05-21 10:48:25 +02:00
Marc Zinnschlag
3e85151c9d
Merge remote branch 'scrawl/inventoryGUI'
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-05-21 10:13:27 +02:00
scrawl
8f2c8bbea4
Merge branch 'master' into graphics
2012-05-21 09:50:46 +02:00
scrawl
789dfe1c88
fix a bug with water reflection plane height
2012-05-21 09:50:02 +02:00
scrawl
40c52c5d09
max faction rank crashfix
2012-05-21 05:19:20 +02:00
scrawl
1079bb2677
finished tooltips for everything in the stats window, some gui refactoring
2012-05-21 05:14:07 +02:00
scrawl
76d71f86bc
fixed a faction case folding issue
2012-05-21 03:10:55 +02:00
scrawl
4a009fc2bb
faction tooltip (doesn't handle player having max. rank)
2012-05-21 02:58:06 +02:00
scrawl
8ce4727424
skill tooltips
2012-05-21 01:58:11 +02:00
scrawl
6518eb7794
some cleanup
2012-05-20 22:55:14 +02:00
scrawl
1c7110fbf5
birthsign tooltip
2012-05-20 22:45:30 +02:00
scrawl
8d52ee27dc
attribute tooltips now use a new system that allows complex tooltips to be defined entirely through layout files
2012-05-20 22:06:54 +02:00
Marc Zinnschlag
420cd53be0
Merge branch 'effects'
2012-05-19 17:41:47 +02:00
Marc Zinnschlag
be46f5a59c
various fixes
2012-05-19 17:39:24 +02:00
scrawl
876b369ca5
minor tooltip fix
2012-05-19 16:28:10 +02:00
scrawl
92d9e070fb
small tweak to getPlayerGold() method
2012-05-19 16:10:13 +02:00
scrawl
2a4c55f1ab
use Class::getInventoryStore instead of casting ContainerStore.
2012-05-19 16:04:34 +02:00
scrawl
4fb30544d4
more gui files cleanup
2012-05-19 16:00:00 +02:00
scrawl
7a4de0ed1d
changed more gui stuff to use the new tag system
2012-05-19 15:32:32 +02:00
Marc Zinnschlag
0dc412d44c
Merge remote branch 'scrawl/refid_case'
2012-05-19 15:07:12 +02:00
Marc Zinnschlag
9f1919a230
Issue #256 : added active spell management (completely untested)
2012-05-19 15:01:07 +02:00
scrawl
7ef0ad4e39
show faction & birthsign in the stats window
2012-05-19 14:55:09 +02:00
Marc Zinnschlag
635a89c35c
Issue #256 : RNG fix
2012-05-19 14:43:02 +02:00
scrawl
24ce88de2a
working mygui tag replacement system for GMST strings
2012-05-19 14:19:21 +02:00
scrawl
ee884634b9
fixed item refID handling in the dialogue manager and container script extensions.
2012-05-19 13:19:26 +02:00
Marc Zinnschlag
74ae3605e0
Issue #256 : added getTimeStamp function to World
2012-05-19 09:31:45 +02:00
scrawl
9ca579ba63
slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly
2012-05-19 00:36:01 +02:00
scrawl
1006411c02
small fix for mygui log being spammed with errors
2012-05-19 00:06:11 +02:00
scrawl
41466fc5fc
gold label fix, and don't allow selling gold
2012-05-18 23:00:31 +02:00
scrawl
656b08f620
removed the workaround for the ContainerStore bug.
2012-05-18 22:32:06 +02:00
scrawl
8a0c859c16
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
2012-05-18 22:27:48 +02:00
scrawl
f28f36f262
added sounds to trade window
2012-05-18 22:27:27 +02:00
Marc Zinnschlag
498530fad7
container iterator fix
2012-05-18 22:24:19 +02:00
scrawl
c30b9e4bb9
add/remove gold from the player at the end of the transaction.
2012-05-18 22:21:44 +02:00
scrawl
c004f5d570
adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications
2012-05-18 22:06:25 +02:00
Marc Zinnschlag
a4343bfa18
Issue #256 : added TimeStamp class
2012-05-18 22:04:22 +02:00
scrawl
db49e2c046
bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things
2012-05-18 20:53:24 +02:00
scrawl
fb47681fbd
fix a bug, some cleanup
2012-05-18 17:58:33 +02:00
scrawl
342a244e31
NPC now doesn't buy items of types that he shouldn't accept.
2012-05-18 17:36:20 +02:00
scrawl
50a8eb05d9
transfering items between player and merchant works and shows a red frame for bought/sold items.
2012-05-18 17:27:55 +02:00
scrawl
e2400ca7b2
only show items in the trade window that the NPC actually trades (services enum)
2012-05-18 15:51:33 +02:00
Marc Zinnschlag
124ea77612
Issue #256 : consider equipped items when calculating magic effects
2012-05-18 15:48:55 +02:00
Marc Zinnschlag
372efaafd7
Issue #256 : changed implementation of MagicEffects::operator+=
2012-05-18 15:27:41 +02:00
Marc Zinnschlag
40c58c1bb7
Issue #256 : fixed a capitalisation mistake
2012-05-18 15:26:08 +02:00
Marc Zinnschlag
5236bcb557
Issue #256 : added operator+= for MagicEffects
2012-05-18 15:12:11 +02:00
Marc Zinnschlag
79055e281d
Issue #256 : Force update after building the player character
2012-05-18 13:54:07 +02:00
Marc Zinnschlag
e1997b7f04
Issue #256 : added MagicEffects::add overload for EffectLists
2012-05-18 13:17:35 +02:00
scrawl
adf0550292
fixed a wrong label.
2012-05-18 00:14:31 +02:00
scrawl
52e5e14654
use GMST sDefaultCellname for the map window when cell has no region or name.
2012-05-17 23:42:09 +02:00
scrawl
3cacc8feec
add re-stocking items to containers (though restocking isn't implemented)
2012-05-17 23:22:41 +02:00
scrawl
9a3fd96a0c
display the merchant gold.
2012-05-17 22:24:47 +02:00
scrawl
41efea4c1d
in the trade window, don't show items that the merchant has equipped.
2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06
complete trade window layout
2012-05-17 21:15:48 +02:00
scrawl
c9aa0ca1f4
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
2012-05-17 19:54:09 +02:00
scrawl
4213b4370f
trade window shows up and shows the vendor's inventory items.
2012-05-17 19:53:04 +02:00
scrawl
1f85475536
Merge branch 'master' into inventoryGUI
2012-05-17 19:03:41 +02:00
scrawl
375c198ebd
WeatherManager: fix for cells that have no region.
2012-05-17 18:21:05 +02:00
scrawl
0afda15ce9
fix for cells that have no region.
2012-05-17 18:14:33 +02:00
scrawl
ae77e7b0d8
don't try to retrieve land data from non-predefined cells.
2012-05-17 18:11:34 +02:00
scrawl
5da4da820e
beginnings of trade window layout.
2012-05-17 17:15:44 +02:00
Marc Zinnschlag
6b74fec8ed
don't do a half finished cell change, when trying to switch to an interior cell that does not exist
2012-05-17 17:13:41 +02:00
scrawl
0dc5e5919b
show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works.
2012-05-17 14:54:03 +02:00
scrawl
66abfd17ab
check the container's "Organic" flag before trying to place items inside.
2012-05-17 14:13:35 +02:00
scrawl
0c1d06d9f7
added some trade window stuff, which does nothing yet.
2012-05-17 13:36:25 +02:00
Marc Zinnschlag
e56ff9283d
Issue #256 : moved magic effects update from MechanicsManager to Actors
2012-05-17 13:21:49 +02:00
Marc Zinnschlag
1fddbf9a40
Issue #256 : moved dynamic stats update from MechanicsManager to Actors
2012-05-17 13:15:31 +02:00
scrawl
630241c8e2
load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum.
2012-05-17 13:12:38 +02:00
scrawl
c5185cf2e4
drop item on avatar from external container bugfix
2012-05-17 12:09:53 +02:00
scrawl
fca9f1fc5f
gold dropping works without crash, but the code needs clean up.
2012-05-16 22:56:54 +02:00
scrawl
178ad876d7
fix for objects other than Miscellaneous.
2012-05-16 22:17:13 +02:00
scrawl
5875ce5128
select the correct gold base object (still crashing)
2012-05-16 22:13:56 +02:00
scrawl
f73d3ad33f
fix to the "drop object on ground" feature. still crashes for gold.
2012-05-16 21:27:02 +02:00
scrawl
6d34e61dbd
don't stack gold if it has a script (not used in MW, but some mods might)
2012-05-16 19:18:50 +02:00
scrawl
4b5d6ce311
allow stacking gold
2012-05-16 17:22:25 +02:00
scrawl
0f1e09d2c1
make Class::use method return an equip action for equippable items, add sound for equipping
2012-05-16 16:08:55 +02:00
scrawl
9c4243782e
sorting items
2012-05-16 15:17:55 +02:00
scrawl
9a01e18b29
fix some MessageBox code that was using deleted pointers sometimes
2012-05-16 15:00:20 +02:00
scrawl
398a7dc65c
crash fix (hopefully)
2012-05-16 14:32:48 +02:00
scrawl
6a0cb32b7e
removed unnecessary code
2012-05-16 14:30:02 +02:00
scrawl
c5d685c780
added an assert
2012-05-16 14:28:57 +02:00
scrawl
f8c20ef77f
don't allow putting items into a container if the weight is exceeded.
2012-05-16 00:20:24 +02:00
scrawl
2fa7ce0c19
equipping works also when the item wasn't in player inventory before.
2012-05-16 00:02:05 +02:00
scrawl
477f1b42ab
fixed another item dropping bug
2012-05-15 23:28:04 +02:00
scrawl
0f811edb47
fixed a bug with dropping items on the ground
2012-05-15 22:54:28 +02:00
scrawl
5a43fe3e5f
remove debug prints
2012-05-15 22:48:14 +02:00
scrawl
3f4ce32727
implemented player encumbrance bar
2012-05-15 22:45:46 +02:00
scrawl
e9ea1fba4e
fixed typo getCapacity method
2012-05-15 22:31:52 +02:00
scrawl
d3a53ae0b8
removed the _freeSlot method which is now unneeded
2012-05-15 22:01:09 +02:00
scrawl
0063387979
Merge branch 'master' into inventoryGUI
2012-05-15 21:48:05 +02:00
scrawl
175623bf22
change the drag&drop to not use a seperate containerstore
2012-05-15 21:44:57 +02:00
Marc Zinnschlag
fdfddc8be7
some todo comment cleanup
2012-05-15 21:34:32 +02:00
Marc Zinnschlag
7e00fea18b
added getEncumbrance function
2012-05-15 21:34:00 +02:00
Marc Zinnschlag
c6493fb133
added getCapacity function
2012-05-15 21:17:00 +02:00
scrawl
ca4fa21d64
removed the attempt to unify activation and use scripts which was incorrect
2012-05-15 20:51:19 +02:00
scrawl
71de10cb7e
equipping items works, but only if you have more than one of the item that you're equipping
2012-05-15 20:33:34 +02:00
scrawl
765881a61d
equipping items in the inventorywindow (there is no visual indication yet)
2012-05-15 18:20:32 +02:00
scrawl
ab6336b745
using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now)
2012-05-15 18:05:53 +02:00
scrawl
b18ee198b4
use a raycast to determine where to place object, if distance is too far
...
drop it on the ground
2012-05-15 16:47:23 +02:00
scrawl
7fbee0d488
use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift
2012-05-15 13:00:26 +02:00
scrawl
24a0fecd37
implemented item count selection dialog
2012-05-15 12:51:51 +02:00
scrawl
320cc7d020
implemented ctrl and shift-keys for item drag&drop (take all, take 1)
2012-05-15 11:02:50 +02:00
scrawl
933a40de14
better floating object label positioning.
2012-05-14 21:37:43 +02:00