scrawl
|
d393f551ed
|
edit effect dialog
|
2012-09-24 08:09:16 +02:00 |
|
scrawl
|
02e7b3df4f
|
oops
|
2012-09-24 01:07:33 +02:00 |
|
scrawl
|
f8a18d58a6
|
re-use the texture across preview instances
|
2012-09-24 01:06:17 +02:00 |
|
scrawl
|
dd5c083124
|
fix the race selection escape crash
|
2012-09-24 00:42:05 +02:00 |
|
scrawl
|
1cb1259e18
|
fixing some unrelated warnings
|
2012-09-23 19:36:37 +02:00 |
|
greye
|
807a56c9e4
|
fix dynamic potion id
|
2012-09-23 19:29:00 +04:00 |
|
scrawl
|
9d7c35ae48
|
and go
|
2012-09-23 00:36:20 +02:00 |
|
scrawl
|
b4db339fd5
|
everything uses find now
|
2012-09-22 21:39:05 +02:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|
scrawl
|
f45a6b71a9
|
Merge branch 'master' into next
|
2012-09-22 20:48:55 +02:00 |
|
scrawl
|
b471bef92a
|
Merge branch 'master' into next
|
2012-09-22 20:48:22 +02:00 |
|
Marc Zinnschlag
|
39e21a6103
|
Merge remote-tracking branch 'scrawl/globalmap' into next
|
2012-09-22 18:27:42 +02:00 |
|
scrawl
|
78b2d51cfc
|
fix a map crash
|
2012-09-22 16:52:31 +02:00 |
|
Marc Zinnschlag
|
8da00caaa4
|
Merge remote-tracking branch 'scrawl/globalmap' into next
|
2012-09-21 20:39:20 +02:00 |
|
scrawl
|
47d9fae89f
|
don't use cache
|
2012-09-21 20:35:50 +02:00 |
|
Marc Zinnschlag
|
3560690660
|
Merge remote-tracking branch 'scrawl/sleep_wait' into next
|
2012-09-21 18:27:06 +02:00 |
|
scrawl
|
b91d74d394
|
fix normalized encumbrance
|
2012-09-21 17:56:15 +02:00 |
|
scrawl
|
872fcf3e3d
|
sleeping restoration of health, magicka, and fatigue
|
2012-09-21 17:53:16 +02:00 |
|
Marc Zinnschlag
|
28e2430f3a
|
Merge remote-tracking branch 'scrawl/master'
|
2012-09-21 17:47:27 +02:00 |
|
scrawl
|
f49401bb53
|
center map on the player, dynamic map size
|
2012-09-21 16:26:04 +02:00 |
|
scrawl
|
1d012d1680
|
don't update input during loading. Fixes the OSX crash, and doesn't suffer from the issue anymore that I had while implementing this, so let's accept it as a hotfix for now. Note this means we can't switch the window during loading anymore.
|
2012-09-21 15:24:26 +02:00 |
|
scrawl
|
9106e5307c
|
moved global map from RenderingManager to gui and removed world method
|
2012-09-21 14:11:01 +02:00 |
|
greye
|
18cc435aa1
|
resolving conflicts
|
2012-09-21 13:13:11 +04:00 |
|
greye
|
2d5ddd104b
|
Land::loadData rework
|
2012-09-21 12:12:16 +04:00 |
|
scrawl
|
a161b34c67
|
remove useless member, fix map rendering crash
|
2012-09-20 18:23:27 +02:00 |
|
scrawl
|
98c1dc1151
|
ShowMap & FillMap commands, merged next
|
2012-09-20 18:02:37 +02:00 |
|
scrawl
|
8214966d44
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into globalmap
|
2012-09-20 17:41:14 +02:00 |
|
scrawl
|
451a9fd6ac
|
don't update world arrow position in interior
|
2012-09-20 17:35:30 +02:00 |
|
scrawl
|
e5e3d829d0
|
player arrow & markers
|
2012-09-20 17:30:09 +02:00 |
|
scrawl
|
5f014f7411
|
oops, left in a testing assertion
|
2012-09-20 14:04:29 +02:00 |
|
scrawl
|
86cfc91ef3
|
global map rendering
|
2012-09-20 13:56:37 +02:00 |
|
Marc Zinnschlag
|
87a9373a56
|
Merge remote-tracking branch 'scrawl/gamma' into next
|
2012-09-20 09:01:58 +02:00 |
|
scrawl
|
b9a3f8e8d7
|
gamma slider
|
2012-09-19 23:47:42 +02:00 |
|
scrawl
|
d9f6072f02
|
gamma correct rendering & adjustment setting
|
2012-09-19 23:25:07 +02:00 |
|
Marc Zinnschlag
|
ede9a2b170
|
fixed an orientation problem
|
2012-09-19 19:56:02 +02:00 |
|
scrawl
|
32de090079
|
Allow changing OpenGL RTT mode, useful for example if the driver reports incorrect capabilities
|
2012-09-19 19:34:02 +02:00 |
|
Marc Zinnschlag
|
a3c680d20a
|
Merge remote-tracking branch 'scrawl/sleep_wait' into next
|
2012-09-19 09:41:32 +02:00 |
|
scrawl
|
be44810623
|
implemented GetPCSleep
|
2012-09-19 03:11:23 +02:00 |
|
scrawl
|
bf5e30b24f
|
everything done except health/mana restore
|
2012-09-19 02:53:06 +02:00 |
|
scrawl
|
ab698bb401
|
date time label
|
2012-09-18 20:53:32 +02:00 |
|
scrawl
|
4d4ba6698a
|
fix character preview destruction; don't allow empty names in name dialog
|
2012-09-18 19:00:20 +02:00 |
|
scrawl
|
0ba996f290
|
dialog layout
|
2012-09-18 18:29:03 +02:00 |
|
Marc Zinnschlag
|
4abb9a00da
|
Merge remote-tracking branch 'jhooks/physicsaedra3' into next
|
2012-09-18 11:25:09 +02:00 |
|
Marc Zinnschlag
|
fcda3b6ca8
|
fixed some script argument types
|
2012-09-18 11:09:54 +02:00 |
|
Marc Zinnschlag
|
ea8eab4f34
|
more cleanup
|
2012-09-18 11:06:19 +02:00 |
|
Marc Zinnschlag
|
408c5b8bd4
|
some cleanup
|
2012-09-18 10:49:51 +02:00 |
|
Marc Zinnschlag
|
4469976be9
|
Merge remote-tracking branch 'gus/object_movement_creation' into object_movement_creation
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-09-18 10:44:25 +02:00 |
|
gugus
|
3c1a9061de
|
Fixed a bug of Ptr having a wrong orientation. But that's strange, seems CellRef isn't initialized properly
|
2012-09-17 14:12:27 +02:00 |
|
gugus
|
032ff7c879
|
Clean-up. There is still a little bug.
|
2012-09-17 13:36:48 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
Jason Hooks
|
192d634098
|
Movement keys; View angles
|
2012-09-16 13:19:38 -04:00 |
|
Jason Hooks
|
76f2a82884
|
More pmove stuff; Turned off broadphase, we could not fall in exteriors
|
2012-09-15 22:48:24 -04:00 |
|
Jason Hooks
|
f586f53a42
|
positioning
|
2012-09-15 16:45:50 -04:00 |
|
scrawl
|
896428c129
|
enableRestMenu & enableLevelupMenu
|
2012-09-15 20:18:41 +02:00 |
|
scrawl
|
9cf1cbc89b
|
remove book skill gain
|
2012-09-15 20:03:53 +02:00 |
|
scrawl
|
3e5ab069a6
|
remove the const cast
|
2012-09-15 19:52:18 +02:00 |
|
Jason Hooks
|
02bca98e9f
|
Setrotate working
|
2012-09-15 13:23:49 -04:00 |
|
scrawl
|
cf358fa79d
|
>= instead of ==
|
2012-09-15 19:20:13 +02:00 |
|
scrawl
|
0dc242c603
|
don't increase skill beyond 100
|
2012-09-15 19:10:48 +02:00 |
|
scrawl
|
f5237ff1a6
|
skill gain from books
|
2012-09-15 19:06:56 +02:00 |
|
scrawl
|
234f8fa5d5
|
added the missing sound & notification for skill increase
|
2012-09-15 18:35:59 +02:00 |
|
scrawl
|
b34b894d6a
|
removed some debug stuff
|
2012-09-15 17:20:47 +02:00 |
|
scrawl
|
76b494100e
|
finished?
|
2012-09-15 17:12:42 +02:00 |
|
scrawl
|
95f3a20e2c
|
Merge branch 'master' into levelup
|
2012-09-15 14:25:37 +02:00 |
|
scrawl
|
3e794a6087
|
remove useless member and removed a warning
|
2012-09-15 01:02:07 +02:00 |
|
scrawl
|
2793096b50
|
Merge branch 'externalrendering' of https://github.com/zinnschlag/openmw into characterpreview
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwbase/world.hpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
|
2012-09-15 00:57:29 +02:00 |
|
Marc Zinnschlag
|
b7c9285b24
|
added support for out of world rendering
|
2012-09-14 21:12:16 +02:00 |
|
scrawl
|
b76a28f69c
|
beginnings of the gui
|
2012-09-14 19:44:00 +02:00 |
|
scrawl
|
35f7216f2f
|
fixed some things
|
2012-09-14 17:25:32 +02:00 |
|
scrawl
|
7c59b83419
|
performance optimization
|
2012-09-14 17:10:10 +02:00 |
|
scrawl
|
a308d2e38a
|
fixed exception, fixed armor label obscuring the items
|
2012-09-14 15:33:24 +02:00 |
|
scrawl
|
1f7e044fad
|
removed some debug stuff
|
2012-09-14 14:41:19 +02:00 |
|
scrawl
|
6ac2a12296
|
item selection working on the preview
|
2012-09-14 14:34:18 +02:00 |
|
scrawl
|
eef750e6b0
|
race selection preview
|
2012-09-13 19:03:31 +02:00 |
|
scrawl
|
5155339cb6
|
character preview working
|
2012-09-13 14:56:50 +02:00 |
|
scrawl
|
d90af9c524
|
Merge branch 'master' into characterpreview
|
2012-09-13 14:22:17 +02:00 |
|
Marc Zinnschlag
|
835c530e06
|
Merge branch 'ingredients'
|
2012-09-13 13:31:46 +02:00 |
|
Marc Zinnschlag
|
5706caa141
|
Issue #356: added ingredient eating sound effect
|
2012-09-13 13:30:57 +02:00 |
|
Marc Zinnschlag
|
fe68a252d5
|
Issue #356: Implemented ingredient eating
|
2012-09-13 13:02:26 +02:00 |
|
Marc Zinnschlag
|
2ccd7a480d
|
Issue #356: added a missing return
|
2012-09-13 13:01:59 +02:00 |
|
scrawl
|
7ad80e306b
|
fixed the disappearing
|
2012-09-13 12:33:09 +02:00 |
|
Marc Zinnschlag
|
9de7b3bf90
|
Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)
|
2012-09-13 11:30:59 +02:00 |
|
Marc Zinnschlag
|
0af0dc0d5d
|
Issue #356: More CreatureStats cleanup
|
2012-09-13 11:13:05 +02:00 |
|
Marc Zinnschlag
|
2934987f78
|
Issue #356: Some CreatureStats cleanup
|
2012-09-13 10:52:34 +02:00 |
|
Marc Zinnschlag
|
9dcf8939e9
|
Issue #356: added function for fatigue term calculation
|
2012-09-13 10:45:32 +02:00 |
|
Marc Zinnschlag
|
fca3b67507
|
Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula)
|
2012-09-13 09:30:47 +02:00 |
|
scrawl
|
4f3eb3c34a
|
character preview WIP
|
2012-09-13 00:54:32 +02:00 |
|
Jason Hooks
|
a1a7733730
|
Set scale implemented
|
2012-09-12 18:30:32 -04:00 |
|
scrawl
|
2f0b47fc38
|
test
|
2012-09-13 00:21:58 +02:00 |
|
scrawl
|
a96ed6ac61
|
splash screens on startup
|
2012-09-12 19:15:29 +02:00 |
|
scrawl
|
c3966a7c5a
|
oops, I used a float texture for water reflection. this change should give a little performance boost.
|
2012-09-11 22:45:41 +02:00 |
|
Marc Zinnschlag
|
e9e30c0fce
|
fixed a memory leak
|
2012-09-11 20:34:54 +02:00 |
|
scrawl
|
a8d9aa98b1
|
some fixes
|
2012-09-11 19:18:26 +02:00 |
|
scrawl
|
d5a08e31e7
|
scene does not disappear anymore during load
|
2012-09-11 17:36:20 +02:00 |
|
scrawl
|
369db182de
|
actual progress bar, performance optimization
|
2012-09-11 16:53:49 +02:00 |
|
scrawl
|
2b339f6c0f
|
loading screen
|
2012-09-11 16:37:54 +02:00 |
|
Jason Hooks
|
c5b25ef70b
|
Very basic actor physics (no set scale/rotate functions)
|
2012-09-10 20:29:24 -04:00 |
|
scrawl
|
4977c33e4c
|
fixed a stats window resizing problem that I introduced today
|
2012-09-10 21:58:19 +02:00 |
|
Marc Zinnschlag
|
6c03d7aec4
|
documentation fix
|
2012-09-10 21:12:35 +02:00 |
|
scrawl
|
9448ce5968
|
implemented "get<Control>Disabled" functions
|
2012-09-10 18:44:59 +02:00 |
|
scrawl
|
89ad2af1d9
|
key usage to open doors or containers
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
|
2012-09-10 17:44:59 +02:00 |
|
scrawl
|
fdc2a7433c
|
remove the wrong container open sound
|
2012-09-10 15:01:51 +02:00 |
|
scrawl
|
d581ac426e
|
useless cout message
|
2012-09-10 14:10:56 +02:00 |
|
scrawl
|
996e6280d8
|
more spell buying window cleanup
|
2012-09-10 14:10:01 +02:00 |
|
scrawl
|
ba0acd4056
|
changed some text colors
|
2012-09-10 13:52:37 +02:00 |
|
scrawl
|
fde69d0c87
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
|
2012-09-10 13:40:34 +02:00 |
|
scrawl
|
bc6a1979b0
|
replaced everything with the new method
|
2012-09-10 13:39:22 +02:00 |
|
Marc Zinnschlag
|
61c8a627aa
|
added a missing include
|
2012-09-10 13:19:15 +02:00 |
|
Marc Zinnschlag
|
273ac0a97f
|
Merge branch 'spellbuying'
|
2012-09-10 13:16:02 +02:00 |
|
Marc Zinnschlag
|
f17756712a
|
fixed spell list handling
|
2012-09-10 13:15:55 +02:00 |
|
Marc Zinnschlag
|
6c928e93d3
|
added missing initialisation of NPC/creature spell lists from ESX records
|
2012-09-10 13:04:00 +02:00 |
|
scrawl
|
b66c8099eb
|
new system for dynamic sizing of buttons & text boxes
|
2012-09-10 11:20:27 +02:00 |
|
scrawl
|
35dd49f948
|
fixed some "using namespace" in headers
|
2012-09-10 09:10:50 +02:00 |
|
scrawl
|
56061474c4
|
another 3 unnecessary lines
|
2012-09-09 23:53:23 +02:00 |
|
scrawl
|
bb267dddf6
|
some stats window cleanup
|
2012-09-09 23:50:57 +02:00 |
|
scrawl
|
432c089434
|
fix the spell tooltips to show the spell target
|
2012-09-09 23:06:24 +02:00 |
|
Marc Zinnschlag
|
bcf3a81a6c
|
and a tiny bit more of cleanup
|
2012-09-09 21:18:47 +02:00 |
|
Marc Zinnschlag
|
9c49ca1468
|
a bit more random cleanup
|
2012-09-09 21:08:57 +02:00 |
|
Marc Zinnschlag
|
06677a0fc8
|
fixed ID handling and some misc cleanup
|
2012-09-09 21:03:39 +02:00 |
|
Marc Zinnschlag
|
3fad1c0786
|
fixed a crash
|
2012-09-09 20:43:21 +02:00 |
|
Adam Hogan
|
08410b9062
|
Renamed SpellBuyingWindow, took some suggestions from scrawl
|
2012-09-09 14:10:07 -04:00 |
|
Adam Hogan
|
562df5388f
|
Merge branch 'master' of git://github.com/zinnschlag/openmw
|
2012-09-09 08:38:56 -04:00 |
|
Adam Hogan
|
ebf80943a9
|
Added spell buying window
|
2012-09-08 18:17:03 -04:00 |
|
Lukasz Gromanowski
|
99c46093dd
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into jenkins-code-coverage-and-unittests
|
2012-09-08 22:18:25 +03:00 |
|
Jason Hooks
|
23777033fd
|
Starting to implement new PhysicActor
|
2012-09-05 17:44:11 -04:00 |
|
Marc Zinnschlag
|
0879abb948
|
Merge branch 'actiontarget'
|
2012-09-04 20:56:40 +02:00 |
|
Marc Zinnschlag
|
da041f902f
|
Issue #370: fixed item taking sound
|
2012-09-04 20:56:28 +02:00 |
|
Marc Zinnschlag
|
482874f99e
|
Merge remote-tracking branch 'scrawl/cache'
|
2012-09-04 20:40:18 +02:00 |
|
Marc Zinnschlag
|
6813bafbfc
|
added missing sound effect for chest opening; minor cleanup
|
2012-09-04 15:42:41 +02:00 |
|
Marc Zinnschlag
|
fb8aae243d
|
Issue #370: replaced custom target handling in talk action with base class implementation
|
2012-09-04 15:38:21 +02:00 |
|
Marc Zinnschlag
|
8ed8dd649a
|
Issue #370: replaced custom target handling in take action with base class implementation
|
2012-09-04 15:34:44 +02:00 |
|
Marc Zinnschlag
|
ea1c3fe1e4
|
Issue #370: replaced custom target handling in open action with base class implementation
|
2012-09-04 15:29:51 +02:00 |
|
Marc Zinnschlag
|
8c2b4f996c
|
Issue #370: replaced custom target handling in equip action with base class implementation
|
2012-09-04 15:27:10 +02:00 |
|
Marc Zinnschlag
|
b51c42146f
|
Issue #370: replaced custom target handling in read action with base class implementation
|
2012-09-04 15:24:55 +02:00 |
|
Marc Zinnschlag
|
3f181f9a9d
|
Issue #370: Support for targets in containers
|
2012-09-04 15:21:56 +02:00 |
|
Marc Zinnschlag
|
cc55056adf
|
Issue #370: replaced custom target handling in apply action with base class implementation
|
2012-09-04 15:18:59 +02:00 |
|
Marc Zinnschlag
|
733654d730
|
Issue #370: implemented target handling in action base class
|
2012-09-04 15:14:33 +02:00 |
|
Marc Zinnschlag
|
1cecab6e3d
|
fixed RefData::getHandle
|
2012-09-04 15:08:59 +02:00 |
|
Marc Zinnschlag
|
ead04e1cc3
|
Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update
|
2012-09-04 13:32:35 +02:00 |
|
Marc Zinnschlag
|
345eec1135
|
Issue #389: added AI package base class and AI packages management class
|
2012-09-04 13:25:53 +02:00 |
|
Marc Zinnschlag
|
ef6f033dd1
|
Merge branch 'multidata'
|
2012-09-04 11:02:28 +02:00 |
|
Jason Hooks
|
2efceba1fc
|
Tearing apart PhysicActor
|
2012-09-03 20:32:20 -04:00 |
|
gugus
|
d261263824
|
oups forgot vmformat
|
2012-09-02 21:09:07 +02:00 |
|
scrawl
|
c27ff546e4
|
shader cache
|
2012-09-02 19:40:26 +02:00 |
|
gugus
|
95c27723f7
|
fixed a bug (see commit reverted)
|
2012-09-02 18:12:13 +02:00 |
|
gugus
|
99885e8ca4
|
Revert "fix a bug with case sensitivity: when searching for a cell which is already loaded,but with another case, the cell get loaded twice, which is bad :p"
This reverts commit 165065d378 .
|
2012-09-02 18:04:36 +02:00 |
|
gugus
|
fa9f2b268b
|
PlaceItem,PlaceItemCell,PlaceAtPC,PlaceAtMe
|
2012-09-02 17:57:03 +02:00 |
|
scrawl
|
950bf66334
|
throw an exception if default value for a setting is not found
|
2012-09-02 11:39:54 +02:00 |
|
Jason Hooks
|
0697c7f7f4
|
Finally merged in master
|
2012-09-01 17:28:12 -04:00 |
|
Marc Zinnschlag
|
e2bf4694cb
|
Merge remote-tracking branch 'scrawl/master'
|
2012-08-31 09:22:32 +02:00 |
|