Commit Graph

195 Commits (master)

Author SHA1 Message Date
David Cernat 8b8c01f389 [General] Make ID_OBJECT_PLACE take effect only when sent back by server 8 years ago
David Cernat 2bd81c3de0 [Client] Use mpNum for every WorldObject 8 years ago
David Cernat e5cf632e1d [Client] Stop creating new reference numbers for placed/spawned objects 8 years ago
David Cernat 7647715dac Merge pull request #190 from OpenMW/master
Add OpenMW commits up to 27 Mar 2017
8 years ago
Andrei Kortunov b89fdcfd27 Vanilla style drowning widget (partially fixes bug #3801). 8 years ago
David Cernat e0234dc362 Merge pull request #183 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
8 years ago
scrawl a556475fae Explicitely set the user data type to avoid const/non-const mismatch 8 years ago
Koncord 690211ad99 [General] Extract BaseEvent & BasePlayer from packets to functions
Move Send and Read functions to BasePacket
8 years ago
Koncord cea1425db1 [Client] Remove redundant newlines & keep ~120 columns 8 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 8 years ago
David Cernat ed2176c984 [Client] Reuse 1 BaseEvent over and over instead of creating new ones 8 years ago
David Cernat e703dd42aa [Client] Rename LocalEvent into WorldEvent 8 years ago
David Cernat 25d79dbcfe [Client] Revert c0d67f67fb after discovering its negative consequences 8 years ago
David Cernat cdd796aba1 [Client] Send ID_PLAYER_INVENTORY from two more locations 8 years ago
David Cernat c0d67f67fb [Client] Move code for sending a packet for picking up world items
Previously, an ID_OBJECT_DELETE was sent from inventorywindow.cpp, but this is now sent from hud.cpp because 2 other packets are also sent from there.
8 years ago
David Cernat b2cdec8efa [Client] Send ID_PLAYER_INVENTORY upon dropping an item, 2nd attempt 8 years ago
David Cernat f03724be7b [Client] Send ID_PLAYER_INVENTORY upon dropping an item 8 years ago
David Cernat ecc456fea9 [General] Include charge int in WorldObject & send it w/ ID_OBJECT_PLACE 8 years ago
David Cernat 703f253712 [Client] Delete new LocalEvents after sending them 8 years ago
David Cernat d503a65849 [Client] Replace tab characters with spaces 8 years ago
David Cernat 9f1e491a75 [General] Make WorldEvents store information about multiple objects 8 years ago
David Cernat 624b85347a [Client] Create LocalEvent class and use it instead of WorldEvent 8 years ago
Koncord 804259b2c9 Change some printf to LOG_MESSAGE_SIMPLE
printf is not streamed to files
8 years ago
Koncord 536715cf46 Cleanup tes3mp headers 8 years ago
David Cernat fa9d6e810e Use lowerCamelCase in tes3mp client function names like OpenMW does 8 years ago
David Cernat 41504bd02a Use more accurate position for ID_OBJECT_PLACE 8 years ago
David Cernat a4647de048 Break away from OpenMW by giving RefNum indexes to new created objects 8 years ago
David Cernat 937bf97883 Send gold values correctly with ID_OBJECT_PLACE 8 years ago
David Cernat 180aa3f2f3 Send item count ID_WORLD_OBJECT_PLACE 8 years ago
David Cernat c25ebc34b3 Shorten WorldPacket IDs by removing WORLD from them 8 years ago
David Cernat cbc132612a Use mRefNum.mIndex instead of just mRefNum and add extra debug 8 years ago
David Cernat 17f66e4e90 Implement ID_WORLD_OBJECT_PLACE 8 years ago
scrawl 7d647088ab Make the local map cell distance configurable 9 years ago
scrawl ef20962fc5 Disable fog of war rendering on the HUD map by default 9 years ago
scrawl db7b80b503 Revert "Accept a ConstPtr in ItemPtr tooltips"
This reverts commit 41c8ec56e0.

Does not work due to code relying on getting the non-const Ptr from the widget. Further refactoring is needed.
9 years ago
scrawl 41c8ec56e0 Accept a ConstPtr in ItemPtr tooltips 9 years ago
scrawl 1b1d9a7a9c Fixed another tooltip 9 years ago
scrawl 13c7235b6b Remove old FPS setting code 9 years ago
dteviot 77a1d947cc extracted MWMechanics::getPlayer() 10 years ago
Marc Zinnschlag d2cd151f77 Merge remote-tracking branch 'kunesj/master' 10 years ago
Jiří Kuneš cbc44b33ba define crosshair owned colour in openmw_hud_box.skin.xml 10 years ago
scrawl 77f1387da8 Include cleanup 10 years ago
Jiří Kuneš 66edae9b93 change collor of crosshair 10 years ago
scrawl f3cbe7b9da Hide FPS widget since it currently doesn't work, use F3 instead 10 years ago
scrawl 4bb3cbf0fb Remove last remains of Ogre 10 years ago
scrawl 7bacb9418d Various math code ported to osg 10 years ago
scrawl 8e0a988289 Icon fix 10 years ago
scrawl 3dcb167066 Map rendering 10 years ago
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
10 years ago
scrawl 8817f44d63 Remove advanced FPS counter (obsoleted by the OSG stats viewer) 10 years ago
scrawl 82c4d01b37 Add back resource handling workarounds to the gui code 10 years ago
Rohit Nirmal 997347b01e Silence -Wreorder warnings. 10 years ago
scrawl 4e69e7cc0f OpenMW compiles and runs w/o render window 10 years ago
scrawl 37a6d7da76 WindowManager refactoring 10 years ago
dteviot e197f5318b fixing MSVC 2013 warning C4244: & C4305
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
10 years ago
scrawl a5847afdac Fix ignored clicks on HUD mini-map (Fixes #2388) 10 years ago
scrawl 0c6e2170db Include cleanup 10 years ago
scrawl c093e284d9 Delegate cleanup 10 years ago
scrawl 728b842e72 Use MyGUI::utility in favor of boost lexical_cast 10 years ago
scrawl eecea4131f Reduce MyGUI includes 10 years ago
scrawl 4b704f665f Reduce includes, move DragAndDrop to separate file 10 years ago
scrawl 363d1f9207 Merge remote-tracking branch 'upstream/master' 10 years ago
scrawl 5d7dcafa53 Make local map widget size configurable 10 years ago
scrawl 307b84e9f6 Add enemy health bar fading and use relevant GMSTs 10 years ago
Alexander "Ace" Olofsson 462b41a3a8 Missing files, aka; Why you shouldn't stresscommit 10 years ago
scrawl 4f92044d71 Allow user-created markers on local map (Fixes #1571) 11 years ago
MiroslavR fc21d898f2 Add hand-to-hand tooltip 11 years ago
MiroslavR 195f044f3b Replace more .tga->.dds hacks with ResourceHelpers 11 years ago
scrawl 6cb9382bf0 Adjust screen-sized widgets automatically using Stretch align 11 years ago
scrawl 103325bfb8 Change HUD enemy health bar to use actorId 11 years ago
scrawl 1244da85df Make Detect Life spell detect NPCs when in werewolf form (Fixes #1527) 11 years ago
scrawl 6db936bb3a Refactor item icon code into ItemWidget (Fixes #1391)
- Removed duplicate code
 - Fixed missing magic backgrounds during item drag&drop
 - Change background texture used for HUD icons
11 years ago
scrawl 039398c8ae Basic RefData and CellRef change tracking
Wrapped item charge handling in getItemHealth function
11 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
11 years ago
scrawl 220ab86eca Simplify new game movie player 11 years ago
scrawl 940a434479 Use ItemModel for moving items from a container to the world
Fixes owner not resetting when moving an item from a corpse to the world.
11 years ago
scrawl 117b812fb1 Fix invisibility not breaking on certain actions 11 years ago
scrawl dac0b7090a Get rid of bigbars.png and smallbars.png
Changed loading bar colour to match vanilla
11 years ago
scrawl e8210c92c6 Fixes #1240: Don't hardcode drowning time 11 years ago
scrawl 5b011e43a7 Fix a crash after loading game 11 years ago
scrawl 61955111f1 Fixes #1204: Any health value < 1 should show as empty life bar. 11 years ago
scrawl 27d0d9c592 Fix exception when clicking on statics when in the inventory window 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
Lukasz Gromanowski cb04f43384 Fixes for "Conditional jump or move depends on uninitialised value(s)"
and memleaks reported by valgrind.

Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
11 years ago
Emanuel Guevel 357ecd92b2 Do not display negative stat values
Display zero instead of negative values.
Also remove useless for loops and some unused attributes.
11 years ago
Emanuel Guevel 10abb9d297 Call ContainerStore::remove() to remove items from inventory
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
11 years ago
Alex "rainChu" Haddad 23eaf90846 Breath meter flashes when drowning 11 years ago
scrawl d5ef843f56 Fix a missing model update 11 years ago
Emanuel Guevel 37ea0f3fb9 Display refusal message when weapon/magic icons are clicked as werewolf 12 years ago
Chris Robinson 2bac4566c0 Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwscript/statsextensions.cpp
12 years ago
PLkolek 8f4506f5b6 Implemented drowning.
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
12 years ago
Emanuel Guevel ddc92d1fbd Set appropriate weapon icon when player is a werewolf 12 years ago
Emanuel Guevel 9757694060 Update sneaking indicator position with other widgets 12 years ago
scrawl 3961c276b8 Added enemy health meter 12 years ago
scrawl 0c4a963132 Container UI rewrite 12 years ago
Britt Mathis 7eee86ab66 No more using namespace 12 years ago
Britt Mathis 60fadaeaf0 Cleaned up includes in implementation files 12 years ago
scrawl b0199c703c Companion UI 12 years ago
scrawl e34685b8a3 Fix manually changed mouse cursor 12 years ago
Marc Zinnschlag 3e97943e06 Merge remote-tracking branch 'scrawl/includes' 12 years ago