Tycho Bickerstaff
|
042b72bc17
|
rewrote queue not to use promises for waits
|
2014-01-02 12:32:55 +00:00 |
|
Tycho Bickerstaff
|
7694a0788c
|
Merge branch 'master' into threadsafequeue
Conflicts:
src/OSSupport/Queue.h
|
2013-12-31 16:32:08 +00:00 |
|
Alexander Harkness
|
bb0d43f70e
|
Merge pull request #484 from worktycho/cmake-fixes
fixes for mac os x
|
2014-01-01 10:15:21 -08:00 |
|
madmaxoft
|
d4e29a0d18
|
Merge branch 'FishingHook'
|
2014-01-01 15:31:57 +01:00 |
|
STRWarrior
|
d656c253c0
|
Little more documentation for OnPlayerFishing.
|
2014-01-01 15:18:12 +01:00 |
|
STRWarrior
|
78a876ace3
|
Using documentation Xoft recommended.
|
2014-01-01 15:15:56 +01:00 |
|
STRWarrior
|
db00a36ff8
|
OnPlayerFishing doesn't have a const cItems anymore
|
2014-01-01 15:09:53 +01:00 |
|
STRWarrior
|
c5b89ea0f5
|
Fixed typo's in the documentation.
|
2014-01-01 15:02:43 +01:00 |
|
Alexander Harkness
|
eeeb2a6d22
|
Merge pull request #497 from xdot/master
Fixed GetPhysicalRAMUsage on Linux
|
2014-01-01 01:22:24 -08:00 |
|
andrew
|
852c52bee9
|
Fixed GetPhysicalRAMUsage on Linux
|
2014-01-01 11:18:56 +02:00 |
|
Mattes D
|
a3c698596c
|
Merge pull request #480 from mc-server/CmakeNonMixed
CMake: Fixed mismatching library vs app builds.
|
2013-12-31 14:32:45 -08:00 |
|
Tycho Bickerstaff
|
c52a46a5e3
|
merged changes from upstream
|
2013-12-31 16:24:53 +00:00 |
|
Tycho Bickerstaff
|
098ed91a48
|
fogot to add promise classes
|
2013-12-31 16:13:13 +00:00 |
|
Tycho Bickerstaff
|
512d1b9ebe
|
clean up code for patching
|
2013-12-31 15:58:21 +00:00 |
|
Tycho Bickerstaff
|
18fb814c34
|
Merge branch 'master' into threadsafequeue
|
2013-12-31 15:53:17 +00:00 |
|
Tycho Bickerstaff
|
173ed0e653
|
Merge branch 'master' into cmake-fixes
|
2013-12-31 15:52:51 +00:00 |
|
Tycho Bickerstaff
|
f3736b1eb7
|
refactored chunk Queue to seperate class
|
2013-12-31 15:48:57 +00:00 |
|
STRWarrior
|
020a8b457d
|
implemented the recommendations Xoft gave.
|
2013-12-31 14:53:10 +01:00 |
|
STRWarrior
|
db935c4194
|
Documented OnPlayerFished and OnPlayerFishing.
|
2013-12-31 14:50:46 +01:00 |
|
Tycho Bickerstaff
|
c3e34ee81a
|
removed unneccisary cast
|
2013-12-31 09:16:44 +01:00 |
|
Tycho Bickerstaff
|
1957f982bc
|
fixed warnings in LineBlockTracer.cpp
|
2013-12-31 09:16:44 +01:00 |
|
Tycho Bickerstaff
|
8e7e990cfe
|
fixed warnings in LightingThread.cpp
|
2013-12-31 09:16:43 +01:00 |
|
Tycho Bickerstaff
|
3da41de553
|
take Z axis into account when calculating neighboors in LightingThread::ChunkReady
|
2013-12-31 09:16:43 +01:00 |
|
Tycho Bickerstaff
|
2e1588820d
|
fixed warnings in World.cpp
|
2013-12-31 09:16:42 +01:00 |
|
Tycho Bickerstaff
|
2e113c63f9
|
fixxed warnings in Server.cpp
|
2013-12-31 09:16:42 +01:00 |
|
Tycho Bickerstaff
|
3152c72959
|
fixed warnings in Inventory.cpp
|
2013-12-31 09:16:42 +01:00 |
|
Tycho Bickerstaff
|
c83dfdb66e
|
fixed warnings in bytebuffer.cpp
|
2013-12-31 09:16:41 +01:00 |
|
Tycho Bickerstaff
|
e41dec458c
|
fixed ClientHandle warnings
|
2013-12-31 09:16:41 +01:00 |
|
Tycho Bickerstaff
|
9ebc623a0a
|
fixed warnings in webadmin.cpp
|
2013-12-31 09:16:41 +01:00 |
|
Tycho Bickerstaff
|
25d42c44d5
|
fixed warnings in BlockArea.cpp
|
2013-12-31 09:16:40 +01:00 |
|
Mattes D
|
8003305075
|
Merge pull request #488 from Diusrex/master
Fixed cPlayer::IsGameModeAdventure.
|
2013-12-30 22:44:04 -08:00 |
|
Morgan Redshaw
|
782818ffb5
|
Fixed a cPlayer::IsGameModeAdventure. It was determined based off of gmCreate rather than gmAdventure.
|
2013-12-30 21:30:20 -07:00 |
|
STRWarrior
|
cd435ffca9
|
Implented OnPlayerFishing and OnPlayerFished.
|
2013-12-30 22:56:08 +01:00 |
|
madmaxoft
|
ee15d4e08e
|
Fixed compilation in VC2008.
Also removed an unused inline header file (yuck).
|
2013-12-30 17:41:59 +01:00 |
|
madmaxoft
|
b6bbba0cde
|
CMake: Fixed mismatching library vs app builds.
|
2013-12-28 16:03:57 +01:00 |
|
madmaxoft
|
06dbc783fe
|
Fixed the Windows script for uploading Lua API to an FTP server.
The new script handles subfolders, too.
|
2013-12-28 09:44:14 +01:00 |
|
madmaxoft
|
537d1c4e42
|
APIDump: Added the SettingUpDecoda article.
This implements #383.
|
2013-12-27 20:56:01 +01:00 |
|
madmaxoft
|
9689896f9c
|
APIDump: Articles eplicitly declare being UTF-8.
This fixes display in firefox.
|
2013-12-27 20:48:11 +01:00 |
|
madmaxoft
|
e4c6e853ea
|
APIDump: Added quick links to index to each class and hook file.
Third part of #403.
|
2013-12-27 15:48:01 +01:00 |
|
madmaxoft
|
9a9888a8cc
|
APIDump: Added a quick-nav menu to hook descriptions.
Second part of #403.
|
2013-12-27 15:36:28 +01:00 |
|
madmaxoft
|
b99255820b
|
APIDump: Added a quick-nav menu to class descriptions.
First part of #403.
|
2013-12-27 15:26:41 +01:00 |
|
madmaxoft
|
0c071c5937
|
APIDump: Split the huge DumpAPIHtml function into smaller ones.
|
2013-12-27 15:08:27 +01:00 |
|
madmaxoft
|
daeb37b27b
|
APIDump: Extra pages renamed to articles and moved to front.
|
2013-12-27 15:01:49 +01:00 |
|
madmaxoft
|
270d79d47b
|
APIDump: Fixed the WritingPlugin article.
The code is no longer weirdly indented in the browser, and links are relative to the API docs root.
|
2013-12-27 14:46:07 +01:00 |
|
madmaxoft
|
f0ca18d72a
|
APIDump: Added the WritingPlugin article to the exported pages.
|
2013-12-27 14:33:15 +01:00 |
|
madmaxoft
|
1a3a291bde
|
APIDump: Fixed bad for-loop.
How did I not see this before?
|
2013-12-27 14:32:40 +01:00 |
|
Mattes D
|
194a1b208f
|
Merge pull request #477 from mc-server/cmake-win
Cmake-win
|
2013-12-27 04:54:42 -08:00 |
|
madmaxoft
|
f5c013071e
|
Lua is built statically on *nix.
|
2013-12-27 12:01:45 +01:00 |
|
madmaxoft
|
66f9fcbb69
|
Fixed unix Lua dependencies.
|
2013-12-27 11:56:39 +01:00 |
|
madmaxoft
|
90213d324a
|
Merge branch 'master' into cmake-win
|
2013-12-27 11:53:12 +01:00 |
|