repo
string
commit
string
message
string
diff
string
bravoserver/bravo
381bef126c3a0cbb54caeec444b8b479aabbf6d9
Move IRC to #bravoserver so we can kick spammers when necessary.
diff --git a/docs/introduction.rst b/docs/introduction.rst index 985c49d..595270f 100644 --- a/docs/introduction.rst +++ b/docs/introduction.rst @@ -1,101 +1,101 @@ .. include:: globals.txt .. _introduction: ========================= A high-level introduction ========================= Bravo is an open sourc...
bravoserver/bravo
a0aa6d76fef125ca53f2ed4db312c16a519a6361
Added support for relative config locations.
diff --git a/twisted/plugins/bravod.py b/twisted/plugins/bravod.py index d32a392..4be72ee 100644 --- a/twisted/plugins/bravod.py +++ b/twisted/plugins/bravod.py @@ -1,30 +1,39 @@ +import os from zope.interface import implements from twisted.application.service import IServiceMaker from twisted.plugin import IPlugi...
bravoserver/bravo
8206e486be79bb828b976de7fdba6d28d1599e9d
policy/recipes/blueprints: Add recipe for crafting beacons.
diff --git a/bravo/policy/recipes/blueprints.py b/bravo/policy/recipes/blueprints.py index 3b0542c..e21385f 100644 --- a/bravo/policy/recipes/blueprints.py +++ b/bravo/policy/recipes/blueprints.py @@ -16,513 +16,524 @@ def two_by_one(material, provides, amount, name): return Blueprint(name, (2, 1), ((material.ke...
bravoserver/bravo
402ac3a0c768a90b05d7dc4fb45fe866282bd373
blocks: Add nether star and beacon.
diff --git a/bravo/blocks.py b/bravo/blocks.py index 6f52606..8520084 100644 --- a/bravo/blocks.py +++ b/bravo/blocks.py @@ -1,837 +1,853 @@ from __future__ import division faces = ("-y", "+y", "-z", "+z", "-x", "+x") class Block(object): """ A model for a block. There are lots of rules and prop...
bravoserver/bravo
c724d2419baefa912963569cfcfe365cb6935627
blocks: Add spawn egg.
diff --git a/bravo/blocks.py b/bravo/blocks.py index 43c4c21..6f52606 100644 --- a/bravo/blocks.py +++ b/bravo/blocks.py @@ -1,837 +1,837 @@ from __future__ import division faces = ("-y", "+y", "-z", "+z", "-x", "+x") class Block(object): """ A model for a block. There are lots of rules and prop...
bravoserver/bravo
5f243855bf91bb9e628f13ffc5b5cf5c60177bdf
beta/protocol: Use hex numbers in logs.
diff --git a/bravo/beta/protocol.py b/bravo/beta/protocol.py index 82f3474..d0f3c86 100644 --- a/bravo/beta/protocol.py +++ b/bravo/beta/protocol.py @@ -572,931 +572,931 @@ class BetaServerProtocol(object, Protocol, TimeoutMixin): for instrument, pitch in notes: self.write_packet("note", x=x, y=y,...
bravoserver/bravo
89ef296eed2f302202084c942e185fa1ad7cadfd
beta: Use JSON for text messages.
diff --git a/bravo/beta/factory.py b/bravo/beta/factory.py index 2ac1fe0..c0b1c85 100644 --- a/bravo/beta/factory.py +++ b/bravo/beta/factory.py @@ -1,565 +1,568 @@ from collections import defaultdict from itertools import product +import json from twisted.internet import reactor from twisted.internet.interfaces ...
bravoserver/bravo
f512b3a6187cc57571a6a381f27cbb7b710f128a
beta: Fake poll packet reciept.
diff --git a/bravo/beta/packets.py b/bravo/beta/packets.py index a0b512c..86e4b32 100644 --- a/bravo/beta/packets.py +++ b/bravo/beta/packets.py @@ -448,616 +448,621 @@ packets = { SBInt32("z"), UBInt8("yaw"), UBInt8("pitch"), # 0 For none, unlike other packets # -1 crashes ...
bravoserver/bravo
2e2b46c4d2c1e8bfad69955d40702007544f5a0c
bravo/world: Fix dictionary changing size during iteration.
diff --git a/bravo/world.py b/bravo/world.py index baff818..0350d5a 100644 --- a/bravo/world.py +++ b/bravo/world.py @@ -1,708 +1,711 @@ from array import array from functools import wraps from itertools import imap, product import random import sys from twisted.internet import reactor from twisted.internet.de...
bravoserver/bravo
1225064eb671e3e5d61c6e9594ce06dc7b8029a1
beta/protocol: Clean up b.p.windows-using code.
diff --git a/bravo/beta/protocol.py b/bravo/beta/protocol.py index 22172ef..e139556 100644 --- a/bravo/beta/protocol.py +++ b/bravo/beta/protocol.py @@ -516,988 +516,976 @@ class BetaServerProtocol(object, Protocol, TimeoutMixin): count -= 1 if not count: break ...
bravoserver/bravo
9f08562f180c305292aaa8699335a216697facdf
ibravo, policy/windows: More work on IWindow.
diff --git a/bravo/ibravo.py b/bravo/ibravo.py index 32404fc..5b85de7 100644 --- a/bravo/ibravo.py +++ b/bravo/ibravo.py @@ -1,540 +1,567 @@ from twisted.python.components import registerAdapter from twisted.web.resource import IResource from zope.interface import implements, invariant, Attribute, Interface from ...
bravoserver/bravo
dd77a97338a68fa266a1876196ee4890c5e87b98
Fix up some pyflakes warnings.
diff --git a/bravo/beta/factory.py b/bravo/beta/factory.py index 05a92c1..2ac1fe0 100644 --- a/bravo/beta/factory.py +++ b/bravo/beta/factory.py @@ -1,514 +1,514 @@ from collections import defaultdict -from itertools import chain, product +from itertools import product from twisted.internet import reactor from twi...
bravoserver/bravo
bbda5f549cb074f57be0f56961551ff48ec6e424
inventory: Clean up a couple algorithmic nits.
diff --git a/bravo/inventory/__init__.py b/bravo/inventory/__init__.py index 7ca3b89..0d26f82 100644 --- a/bravo/inventory/__init__.py +++ b/bravo/inventory/__init__.py @@ -1,177 +1,166 @@ from itertools import chain from bravo import blocks from bravo.beta.structures import Slot -class NextLoop(Exception): - ...
bravoserver/bravo
263b6148870e7b096b0f12c1e36c889ee391d504
plugins/automatons: Allow grass to be deterministic in unit tests.
diff --git a/bravo/plugins/automatons.py b/bravo/plugins/automatons.py index 3d411e6..779d9ae 100644 --- a/bravo/plugins/automatons.py +++ b/bravo/plugins/automatons.py @@ -1,213 +1,214 @@ from __future__ import division from collections import deque from itertools import product -from random import randint, rando...
bravoserver/bravo
4085b138b0344ff41452906c6ad047c50a810602
beta: Update from protocol 61 to 74.
diff --git a/bravo/beta/packets.py b/bravo/beta/packets.py index 259c494..a0b512c 100644 --- a/bravo/beta/packets.py +++ b/bravo/beta/packets.py @@ -1,1043 +1,1063 @@ from collections import namedtuple from construct import Struct, Container, Embed, Enum, MetaField from construct import MetaArray, If, Switch, Cons...
bravoserver/bravo
da7415796874942ad3d66fed456879fea04f3a71
world: As seasons change, apply the changed season to cached chunks.
diff --git a/bravo/world.py b/bravo/world.py index cd5cb12..a4ea715 100644 --- a/bravo/world.py +++ b/bravo/world.py @@ -1,695 +1,710 @@ from array import array from functools import wraps -from itertools import product +from itertools import imap, product import random import sys import weakref from twisted.in...
bravoserver/bravo
ea371440e951ec697b0e0ed4c7be7e282a40cd7b
Add a mailmap.
diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..148574b --- /dev/null +++ b/.mailmap @@ -0,0 +1,5 @@ +Corbin Simpson <cds@corbinsimpson.com> <MostAwesomeDude@gmail.com> +Corbin Simpson <cds@corbinsimpson.com> <simpsoco@osuosl.org> +Justin Noah <justinnoah@gmail.com> <JustinNoah@gmail.com> +Justin N...
bravoserver/bravo
a3cdae89f8c81ef5edb7510bfcac2bfb959caf76
world: Switch caching subsystem to separate caching object.
diff --git a/bravo/beta/factory.py b/bravo/beta/factory.py index 2dfaa58..05a92c1 100644 --- a/bravo/beta/factory.py +++ b/bravo/beta/factory.py @@ -1,566 +1,565 @@ from collections import defaultdict from itertools import chain, product from twisted.internet import reactor from twisted.internet.interfaces import...
bravoserver/bravo
92ea0f308b084ea762cadaad8937b58fda4c7210
world: Fix up save_chunk() and make its callers less racy.
diff --git a/bravo/plugins/commands/common.py b/bravo/plugins/commands/common.py index 3d7db39..88c9982 100644 --- a/bravo/plugins/commands/common.py +++ b/bravo/plugins/commands/common.py @@ -1,479 +1,479 @@ from textwrap import wrap from twisted.internet import reactor from zope.interface import implements fr...
bravoserver/bravo
b328b4426a2234cde95f74953eabac1132706306
world: Add dirtiness tracking as an event to the chunk cache.
diff --git a/bravo/tests/test_world.py b/bravo/tests/test_world.py index 9f75cdf..b1f3939 100644 --- a/bravo/tests/test_world.py +++ b/bravo/tests/test_world.py @@ -1,285 +1,295 @@ from twisted.trial import unittest from twisted.internet.defer import inlineCallbacks from array import array from itertools import...
bravoserver/bravo
72c03c454016d669cabb3c8fe29625f3e35f103d
chunk: Refactor dirtiness to fire a simple callback hook.
diff --git a/bravo/chunk.py b/bravo/chunk.py index 3453547..2a8b6f7 100644 --- a/bravo/chunk.py +++ b/bravo/chunk.py @@ -1,626 +1,649 @@ from array import array from functools import wraps from itertools import product from struct import pack from warnings import warn from bravo.blocks import blocks, glowing_bl...
bravoserver/bravo
ab0ae693b2c316c20a0c7c04a4ec681eccebbe16
utilities/automatic: Only feed acceptable blocks to automatons.
diff --git a/bravo/utilities/automatic.py b/bravo/utilities/automatic.py index c129964..40a5114 100644 --- a/bravo/utilities/automatic.py +++ b/bravo/utilities/automatic.py @@ -1,32 +1,39 @@ from bravo.utilities.coords import XZ + def naive_scan(automaton, chunk): """ Utility function which can be used to...
bravoserver/bravo
9676b27f585120cbc568db850ef2c97a85b4fe60
world: Make enable_chunks() return a Deferred, and test.
diff --git a/bravo/tests/test_world.py b/bravo/tests/test_world.py index a94a2dd..9f75cdf 100644 --- a/bravo/tests/test_world.py +++ b/bravo/tests/test_world.py @@ -1,276 +1,285 @@ from twisted.trial import unittest from twisted.internet.defer import inlineCallbacks from array import array from itertools import...
bravoserver/bravo
9d3ab1c03831dec9e046a42f584b09328d91cec6
world: Start factoring out caching behavior.
diff --git a/bravo/beta/factory.py b/bravo/beta/factory.py index b5badc6..2dfaa58 100644 --- a/bravo/beta/factory.py +++ b/bravo/beta/factory.py @@ -1,573 +1,566 @@ from collections import defaultdict from itertools import chain, product from twisted.internet import reactor from twisted.internet.interfaces import...
bravoserver/bravo
925ed06680adeb9f43c087d2dbbe3365b6447862
world: PEP 8.
diff --git a/bravo/world.py b/bravo/world.py index f76cfd5..e415a9f 100644 --- a/bravo/world.py +++ b/bravo/world.py @@ -1,647 +1,653 @@ from array import array from functools import wraps from itertools import product import random import sys import weakref from twisted.internet import reactor from twisted.i...
bravoserver/bravo
8602bab200b676f1f193971b109ddd8914c28998
beta/protocol, beta/structures: Expand Settings and use it for 0xca.
diff --git a/bravo/beta/protocol.py b/bravo/beta/protocol.py index 8b5a989..f825508 100644 --- a/bravo/beta/protocol.py +++ b/bravo/beta/protocol.py @@ -1,835 +1,842 @@ # vim: set fileencoding=utf8 : from itertools import product, chain from time import time from urlparse import urlunparse from twisted.interne...
bravoserver/bravo
f185e32f4faeed1f6f4098c34bdf586bacdc7931
A test that was broken now succeeds.
diff --git a/bravo/tests/infini/test_packets.py b/bravo/tests/infini/test_packets.py index 3da0308..f50d043 100644 --- a/bravo/tests/infini/test_packets.py +++ b/bravo/tests/infini/test_packets.py @@ -1,28 +1,26 @@ from twisted.trial import unittest from bravo.infini.packets import packets, parse_packets class T...
bravoserver/bravo
61fe0fc179196b83b62788b20b185ff1ed232455
Enable Travis.
diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..5e9235b --- /dev/null +++ b/.travis.yml @@ -0,0 +1,6 @@ +language: python +python: + - "2.6" + - "2.7" + - "pypy" +script: "trial bravo"
bravoserver/bravo
24261b88171cb51dde14a4c56a6bc1d6f422da45
Proper slot implementation + fix dropping items
diff --git a/bravo/beta/packets.py b/bravo/beta/packets.py index c6f00ec..259c494 100644 --- a/bravo/beta/packets.py +++ b/bravo/beta/packets.py @@ -1,991 +1,1043 @@ from collections import namedtuple from construct import Struct, Container, Embed, Enum, MetaField from construct import MetaArray, If, Switch, Const...
bravoserver/bravo
8f424c4d3b62397647c30ed2c1a2f844d5ddc804
Location fixes: - creating items - collecting items in range
diff --git a/.gitignore b/.gitignore index f8357a6..0d317aa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ *.pyc *.swp bravo.ini bravo.log twistd.pid dropin.cache website/output/* Bravo.egg-info/* build/* dist/* +.idea/ \ No newline at end of file diff --git a/bravo/beta/factory.py b/bravo/beta/fa...
bravoserver/bravo
2f3cc7fa4c7c0d6e27d94adf60d88ed3e50fc18a
Packet unittests: - 0x17: Add vehicle/object - 0x28: Entity metadata
diff --git a/bravo/tests/beta/test_packets.py b/bravo/tests/beta/test_packets.py index 043aee3..02b0bff 100644 --- a/bravo/tests/beta/test_packets.py +++ b/bravo/tests/beta/test_packets.py @@ -1,43 +1,81 @@ from unittest import TestCase -from bravo.beta.packets import simple +from bravo.beta.packets import simple, p...
bravoserver/bravo
fe78153b6205ecef2e06422a075817383770718d
Bump up to protocol version 61.
diff --git a/bravo/beta/packets.py b/bravo/beta/packets.py index af9c454..7ac3f0a 100644 --- a/bravo/beta/packets.py +++ b/bravo/beta/packets.py @@ -1,897 +1,990 @@ from collections import namedtuple from construct import Struct, Container, Embed, Enum, MetaField from construct import MetaArray, If, Switch, Const,...
bravoserver/bravo
2d4f4b47af8855b1941f60c78f84c91db1bc0c26
terrain/trees: A couple cleanups.
diff --git a/bravo/terrain/trees.py b/bravo/terrain/trees.py index e65902e..86358db 100644 --- a/bravo/terrain/trees.py +++ b/bravo/terrain/trees.py @@ -1,663 +1,664 @@ from __future__ import division from itertools import product from math import cos, pi, sin, sqrt from random import choice, random, randint f...
bravoserver/bravo
8ef1655e6d45a56071b6789de1d4279318f8fe73
terrain/trees: Fix up a couple distance calculations.
diff --git a/bravo/terrain/trees.py b/bravo/terrain/trees.py index 63bf0d5..e65902e 100644 --- a/bravo/terrain/trees.py +++ b/bravo/terrain/trees.py @@ -1,664 +1,663 @@ from __future__ import division from itertools import product from math import cos, pi, sin, sqrt from random import choice, random, randint f...
bravoserver/bravo
8de4affa78931303df8e8219111111222de7c792
utilities/maths: Add Pythagorean distance, and test.
diff --git a/bravo/tests/utilities/test_maths.py b/bravo/tests/utilities/test_maths.py index 4b01aa1..aeff23b 100644 --- a/bravo/tests/utilities/test_maths.py +++ b/bravo/tests/utilities/test_maths.py @@ -1,39 +1,48 @@ import unittest -from bravo.utilities.maths import clamp, morton2 +from bravo.utilities.maths impo...
bravoserver/bravo
df93e32cf98fb6049de849142ae3dfb94f4edf77
terrain/trees: A big pile of PEP8 fixes.
diff --git a/bravo/terrain/trees.py b/bravo/terrain/trees.py index 549a641..63bf0d5 100644 --- a/bravo/terrain/trees.py +++ b/bravo/terrain/trees.py @@ -1,661 +1,664 @@ from __future__ import division from itertools import product from math import cos, pi, sin, sqrt from random import choice, random, randint f...
bravoserver/bravo
1be6a20a06a015c4c84bc976ca38cd0a7c40d5fe
terrain/trees: Share species numbers and use names for them.
diff --git a/bravo/terrain/trees.py b/bravo/terrain/trees.py index 54db5e0..549a641 100644 --- a/bravo/terrain/trees.py +++ b/bravo/terrain/trees.py @@ -1,653 +1,661 @@ from __future__ import division from itertools import product from math import cos, pi, sin, sqrt from random import choice, random, randint f...
bravoserver/bravo
9e0178aa4a7f3b316e00aa73b4df53a19d6c8a80
terrain/trees: Some PEP8.
diff --git a/bravo/terrain/trees.py b/bravo/terrain/trees.py index b98ce83..54db5e0 100644 --- a/bravo/terrain/trees.py +++ b/bravo/terrain/trees.py @@ -1,643 +1,653 @@ from __future__ import division from itertools import product from math import cos, pi, sin, sqrt from random import choice, random, randint f...
bravoserver/bravo
0b968a590d93b523cbceae1d7f16ab85664d092f
plugins/window_hooks: Remove old print statements.
diff --git a/bravo/plugins/window_hooks.py b/bravo/plugins/window_hooks.py index 8774c89..2c0a603 100644 --- a/bravo/plugins/window_hooks.py +++ b/bravo/plugins/window_hooks.py @@ -1,508 +1,506 @@ from twisted.internet.defer import inlineCallbacks, returnValue from twisted.python import log from zope.interface impor...
bravoserver/bravo
1717a8da2eca41ce06f7bcea6a3b25139ab7620b
And use new coord helpers.
diff --git a/bravo/chunk.py b/bravo/chunk.py index 12e925b..3453547 100644 --- a/bravo/chunk.py +++ b/bravo/chunk.py @@ -1,630 +1,626 @@ from array import array from functools import wraps from itertools import product from struct import pack from warnings import warn from bravo.blocks import blocks, glowing_bl...
bravoserver/bravo
c96a57217f5337526a81c57f281cf35ad9d00e0d
utilities/coords: Add a couple more iterators.
diff --git a/bravo/utilities/coords.py b/bravo/utilities/coords.py index be96ec8..f39763b 100644 --- a/bravo/utilities/coords.py +++ b/bravo/utilities/coords.py @@ -1,127 +1,140 @@ """ Utilities for coordinate handling and munging. """ from itertools import product from math import floor, ceil from bravo.chun...
bravoserver/bravo
cca2977a8fd2cc8bb195f091c2c25734db80423a
And update locations using 128 as well.
diff --git a/bravo/plugins/generators.py b/bravo/plugins/generators.py index 083356d..850b100 100644 --- a/bravo/plugins/generators.py +++ b/bravo/plugins/generators.py @@ -1,477 +1,477 @@ from __future__ import division from array import array from itertools import combinations, product from random import Random...
bravoserver/bravo
60b0b9a29de7449b5ec5bc04003fc487b3ba6f9c
Use CHUNK_HEIGHT in place of 256.
diff --git a/bravo/beta/protocol.py b/bravo/beta/protocol.py index af5efc9..d2cbd93 100644 --- a/bravo/beta/protocol.py +++ b/bravo/beta/protocol.py @@ -1,1004 +1,1006 @@ # vim: set fileencoding=utf8 : from itertools import product, chain from time import time from urlparse import urlunparse from twisted.inter...
bravoserver/bravo
951b251dc99b8733a9a886c3b5c41f978b652037
chunk: Introduce a constant for chunk height.
diff --git a/bravo/chunk.py b/bravo/chunk.py index e133cea..90c13ab 100644 --- a/bravo/chunk.py +++ b/bravo/chunk.py @@ -1,524 +1,529 @@ from array import array from functools import wraps from itertools import product from struct import pack from warnings import warn from bravo.blocks import blocks, glowing_bl...
bravoserver/bravo
8a04b9fa99145afe4a199116e2a12860813953f7
motd: Patches welcome!
diff --git a/bravo/motd.py b/bravo/motd.py index 89a77c2..e078275 100644 --- a/bravo/motd.py +++ b/bravo/motd.py @@ -1,70 +1,72 @@ from random import choice motds = """ Open-source! % +Patches welcome! +% Distribute! % Reverse-engineered! % Don't look directly at the features! % The work of MAD! % Made i...
bravoserver/bravo
87a88403d5f9a16aaf939f06a5b982af811b28a8
plugins/physics: Fix another OOB access in Fluid.
diff --git a/bravo/plugins/physics.py b/bravo/plugins/physics.py index 347fe06..84d3194 100644 --- a/bravo/plugins/physics.py +++ b/bravo/plugins/physics.py @@ -1,346 +1,348 @@ from itertools import chain from twisted.internet.defer import inlineCallbacks from twisted.internet.task import LoopingCall from zope.in...
bravoserver/bravo
d7fd2807a408498d73919fee9e258832011705d3
plugins/physics: Fix OOB access in Fluid.
diff --git a/bravo/plugins/physics.py b/bravo/plugins/physics.py index 62804e8..347fe06 100644 --- a/bravo/plugins/physics.py +++ b/bravo/plugins/physics.py @@ -1,344 +1,346 @@ -from itertools import chain, product +from itertools import chain from twisted.internet.defer import inlineCallbacks from twisted.internet...
bravoserver/bravo
7ffbf6a88816abea089d68851f63ef09de897ac9
plugins/automatons: Fix OOB coordinate access in Grass.
diff --git a/bravo/plugins/automatons.py b/bravo/plugins/automatons.py index a4b78e8..3d411e6 100644 --- a/bravo/plugins/automatons.py +++ b/bravo/plugins/automatons.py @@ -1,213 +1,213 @@ from __future__ import division from collections import deque from itertools import product from random import randint, rando...
bravoserver/bravo
bedb35a4edb1aab1786769ab37e5c67627db04de
plugins/physics: Refactor to use itercube().
diff --git a/bravo/plugins/physics.py b/bravo/plugins/physics.py index c3fa44d..62804e8 100644 --- a/bravo/plugins/physics.py +++ b/bravo/plugins/physics.py @@ -1,357 +1,344 @@ from itertools import chain, product from twisted.internet.defer import inlineCallbacks from twisted.internet.task import LoopingCall fro...
bravoserver/bravo
2129e5551c668a040bccdffbdc8b98db6318dcee
utilities/coords: Isolate itercube() and test.
diff --git a/bravo/tests/utilities/test_coords.py b/bravo/tests/utilities/test_coords.py index 9e0fc08..d64cc1c 100644 --- a/bravo/tests/utilities/test_coords.py +++ b/bravo/tests/utilities/test_coords.py @@ -1,24 +1,35 @@ import unittest -from bravo.utilities.coords import adjust_coords_for_face, iterneighbors +fro...
bravoserver/bravo
d3566d687dcbf527523746e4f03803808a8994cd
plugins/physics: Use iterneighbor().
diff --git a/bravo/plugins/physics.py b/bravo/plugins/physics.py index 73d9118..c3fa44d 100644 --- a/bravo/plugins/physics.py +++ b/bravo/plugins/physics.py @@ -1,363 +1,357 @@ from itertools import chain, product from twisted.internet.defer import inlineCallbacks from twisted.internet.task import LoopingCall fro...
bravoserver/bravo
105a2955c4b80f61e8603c1ddc4d7c4504f8d6b5
utilities/coords: Isolate iterneighbors(), and test.
diff --git a/bravo/tests/utilities/test_coords.py b/bravo/tests/utilities/test_coords.py index 6f29e7a..9e0fc08 100644 --- a/bravo/tests/utilities/test_coords.py +++ b/bravo/tests/utilities/test_coords.py @@ -1,12 +1,24 @@ import unittest -from bravo.utilities.coords import adjust_coords_for_face +from bravo.utiliti...
bravoserver/bravo
af475448d2327293dab3f80b0f2e7ec2f4a2d62b
world: Raise a different exception for impossible chunk lookups.
diff --git a/bravo/world.py b/bravo/world.py index 6566028..6785202 100644 --- a/bravo/world.py +++ b/bravo/world.py @@ -1,568 +1,582 @@ from array import array from functools import wraps from itertools import product import random import sys import weakref from twisted.internet import reactor from twisted.i...
bravoserver/bravo
55d3919ef12579918b870f17115a59c32a51b631
Fixed PEP8 E303.
diff --git a/bravo/blocks.py b/bravo/blocks.py index 9042239..43c4c21 100644 --- a/bravo/blocks.py +++ b/bravo/blocks.py @@ -42,797 +42,796 @@ class Block(object): :param tuple drop: The type of block that should be dropped when an instance of this block is destroyed. Defaults to the block value, ...
saturnflyer/radiant-people-extension
7989982d2fbe69f6aaa4b7895f3d30177cf5af8b
Fix copy-pasta error
diff --git a/Rakefile b/Rakefile index 9220b24..e8c57e4 100644 --- a/Rakefile +++ b/Rakefile @@ -1,109 +1,109 @@ # Determine where the RSpec plugin is by loading the boot unless defined? RADIANT_ROOT ENV["RAILS_ENV"] = "test" case when ENV["RADIANT_ENV_FILE"] require File.dirname(ENV["RADIANT_ENV_FILE"]...
saturnflyer/radiant-people-extension
d6f10bed1ecd185b01479e74341f5368dff62d9f
Add a region for easy partial insertion
diff --git a/app/views/admin/people/_form.html.haml b/app/views/admin/people/_form.html.haml index 475cb5b..7a0d13a 100644 --- a/app/views/admin/people/_form.html.haml +++ b/app/views/admin/people/_form.html.haml @@ -1,15 +1,16 @@ -.recordPart - = f.label :first_name - = f.text_field :first_name - = f.error_message_...
saturnflyer/radiant-people-extension
1493808c765afa4a157002f58a690a7721ce3944
Add a basic README
diff --git a/README b/README deleted file mode 100644 index 6171a20..0000000 --- a/README +++ /dev/null @@ -1,3 +0,0 @@ -= People - -Description goes here \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..49f5139 --- /dev/null +++ b/README.md @@ -0,0 +1,5 @@ +# People + ...
saturnflyer/radiant-people-extension
42a5419221bb7c026d086923505949bf1eaaacdb
Modernize tests
diff --git a/spec/controllers/admin/people_controller_spec.rb b/spec/controllers/admin/people_controller_spec.rb index 9aafad3..6b6385e 100644 --- a/spec/controllers/admin/people_controller_spec.rb +++ b/spec/controllers/admin/people_controller_spec.rb @@ -1,14 +1,14 @@ require File.expand_path("../../../spec_helper",...
saturnflyer/radiant-people-extension
88953c324c8928079470ced394679c7ab269a99d
new gemspec
diff --git a/radiant-people-extension.gemspec b/radiant-people-extension.gemspec index 0b67037..c4ec801 100644 --- a/radiant-people-extension.gemspec +++ b/radiant-people-extension.gemspec @@ -1,75 +1,77 @@ # Generated by jeweler # DO NOT EDIT THIS FILE DIRECTLY # Instead, edit Jeweler::Tasks in Rakefile, and run th...
saturnflyer/radiant-people-extension
23b344e08ac941a6f54a78fb2fdd8239fbe72544
only clear results when you've searched. version bump
diff --git a/VERSION b/VERSION index 3eefcb9..9084fa2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.0 +1.1.0 diff --git a/app/views/admin/people/index.html.haml b/app/views/admin/people/index.html.haml index d460bca..f54ee09 100644 --- a/app/views/admin/people/index.html.haml +++ b/app/views/admin/people/index.ht...
saturnflyer/radiant-people-extension
24093cd921876d8abfb1be91c8a497d402dc0e6f
add missing render_person
diff --git a/app/helpers/admin/people_helper.rb b/app/helpers/admin/people_helper.rb index a6e7e7f..94b72e2 100644 --- a/app/helpers/admin/people_helper.rb +++ b/app/helpers/admin/people_helper.rb @@ -1,2 +1,6 @@ module Admin::PeopleHelper + def render_person(person, locals={}) + details = locals.merge!({:person =...
saturnflyer/radiant-people-extension
4d77c66aebac5689d1326af153dd38985bb93b7e
ignore pkg
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..0c6117d --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +pkg \ No newline at end of file
saturnflyer/radiant-people-extension
f339fb4fd3d34af48078f4ee78ffa285d443748d
speedier rendering
diff --git a/app/helpers/admin/people_helper.rb b/app/helpers/admin/people_helper.rb index c238751..a6e7e7f 100644 --- a/app/helpers/admin/people_helper.rb +++ b/app/helpers/admin/people_helper.rb @@ -1,6 +1,2 @@ module Admin::PeopleHelper - def render_person(person) - @current_person = person - render 'person'...
saturnflyer/radiant-people-extension
5bd2432cc3cecfbd98ed5ed4e84897012a799ee0
adding gemspec
diff --git a/radiant-people-extension.gemspec b/radiant-people-extension.gemspec new file mode 100644 index 0000000..612d59d --- /dev/null +++ b/radiant-people-extension.gemspec @@ -0,0 +1,74 @@ +# Generated by jeweler +# DO NOT EDIT THIS FILE DIRECTLY +# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec co...
saturnflyer/radiant-people-extension
21dd4f264643f9524f41ebf97928e9b8562f46a7
get version from file
diff --git a/people_extension.rb b/people_extension.rb index 3196624..09df845 100644 --- a/people_extension.rb +++ b/people_extension.rb @@ -1,48 +1,48 @@ require 'ostruct' class PeopleExtension < Radiant::Extension - version "1.0" + version "#{File.read(File.expand_path(File.dirname(__FILE__)) + '/VERSION')}" d...
saturnflyer/radiant-people-extension
aa0a49f895a34de3ed5c0a474d32e283c5b11db0
Version bump to 1.0.0
diff --git a/VERSION b/VERSION index 77d6f4c..3eefcb9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.0.0 +1.0.0
saturnflyer/radiant-people-extension
c3e5754b8834447f237ecd13b5b9ff8490f84024
Version bump to 0.0.0
diff --git a/VERSION b/VERSION new file mode 100644 index 0000000..77d6f4c --- /dev/null +++ b/VERSION @@ -0,0 +1 @@ +0.0.0
saturnflyer/radiant-people-extension
97010c943243885b28d83ae7f0246c4d3c2c0c4c
move to gems
diff --git a/Rakefile b/Rakefile index 8d3b41f..4365828 100644 --- a/Rakefile +++ b/Rakefile @@ -1,123 +1,141 @@ +begin + require 'jeweler' + Jeweler::Tasks.new do |gem| + gem.name = "radiant-people-extension" + gem.summary = %Q{Manage People in Radiant CMS} + gem.description = %Q{A generic and extendable wa...
saturnflyer/radiant-people-extension
4f22271dc61fb43ce811d297055037c4ccd31691
some updates"
diff --git a/app/controllers/admin/people_controller.rb b/app/controllers/admin/people_controller.rb index 1e6f071..4e1d0c2 100644 --- a/app/controllers/admin/people_controller.rb +++ b/app/controllers/admin/people_controller.rb @@ -1,11 +1,41 @@ class Admin::PeopleController < Admin::ResourceController before_filt...
saturnflyer/radiant-people-extension
1d5b40145203d82670116d9495dca1b33b78ff86
initial load
diff --git a/README b/README new file mode 100644 index 0000000..6171a20 --- /dev/null +++ b/README @@ -0,0 +1,3 @@ += People + +Description goes here \ No newline at end of file diff --git a/Rakefile b/Rakefile new file mode 100644 index 0000000..8d3b41f --- /dev/null +++ b/Rakefile @@ -0,0 +1,123 @@ +# I think this i...
superisaac/rainy
c653315f86e89ab3bb3572b2e5ea7096efc8c900
1. Using integer as index to get revision 2. Added revision for OCM. ie. user.rev()
diff --git a/TODO b/TODO index f965fce..0c5bd63 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,7 @@ * Find timeline by time range(page) * Messages * Revision functions for model * Index support, one model several db * Simple frontend, using django, php, ... * Support more mimetype, images, video, voice, ... + * P...
superisaac/rainy
a8882f2cbadacd89c400d9294f1a1f7cd34834fb
Fixed some bugs on http request
diff --git a/lib/couchkit/dbwrapper.py b/lib/couchkit/dbwrapper.py index 017c5ee..b048881 100644 --- a/lib/couchkit/dbwrapper.py +++ b/lib/couchkit/dbwrapper.py @@ -1,234 +1,245 @@ import httpc as http -from urllib import quote +from urllib import quote, urlencode import simplejson import settings class ServerErr...
superisaac/rainy
3bf95a12408fb5279ad38fd19bfa7ae32b643e5e
Added some documents
diff --git a/lib/couchkit/ocm.py b/lib/couchkit/ocm.py index e26dfc6..d4aa682 100644 --- a/lib/couchkit/ocm.py +++ b/lib/couchkit/ocm.py @@ -1,215 +1,251 @@ +# ocm.py - Object-Couchdb mapping +# Author: Zeng Ke + import time from dbwrapper import Server, ServerError from urllib import quote class Index(object): ...
superisaac/rainy
335498abf2063069d4a633fd2754475f3e78dd8c
Index step 3
diff --git a/lib/couchkit/ocm.py b/lib/couchkit/ocm.py index 4974e4c..e26dfc6 100644 --- a/lib/couchkit/ocm.py +++ b/lib/couchkit/ocm.py @@ -1,210 +1,215 @@ import time from dbwrapper import Server, ServerError +from urllib import quote class Index(object): def __init__(self, model, field): self.db_n...
superisaac/rainy
771e5ffa3d1012474c118fc013d5506f2dece1b4
Index step 2 create index automatically at the schema of database
diff --git a/lib/couchkit/ocm.py b/lib/couchkit/ocm.py index 2d07a54..4974e4c 100644 --- a/lib/couchkit/ocm.py +++ b/lib/couchkit/ocm.py @@ -1,210 +1,210 @@ import time from dbwrapper import Server, ServerError class Index(object): def __init__(self, model, field): - self.db_name = 'idx' + model.db_nam...
superisaac/rainy
abd12a14126cd654ae5eb71408f5a0cbecce04d7
Added Index TODO: Make it work
diff --git a/lib/couchkit/dbwrapper.py b/lib/couchkit/dbwrapper.py index 6db314e..017c5ee 100644 --- a/lib/couchkit/dbwrapper.py +++ b/lib/couchkit/dbwrapper.py @@ -1,229 +1,234 @@ import httpc as http +from urllib import quote import simplejson import settings class ServerError(Exception): def __init__(self...
superisaac/rainy
a418e93ec95b1cfdba0cecbb94fe36cabda8636b
Added __metaclass__ for Model Moved initialize to meta class's __new__
diff --git a/lib/couchkit/ocm.py b/lib/couchkit/ocm.py index e1fd33a..ad13109 100644 --- a/lib/couchkit/ocm.py +++ b/lib/couchkit/ocm.py @@ -1,116 +1,122 @@ import time from dbwrapper import Server, ServerError class Field(object): def __init__(self, null=True): self.null = null # Seems null is not u...
superisaac/rainy
c81f16687ddcef0cbe78a597905d64f3bc10dc2a
TODO things
diff --git a/TODO b/TODO index 3024251..f965fce 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,6 @@ * Find timeline by time range(page) - * revision functions for model + * Messages + * Revision functions for model * Index support, one model several db * Simple frontend, using django, php, ... - * Support more mimetype...
superisaac/rainy
9cbb36eb1751669dd92ca337ad424a9bcdbeebe6
ignore files TODO
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f3d74a9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*.pyc +*~ diff --git a/TODO b/TODO index f46ee65..3024251 100644 --- a/TODO +++ b/TODO @@ -1,6 +1,5 @@ - -TODO: * Find timeline by time range(page) + * revision functions for model * Inde...
superisaac/rainy
547f3f7530bd5656aeeed11375ee7d38e893ebb3
make ocm model's get() method be able to raise specified exception
diff --git a/app/entry.py b/app/entry.py index 00f643d..6200476 100644 --- a/app/entry.py +++ b/app/entry.py @@ -1,18 +1,18 @@ -from lib.httputil import require_login, AppError, Forbidden +from lib.httputil import require_login, AppError, Forbidden, HttpNotFound from lib.couchkit import ServerError from lib.util impo...
superisaac/rainy
198ca90ccc5d344243669cfd59781e30cea18620
* Added TODO * Added mimetype field for Entry
diff --git a/TODO b/TODO new file mode 100644 index 0000000..f46ee65 --- /dev/null +++ b/TODO @@ -0,0 +1,6 @@ + +TODO: + * Find timeline by time range(page) + * Index support, one model several db + * Simple frontend, using django, php, ... + * Support more mimetype, images, video, voice, ... \ No newline at end of fi...
superisaac/rainy
30deb08cfb6b383e8bf60bded5fda01afa46eba2
Project files added in
diff --git a/app/__init__.py b/app/__init__.py new file mode 100644 index 0000000..2cac803 --- /dev/null +++ b/app/__init__.py @@ -0,0 +1,3 @@ +from hello import Hello +from user import Signup, UserInfo, Timeline, UserTimeline, Update +from entry import EntryInfo, EntryDelete diff --git a/app/entry.py b/app/entry.py ne...
olivierch/openBarter
f424bd78f4ac72b928a5354127c747ea0fff2569
vacuum full made by bash
diff --git a/doc/doc-ob-user.odt b/doc/doc-ob-user.odt deleted file mode 100644 index 07d0596..0000000 Binary files a/doc/doc-ob-user.odt and /dev/null differ diff --git a/doc/doc-ob.odt b/doc/doc-ob.odt index bc3ad2e..0054fa7 100644 Binary files a/doc/doc-ob.odt and b/doc/doc-ob.odt differ diff --git a/doc/figure-x.od...
olivierch/openBarter
2b5c8cfe5f91f86859ad6e7a7e6c10508286d35c
corrections for bison 3.0
diff --git a/simu/liquid/cliquid.py b/simu/liquid/cliquid.py index 5499630..90b8dd8 100644 --- a/simu/liquid/cliquid.py +++ b/simu/liquid/cliquid.py @@ -1,180 +1,178 @@ #!/usr/bin/python # -*- coding: utf8 -*- import distrib import os.path DB_NAME='liquid' DB_USER='olivier' DB_PWD='' DB_HOST='localhost' DB_P...
olivierch/openBarter
29726ebc3f548d2c992de5c0c169fba9b9376c5b
all tests are OK
diff --git a/src/sql/algo.sql b/src/sql/algo.sql index 27cdad4..3cf69b4 100644 --- a/src/sql/algo.sql +++ b/src/sql/algo.sql @@ -1,497 +1,495 @@ -------------------------------------------------------------------------------- /* function fcreate_tmp It is the central query of openbarter for an order O fcreate...
olivierch/openBarter
7d86b9eae996bb63251d6390109844c1316ba36e
end for v2.1.0
diff --git a/META.json b/META.json index 15c2bbb..bcaef26 100644 --- a/META.json +++ b/META.json @@ -1,51 +1,51 @@ { "name": "openbarter", "abstract": "Multilateral agreement production engine.", "description": "openBarter is a central limit order book that performs competition on price even if money is no...
olivierch/openBarter
7e532281da97742c3a08f53997789e09ac59c808
preparation for v2.1.0
diff --git a/META.json b/META.json index bcaef26..15c2bbb 100644 --- a/META.json +++ b/META.json @@ -1,51 +1,51 @@ { "name": "openbarter", "abstract": "Multilateral agreement production engine.", "description": "openBarter is a central limit order book that performs competition on price even if money is no...
olivierch/openBarter
9c866db15165ed9806cb9c69f844ae36ccc232cd
new test suite added
diff --git a/src/Makefile b/src/Makefile index b64dbac..a8637c5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,38 +1,39 @@ MODULE_big = flowf OBJS = flowm.o yflow.o yflowparse.o yorder.o flowc.o earthrad.o worker_ob.o EXTENSION = flowf DATA = flowf--0.1.sql flowf--unpackaged--0.1.sql REGRESS = testflow_1...
olivierch/openBarter
375c4de2b790d972ab3ea3b8d5ee9ce67d253b2e
corrections
diff --git a/src/sql/algo.sql b/src/sql/algo.sql index bca3d32..27cdad4 100644 --- a/src/sql/algo.sql +++ b/src/sql/algo.sql @@ -1,496 +1,497 @@ -------------------------------------------------------------------------------- /* function fcreate_tmp It is the central query of openbarter for an order O fcreate...
olivierch/openBarter
d3ec6b8d3b1848c6f5ef8ad276eb0caeb0912fc4
correction sur quote
diff --git a/src/sql/prims.sql b/src/sql/prims.sql index f9d2e36..6560183 100644 --- a/src/sql/prims.sql +++ b/src/sql/prims.sql @@ -1,491 +1,491 @@ -------------------------------------------------------------------------------- -- check params -- code in [-9,0] --------------------------------------------------...
olivierch/openBarter
8f5e274adbf4aa286fa5aab47c9d6623880f1d37
worker_ob correction!!
diff --git a/src/sql/tables.sql b/src/sql/tables.sql index 28f744d..85ccd07 100644 --- a/src/sql/tables.sql +++ b/src/sql/tables.sql @@ -1,353 +1,354 @@ -------------------------------------------------------------------------------- ALTER DEFAULT PRIVILEGES REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC; ALTER DEFAULT PRI...
olivierch/openBarter
3533fd6366737409bbdacb11314dffbd6bee7d51
bg_worker redesign
diff --git a/simu/liquid/distrib.py b/simu/liquid/distrib.py index c1049e0..3d8a1b8 100644 --- a/simu/liquid/distrib.py +++ b/simu/liquid/distrib.py @@ -1,46 +1,45 @@ #!/usr/bin/python # -*- coding: utf8 -*- import random -import cliquid def init(): random.seed() def couple(f,maxi): """ usag...
olivierch/openBarter
c4d501baf8e9cd602945083f84cd8985ae2f0b99
corrections
diff --git a/src/test/py/run.py b/src/test/py/run.py index 405010a..7b4a4ba 100755 --- a/src/test/py/run.py +++ b/src/test/py/run.py @@ -1,303 +1,213 @@ # -*- coding: utf-8 -*- ''' Framework de tests tu_* *************************************************************************** execution: reset_market.sql so...
olivierch/openBarter
89d3049c009e9a1295cf9d47d991288f15a12c8b
end for v2.0.2
diff --git a/META.json b/META.json index 6426f2e..bcaef26 100644 --- a/META.json +++ b/META.json @@ -1,51 +1,51 @@ { "name": "openbarter", "abstract": "Multilateral agreement production engine.", "description": "openBarter is a central limit order book that performs competition on price even if money is no...
olivierch/openBarter
878e838dd08de4f0f2f5db8b74873ce06732dcbc
preparation for v2.0.2
diff --git a/META.json b/META.json index bcaef26..6426f2e 100644 --- a/META.json +++ b/META.json @@ -1,51 +1,51 @@ { "name": "openbarter", "abstract": "Multilateral agreement production engine.", "description": "openBarter is a central limit order book that performs competition on price even if money is no...
olivierch/openBarter
d314fc969d18c521d4f2d3c3bcf7b2e0ec066f45
correction of the release script
diff --git a/doc/release-script b/doc/release-script index bc907db..94a7d37 100755 --- a/doc/release-script +++ b/doc/release-script @@ -1,65 +1,75 @@ #!/bin/bash # AUTOMATISATION DES RELEASE # ************************** # modifier VERSION-X,VERSION-Y,VERSION-Z dans src/sql/tables.sql # ici 0.1.3 # cd openbarter ...
olivierch/openBarter
98094298a11696591467f25ba0fbcc799fff88e8
makefile do not remove META.json
diff --git a/src/Makefile b/src/Makefile index f851f0b..aff7e74 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,38 +1,38 @@ MODULE_big = flowf OBJS = flowm.o yflow.o yflowparse.o yorder.o flowc.o earthrad.o worker_ob.o EXTENSION = flowf DATA = flowf--0.1.sql flowf--unpackaged--0.1.sql REGRESS = testflow_1...
olivierch/openBarter
e84b64bdc77baacdd6187c0fb2b66f83ad3da0c1
correction on 2.0.2
diff --git a/src/Makefile b/src/Makefile index 7f5b7d5..f851f0b 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,38 +1,38 @@ MODULE_big = flowf OBJS = flowm.o yflow.o yflowparse.o yorder.o flowc.o earthrad.o worker_ob.o EXTENSION = flowf DATA = flowf--0.1.sql flowf--unpackaged--0.1.sql -REGRESS = testflow_1...
olivierch/openBarter
590b71bf93e442d0e7a24ca12cbc4d9261c03ec3
last change before 2.0.2
diff --git a/META.json b/META.json index 4e7f354..bcaef26 100644 --- a/META.json +++ b/META.json @@ -1,51 +1,51 @@ { "name": "openbarter", "abstract": "Multilateral agreement production engine.", "description": "openBarter is a central limit order book that performs competition on price even if money is no...
olivierch/openBarter
902bb8b5dbe49d7e3f715dfe3f32625ef662d7cb
git ignore related to odt temporary file
diff --git a/.gitignore b/.gitignore index b097817..147d741 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,11 @@ *.[oa] *.so *~ +.~* *.pyc src/yflowparse.c src/yflowscan.c src/results/ src/test/results/ doc/*.pdf